more changes to lexical analysis...