few bug fixes
fixing reports
wtf
reporting stuff
Merge branch 'development' into qa