Retirement tax questions

I have two 1099-Rs. I have put them both separately in turbotax. 

For the rollover 1099-R, i have given it the code 2 and marked that I rolled over all of the money ($6000)

For my cashed out 1099-R, the code is 1. It does have a state distrubtion on it for the full amount ($141). I have marked that I've cashed it out 

The 1040 still has 6141 in field 4a and 0 in field 4b