Work on google, update psx to working version from psx's trunk