**WIP** Cleanup and fixes

Just making the PR to get some feedback from you guys.