cleaner data; added iso codes; early cleanup code