Improved y-distortion with rift. Also fixed some bad merges from last time.