Change in aspiration windows

These are the other two changes introduced to the search. If it should pass they have to be tested apart rom the mate_threat change.