Handle more cases in prover, add base_find.