adding some changes from code review and pulling down things