Fixes and improvements

Fixed corrupt warp removal and improved memory usage with property file
saving in many cases