CFD:WS2:misc improvements