updated uml & small changes in classes to be in

sync with the uml