Reporting is added. Bugs are fixed