Nitpicks

Pull requests are fun!

Haven't had a chance to look closely yet.  Just a few things that stood out.