Tidied code up a bit; added buddies/adversaries