Retirement tax questions

I am not expecting a refund (I can only dream) but I have amended as it was accepted this morning. 

Form 8606

line 1- $6000

line 2- $6000

line 3- $12000

line 5- $12000

line 13- $12000

line 16- $12000

line 17- $12000

 

1040

line 4b no longer has the rollover printed. Is this accurate now?? 

you are a godsend @DanaB27