More crawler improvements.