Fixed Phase 4 Bugs
updated
Merge branch 'andy' of https://github.com/jacoblwright/hit