minor tweaks of PP/TOS