Bug fixes. Ran raster through steps 2-6.