All finished now. When I handed my papers in I had organized for my school to cancel my WP that morning and bring me the paperwork. But having talked to the officer who first checked my papers, he said it was not necessary. So i contacted HR and asked her not to cancel it. Which she did. paperwork was fine, and I got a letter from out marriage registration office stating that then no longer kept the "single status" document that they said they required (not all offices require that). They accepted that, and also had an email from my embassy stating they cannot retroactively give a letter for that. Forgot to update the bankbook showing a transaction on the date, so wife sent her secretary to do that. Fortunately, we had a contact in immigration, so the process was smooth and in and out in less than 2 hours (waiting for the bankbook update took the longest.