fixed user flow in a few places (wip)