code review and comments
small corrections