Added code output examples to choice docs
Brought doc tests for Fields up to date
Other misc tweaks