Fixed static field values to match Peter's excel.
Merge with current forms branch.
Merge branch 'forms' into formsMergeWithFixes