Fixed all sorts of bugz
Merge branch 'master' into report