Address most of my own comments