Updated documentation and fixed numerous errors.
Added a choices file for codified values
Merge branch 'my'