add MP_IDENTIFIERs, and fix line and column counting