Retirement tax questions

I forgot to put the $6500 Roth contribution on my 2017 taxes.  So maybe I need to amend 2017.  

I also made an excess Roth contribution of $6500 in Jan of 2018 but realized my mistakes and withdrew it in December to avoid the penalty for 2018.