Cleaned up and fixed multipass code
Potential fix for save/load smashing, should run everything through the proxy potentially
Cast the right object
Merge remote-tracking branch 'upstream/master'