Add links to pms, clean up pms, clean up formatting of messages