cfd:ws4:pre-final

Almost final changes.