Variablizing state/province names, fixing some typos