basic flow
small fixes