all WCH minor fixes