Added report, other small changes