a few adjustments; fixed search