Subject: Investment/Retirement Accounts

I'm trying to see if I'm missing any accounts I should be contributing to while I go back to work for a few months.
Anything I'm missing?

401K work plan - Immediate vesting so at a minimum ensure max matching. I'm likely to try and do the whole $30,500 for people over 50 and put it into the tax deferred portion and not Roth since my income will likely to be lower once I stop working.

Individual Roth - This seems to be $8,000 ($7K+1K for those over 50). Also from what I've read I can also do one for my wife since she doesn't have a paying job.

Anything else?

Any Roth conversions will be delayed until a year when I have no income from a job.

Thanks
Rich