organ setting city and state is now correct
some issues fixed