Lots of cleanup and a couple small fixes
Merge pull request #2 from LtStingray/InDev

Merge pull request #2