Updated report + small fixes to the code.