Fix Jordan's address (hope he doesn't mind) and add CVS Id. Also