Working on #369
Make tests pass, and some edits
Text tweak
make sure doc exists
Merge pull request #371 from plomino/jean-displayfield-default

Jean displayfield default