Optimize PS1
Misc updates