added @ and # to symbol regular expressions
fixed bugs caused by having a _- combination being an invalid regex