updated uml + doc + some stuff