2) To correct I-94. Consult CBP website for the procedure.
I prefer to using this one. But yesterday I went to the Deferred Inspection Unit. Since I forgot if I present I797 when I entered USA, the officer said it was their fault and did not correct it. He is very not nice! I think if I can call CBP and get it corrected from Terminal of airport, I don't know if it I will be considered outside USA and reenter. the number of my Visa entry is one.