B/cleanup - Some long-needed basic cleanup

Working on adding comments, cleaning out areas that got a bit slapdash as we neared release
added a bunch of TODOs
now that we have a release, things can start breaking again! time to look at real refactors, new features, etc.