Some slight searching improvements and autopairing.