improved token management
added needed functionality in tokenmanager and started factoring parsers