Copy updates

- a number of copy updates
- some template refactors
- updated tests to reflect changes

fixes #323