Failed to file form 8606 in 2020 and made the Roth-IRA conversion in 2021

I used Turbotax to file my tax return for both 2020 and 2021, but I neglected to file form 8606 for my nondeductible contribution in 2020.  In 2021 I did a Roth-IRA conversion so now I need to pay tax for that after-tax contribution. I wonder: (1) Should I use Turbotax 2020 to file delinquent Forms 8606? Do I need to amend my tax return in 2020? (2) For the tax return 2021, how should I report this contribution? There is no form 8606 for me to report this contribution is after-tax.

 

A minor question, during my 2020 contribution, I contributed $6000 to Roth-IRA first and a few months later I realized I was not eligible to contribute to Roth-IRA. Therefore, I recharacterized the money to the traditional IRA, however, the $6000 had become $6100, so there was in fact $6100 going into the traditional IRA. Does this mean the extra $100 is an excessed contribution?