Added city and postal code.  Made minor fixes.