Tweaks and Bug Fixes
Merge branch 'master' of https://github.com/jrtew/TAT-Simulator.git