re-check and fix bugs for the flow

In Progress