Fixed #185. Also added some much needed improvements to warp.

Didn't mean to work in this branch...

 - [ ] Send pull request
 - [ ] Check this box
 - [ ] Eat cookies
 - [ ] Say "yay!"
 - [ ] Merge pull request
 - [ ] ????
 - [ ] Profit!