Updated reporting code & todos