Added/extended some of the user stories.