fixes on QA
Merge branch 'master' of https://github.com/Stephanie-Chou/HATShaiti