cfd:ws3:misc improvements