Minor changes to guessing.