made some additions to common.h and scanner.c