more types, less overly strict regex.