Fixed tokeniser column/linenum updates, fixed wonky ungetc in comment reading