code-fixing

addressing issues in code based on reviews