Clarified definition of some fields, including design for #11