Update with more uses and user stories
Various other changes.
Merged branch.