code review and time fixes