adding city, state to json output; finalizing struct list