SPU Fixes 2

It's almost finished