fixed some more in scanner.c