Added methods for special cases caused by the reports. Updated UML as expected. Fixed minor bugs.