more updates per code review