Add models from Bob Fourer
Add tests.
Fix a typo.
Update .nl files.