Spouse of PR Holder or Citizen?- PJiang and XiaoBaitu - Please h

I am a Green Card holder. I applied for my wife in 2003, and her I-130 has been approved. Her priority date is coming up in a couple of months. In the meantime, my citizenship interview is scheduled in Sept.

So, my questions are about timing:

1. If I get my citizenship first and want to file for her, do I do a fresh I-130 with the I-485? Do I need to "withdrawl" the previous application?

2. If my citizenship is delayed and we file I-485 based on the approved I-130, and then my citizenship is approved, what becomes of the filed I-485? Can it still continue?

Thank you very much for the help.