Merge pull request #8 from aboudreault/qa-fixes

Qa fixes
minor fixes