Im flying from NYC to Thailand and return flight is Thailand to NYC with an 8hr layover in Beijing

If I understand correctly, the 72-hour free transit would apply to my situation and I can leave the airport to visit the Great Wall. In addition I do not need to apply for this transit G type in advance but upon arrival to Beijing I can obtain this visa for free . Is this correct?