Thank you for the help!
As for the NY income - yes all the RSU that vested are included in the income. I checked my stock paystub.
Also, the W2 box for NY has the same income as Federal.
My work address has been in NYC city since the start date. So it looks like NYC reported wages and NY wages should be the same.
