Updated TODOs
Minor changes in reporting/reporting.lisp