more updates based on code review