Minor changes

Change the name/admin1 columns to be strings, not factors. Some touch
up.