Tidied up some country names and added all state names