Retirement tax questions

Yes, that worked, part II filled in and line 13 and 14 now correctly show the non-taxable distribution, and the basis for 2021 and previous years now correctly shows zero.  

 

It seemed everything was entered correctly, and that was an excellent idea to re-enter.  You are a true expert on this topic and thank you so much!