also match some punctuation