fixed report handling
fixed minor performance bugs
removed old comments
fix typo