Retirement tax questions

Thank you, @RogerD1. Just want to confirm:

 

Federal Tax Section: For page "These situations may lower your tax bill", "corrective distributions made before the return’s due date" --> enter only the earnings, not the contributions.

 

State Tax Section: For "other contributions previously taxed by Massachusetts" -- > enter only the contributions, not the earnings.

 

Thank you again for the clarification.