Fix various issues as well as styling.
Maybe fix indent
Merge pull request #19 from sosickstudios/more-fixes

Fix various issues as well as styling.