Implement Warpriest & a couple PFS fixes