Fixed #185. Also added some much needed improvements to warp.
And small other things.