Minor changes everywhere to bring things in line. The messages are a little weird right now because I'm trying to arrive at a good format.
Merge