Retirement tax questions

Thank you for the detailed reply.

"your elective deferrals and Roth contributions to both your individual 401(k) and any plan provided by the new employer combined is not permitted to exceed $20,500" -- I think I follow this, and if I'm understanding right, then the *employer* contributions I make to my solo 401k would not count towards this limit, correct?