Expand enums.
Remove stuttering in field names.
Many fixups and documentation fixes.