user flow updates

the basic changes are the order when and what triggers a save of a lock so that the user is impacted the least amount possible