Some fixed bugs and UML changes