Updated report, cleaned up code.