Updated raster sampling and processing to take care of minor niggles