fixes/updates from code review