Minor fixes, batch paired intersection nearly done