Rapp discovery speedup

This addresses #71.