Diplomacy gui, rely less on meta data, and fixes