Retirement tax questions

Thank you for such an excellent answer.  I understand now what the situation is and that my advisor at Vanguard misunderstood what I could expect from Vanguard in the form of a "corrected" 1099-R.  I think I can now  file my taxes using TurboTax because the software accounts for an excess RMD that is then rolled over back into the IRA.  Thanks again!