Fixed a couple of errors in user flow