Too many changes!

This is a jumble of changes.  Nasty, ugly work going on here...  Issue
tracker now in use to try to make me focus.  FOCUS, DAMN YOU!