minor improvements of order of Ps