What China has and hasn't done to address U.S. trade gripes