City looks at annexation, zoning changes