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

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