Phases revisions

@adgreenway Another set of tweaks and revisions for you to have a look over.