fix regex to include symbols and punctuations