Cleaned up the raster dummy stuff a bit