added cases for special symbol.
added quote case and forgot to add in previous
Fixed Token and WordToken