more fixes to scanner; still invalid