CORE: changing leaders, QMs, more zoning fixes