Fixed some erros and todos in the report
Merge remote-tracking branch 'origin/master'