Retirement tax questions

Thanks for your reply.  It helped me discover that I incorrectly entered my PSP retirement contribution as an IRA. Fixed now.