Adding a ton of bug fixes and coding style updates
Merge pull request #7 from oakensoul/bugfix-updates

Adding a ton of bug fixes and coding style updates