adds small fixes and cleanups for new ar pair tracking inclusion