Retirement tax questions

My advice is wait till TT fixes the issue. Long years dealing with the IRS tells me they will reject for the slightest problem.