Small changes to help testing
fix apparent reversal of P & R for ceaf