fixing uml #83 #84 #127