UML and combat changes

some small updates