Update from PSP

[shi_pi]

This is going to take a while to write. I am updating my LJ via PSP, tis' crazy... Gonna stop cuz its tedious.