a few minor fixes and adding the uml
merging changes