small fix
improved token scanners