several fixes + added raster generator