Adds back in my qtool improvements from winter break
Merge pull request #474 from joshimhoff/master

Adds back in my tool improvements from winter break