Remove debugging from lexer, aadd proc support