Propagate changes from refactoring.

partially propagate changes (#7)

migrate to sync dep (#1)

Update variable name.

Bring CF flows up-to-date with library.

Add all CF flow modulo the ones that require debugging.