More user-flow updates and finished messages api