bdi4jade

diff --git a/bdi-jade/src/br/pucrio/inf/les/bdijade/belief/Belief.java b/bdi-jade/src/br/pucrio/inf/les/bdijade/belief/Belief.java
index 2a9087a..6b2385a 100644
--- a/bdi-jade/src/br/pucrio/inf/les/bdijade/belief/Belief.java
+++ b/bdi-jade/src/br/pucrio/inf/les/bdijade/belief/Belief.java
@@ -41,6 +41,19 @@ public abstract class Belief<T> extends MetadataElement implements
 	}
 
 	/**
+	 * Initializes a belief with its name.
+	 * 
+	 * @param name
+	 *            the belief name.
+	 * @param value
+	 *            the belief initial value.
+	 */
+	public Belief(String name, T value) {
+		this(name);
+		setValue(value);
+	}
+
+	/**
 	 * Adds a belief base that contains this belief. The agent whose capability
 	 * contains this belief in the belief base believes in this belief.
 	 * 

diff --git a/bdi-jade/src/br/pucrio/inf/les/bdijade/core/BDIAgent.java b/bdi-jade/src/br/pucrio/inf/les/bdijade/core/BDIAgent.java
index fa2b036..89aa3a0 100644
--- a/bdi-jade/src/br/pucrio/inf/les/bdijade/core/BDIAgent.java
+++ b/bdi-jade/src/br/pucrio/inf/les/bdijade/core/BDIAgent.java
@@ -337,7 +337,7 @@ public class BDIAgent extends Agent {
 			if (removed) {
 				capability.setMyAgent(null);
 			}
-			return this.capabilities.remove(capability);
+			return removed;
 		}
 	}
 
@@ -431,8 +431,8 @@ public class BDIAgent extends Agent {
 	 */
 	@Override
 	protected void takeDown() {
-		for (Capability capability : capabilities) {
-			this.removeCapability(capability);
+		while (!capabilities.isEmpty()) {
+			this.removeCapability(capabilities.iterator().next());
 		}
 	}
 

diff --git a/bdi-jade/src/br/pucrio/inf/les/bdijade/core/Capability.java b/bdi-jade/src/br/pucrio/inf/les/bdijade/core/Capability.java
index 2082965..05cbe1f 100644
--- a/bdi-jade/src/br/pucrio/inf/les/bdijade/core/Capability.java
+++ b/bdi-jade/src/br/pucrio/inf/les/bdijade/core/Capability.java
@@ -3,6 +3,8 @@
  */
 package br.pucrio.inf.les.bdijade.core;
 
+import java.io.Serializable;
+
 import jade.lang.acl.ACLMessage;
 
 /**
@@ -12,7 +14,7 @@ import jade.lang.acl.ACLMessage;
  * 
  * @author ingrid
  */
-public class Capability {
+public class Capability implements Serializable {
 
 	private static final long serialVersionUID = -4922359927943108421L;