Updated Todo
Added improvments to the report class