minor suggestions after fast read
merge gnzlbg/draft_suggestions, with edits