Retirement tax questions

Answer NO, as you did not repay during 2020.  Any repayment in 2021 will be handled on the 2021 return that you file in early 2022.