Fixes and other stuff but still crashes.