added auto completion of parantheses, some refactoring for tokens