Fixed a nasty typo in a query, implemented equating designators, added todos