More work on admin1 map