Activated KPI flow, minor bugs solved