Yes, while working on my third return with non-taxable retirement I noticed something wrong.  I have had the codes for State Retirement, Teacher Retirement and Federal Retirement not carry over.  I have to do two amendment returns.