Retirement tax questions

ADDENDUM:

If you end up having to prepare an amended return, it's recommended that you wait for the IRS to finish processing your return and that you receive any refund (if applicable) before amending.

Also, if you amend a Federal return, you will likely have to amend a state return, too, if applicable.