fixed spacing of hints, code review fixes
merged code review conflicts