changes to scanner.mll