Retirement tax questions

@macuser_22:  Ok, thanks again for your explanations.  This clarifies a lot.  I need to amend my 2015 and 2016 returns.

One other item I'm struggling with is that my CPA tells me that lines 6 and 8 on Form 8606 need to be filled in.  However, I've been following the step-by-step instructions in the financebuff article you shared in the original post and can't seem to get those lines populated using TurboTax.  TurboTax doesn't even let me manually enter any amounts on those lines in form view.

What am I not doing correctly?