fixes
Merge branch 'report'
merge with fixed branch