added file line/ofs referencing, and expression debug