Made a few more tweaks

I looks like there is not a ton more left to do.  Could be my last
commit.