updates to UML and minor WorldMap update