Mostly more cleaning up, and a few small tweaks