Minor fidgeting and usability improvements.
Cleaned up some old todo stuff that'd been done for a long time.