Add the <value> tag to the primary name of a value option
Added regex and function validators to option values.

Cleaned up some error messages.