Put back most of the cheat search. Still buggy, though...