Sony's 6.2.B.1.96 merge

Hey, here's the changes I've made, as promised. Let me know if you have any problems or questions.

Enjoy!