more documentation.
Merge branch 'refactoring-a-lot-v2'