Cleanup.
Lots of minor bug squishes.