Fixed bugs, this is the second iteration of report