Angelo's promotion causes tension. Geoff struggles to deal with the fall-out of the riot. Xavier tries to make amends to Charlie for what Hugo did