lots of user flow enhancements