changes and comments from code review session