Added punctuation to Town pattern + Password stuff