Improved a validation, moved the comments into the rest of the REGEX  vals.