UML added, bugs fixed