Modified some user stories to be easier to understand