add alerting incubation + minor fixes