Help filling I-485

[DhavalVA]

I am filling I-485 for my change of status and am curious as to what should I fill in for the NONIMMIGRANT VISA NUMBER? Is this the Control Number stated on the visa or is it the Annotation?

Also I have gotten married already. So should I fill in the forms with new last name or the maiden name?

Thanks