Additional changes

addressing outstanding issues, and feedback from code reviews