Fix line/column numbers for scanner

Yeah, these are all kind of screwed up, I think they are mostly random right now. Sometimes it is off by 1 line and a bunch of columns.

Just revisit and fix, having accurate line/column numbers in errors would be very helpful.
