I double checked and my 1099-R matched what I said above. After I logged into TurboTax today, and did the latest updates, TT seems to have corrected the issue!
