Fix corner case of m2 being the last char on the line
Add 'if'/'af' objects
Add [e and ]e