Further improvements to PS1.