Maintenance 1

This ties together several of the currently open PRs. I have reviewed the commits to the best of my ability.