Bugfix

@ofZach if things look good to you here, this branch can be merged into master then deleted, and will close a bunch of small issues all at once.