More feedback. Sorry for all of the small commits.