adding raster maxima extractor + some cleanup