bugs in cfd fixed