add non-combiner WC, some other refinements