Fixed a whole bunch of misc issues and made a few improvements
Merge pull request #13 from kyleaclark/feature_why-me

Fixed a whole bunch of misc issues and made a few improvements