added range validation

also includes additional regular expressions