UML Update

More updates to UML. Fixes in PhaseState.