Retirement tax questions

Thanks for the reply.

I did file an amended return, but am still not sure I know how to do it correctly next year.