Cleanup

Merging a few bugfixes, simple additions, and simplifications for prototyping session tomorrow.