Cleanup and comments and fixes. oh my.

This is the good stuff.