Branch for josephs comments

A lot of the following stuff needs the same kind of cleaning up as the things I've already gone over.  I'm not going to call it out individually.  Please get it straightened out and then we can review again.