Changes by Evan
Merge branch 'master' of github.com:EvanAgee/TSpot
Various fixes based on feedback