7.8 Fixes and Warp fixes
Merge pull request #26 from sheganinans/master

7.8 Fixes and Warp fixes