cleaning up PSUL and making it easy to do the 20158 switch

This was a bug! Thanks for noticing! @mariogiov