- location bugfix
- update to UML diagram