Address most of my own comments
7 files changed