various parser tweaks and work on infrastructure, change to equivalences