Super major bug fixes.
Merge branch 'master' of github.com:dtkelch/CIS353