Mistake on an amendment

I filed an amendment in Feb 2020 for federal tax return 2016. I have not received the result and couldn't find my status on IRS website. It tells me info is incorrect.

I found out the amendment was done incorrectly and need to re-amend it.

I found out a different error on state tax return(same year, 2016) and need to amend that, too.

 

How should I make a second amendment considering I did one amendment wrong. Can I simply correct it on the 2nd amendment and not clarify the 1st amendment?

I have not heard anything back and tomorrow is the 3 year deadline. I am not supposed to file anything before I heard back. What should I do?