General cleanup/fixes

:warning: Not ready for merge.

Yes, this could be done in multiple pull-requests. It is easier to maintain this way given the type of changes I'd like to make.