added city and state and some other form changes