PSIonic Upgrades

A few tweaks to PSI