Looks like you got all the questions about rolling it over.
If you are looking at a summary screen or review screen those show all the full amounts as income and lump a lot of stuff together. You need to check the actual 1040 line 4b and make sure it's right.
