Small fix in output
Updated todo
Prepared code for output tests
Work on statistics