small changes to organization and city