scanner.c updates to struct