Bug fixes, highlighting toggles, P2R distance option