Retirement tax questions

Thank you macuser_22.. looks like #2 is my issue.  I can revisit my return from last year later but how can I enter correctly for this year since the program carries info over from last year?