U.S. advances deal with Iran to swap prisoners, free frozen oil funds