fixed and added todos.
Merge branch 'master' of https://github.com/pnutus/NHQMReport