NOAA moves ahead with whale-safety rules