Retirement tax questions

Yes, that is correct and I just edited the answer to show 2a as you can print this and give it your 2016 preparer.  I am a CPA with over 40 years of tax work. Thank you for pointing the 2a and 2b to me as I work with numerous forms throughout the day.