Canadian expat filing US taxes with 1042-S

I’m an expat living and working in Canada. This year I have to also file a 1042-S, I closed out my US retirement and paid the required 30% tax. I followed information I found here on how to put the information on my US taxes and want to know if this information was correct because I feel as if I’ve missed a step. Help??
This is the info I used below

Here is the complete procedure to report, which includes the income tax withheld.

1. Open your return in TurboTax 
2. Click on Wages & Income 
3. Scroll down to All Income
4. Scroll down to Less Common Income 
5. Scroll down to Miscellaneous Income, 1099-A, 1099-C 
6. Click start 
7. Scroll down to Other reportable income 
8. Answer yes and record this as 1042S income and then the amount.

Now to report the tax withheld.

1. With your return open
2. Click on Deductions & Credits
3. Scroll down to Estimates and Other Taxes Paid\
4. Click on Other Income Taxes
5. Scroll down Other Income Taxes
6. Click on Withholding not already entered on a W-2 or 1099