review cleanup; note that search mode is broken; see bug comment