Fixed up the console outputs..

Removed TODO comments..
We have nothing else TODO, except the report