khloud fixed code and UML issues