Fixed todos
New report compilation