Adding cfl and small fixes