cleaned up some obvious wrinkles in s3 mpu wiring