More work on diplomacy.txt