More crawler improvements