Fix up user stories a bit more