Milestone: Cleanup, documentation, misc

Fixes issues for the "Cleanup, documentation, misc" milestone.