PS1 updates; cleanup