Retirement tax questions

Hi @dmertz thank you so much for the quick response! Just a couple follow up questions -

 

1. To confirm, the October 15 deadline only applies to removing the excess contribution and *not* when I actually need to file the 1040X by? That was the biggest confusion for me, because if there are no additional penalties / consequences to waiting until next year to file the amendment, I would prefer to wait until I receive the 1099-R just to be safe that I fill out the 1040X form correctly. 

 

2. When I fill out my 1040X, do I simply add the withdrawn amount (excess contribution withdrawn + earnings) to Line 1 (for AGI net change) on form 1040X?

 

Thanks again!