Get your taxes done using TurboTax

as to the catch-up, you are correct. that extra $1k must go into the account for the spouse(s) that are over 55.