Minor cleanup -- also fixes in last push included: fixed an issue where the delay between searches was not random