General cleanup/fixes

*Yes, this could be done in multiple pull-requests. But, it is much easier to maintain this way given the type of changes I'd like to make.*