Re-zoning, city pay raises discussed