changing some more things in scanner.c