more updates from code review