Updated minor changes
Merge pull request #48 from whileyryan/qa_minor_fixes

Updated minor changes