minor tweaks and bug fixes
Merge branch 'master' of https://github.com/alexupton/Titans1