Fix model.md inconsistencies.
Merge branch 'staging' into dat/model