More work done on diplomacy.txt