Modified makefile and scanner.l