reverted to when scanner.l worked, also done some more on lab2