- added diplomacy
 - simple code cleanup