Several changes towards a full 2AFC task.