diff --git a/pom.xml b/pom.xml
index 13aa58c08..f64399367 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +6,13 @@
 
 	<groupId>net.citizensnpcs</groupId>
 	<artifactId>citizens</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2</version>
 	<name>Citizens</name>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<craftbukkit.version>LATEST</craftbukkit.version>
-		<citizensapi.version>LATEST</citizensapi.version>
+		<citizensapi.version>2.0.2</citizensapi.version>
 		<vault.version>1.2.18-SNAPSHOT</vault.version>
 		<build.number>Unknown</build.number>
 	</properties>
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
index 73f102e84..324c67a46 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensMobNPC.java
@@ -17,6 +17,7 @@ import com.google.common.collect.Maps;
 
 public abstract class CitizensMobNPC extends CitizensNPC {
     private final Constructor<? extends EntityLiving> constructor;
+
     protected CitizensMobNPC(int id, String name, Class<? extends EntityLiving> clazz) {
         super(id, name);
         this.constructor = getConstructor(clazz);
diff --git a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
index 1ede609a8..1a459d1f9 100644
--- a/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
+++ b/src/main/java/net/citizensnpcs/npc/CitizensNPC.java
@@ -45,6 +45,8 @@ public abstract class CitizensNPC extends AbstractNPC {
         boolean keepSelected = getTrait(Spawned.class).shouldSpawn();
         if (!keepSelected)
             data().remove("selectors");
+        for (Trait trait : traits.values())
+            trait.onDespawn();
         getBukkitEntity().remove();
         mcEntity = null;
 
diff --git a/src/main/java/net/citizensnpcs/trait/Toggleable.java b/src/main/java/net/citizensnpcs/trait/Toggleable.java
index 471b437fd..7c608ab40 100644
--- a/src/main/java/net/citizensnpcs/trait/Toggleable.java
+++ b/src/main/java/net/citizensnpcs/trait/Toggleable.java
@@ -1,6 +1,5 @@
 package net.citizensnpcs.trait;
 
 public interface Toggleable {
-
     public boolean toggle();
 }
\ No newline at end of file
diff --git a/src/main/java/net/citizensnpcs/trait/text/Text.java b/src/main/java/net/citizensnpcs/trait/text/Text.java
index 411d13459..c5549b5ab 100644
--- a/src/main/java/net/citizensnpcs/trait/text/Text.java
+++ b/src/main/java/net/citizensnpcs/trait/text/Text.java
@@ -101,6 +101,12 @@ public class Text extends Trait implements Runnable, Toggleable, Listener, Conve
         range = key.getDouble("range", range);
     }
 
+    @Override
+    public void onAttach() {
+        if (text.isEmpty())
+            populateDefaultText();
+    }
+
     @EventHandler
     public void onRightClick(NPCRightClickEvent event) {
         if (!event.getNPC().equals(npc))
@@ -109,12 +115,6 @@ public class Text extends Trait implements Runnable, Toggleable, Listener, Conve
             sendText(event.getClicker());
     }
 
-    @Override
-    public void onSpawn() {
-        if (text.isEmpty())
-            populateDefaultText();
-    }
-
     private void populateDefaultText() {
         text.addAll(Setting.DEFAULT_TEXT.asList());
     }
diff --git a/src/main/java/net/citizensnpcs/trait/text/TextEditPrompt.java b/src/main/java/net/citizensnpcs/trait/text/TextEditPrompt.java
index cf650ca56..7afb684e0 100644
--- a/src/main/java/net/citizensnpcs/trait/text/TextEditPrompt.java
+++ b/src/main/java/net/citizensnpcs/trait/text/TextEditPrompt.java
@@ -19,8 +19,8 @@ public class TextEditPrompt extends StringPrompt {
     public Prompt acceptInput(ConversationContext context, String input) {
         int index = (Integer) context.getSessionData("index");
         text.edit(index, input);
-        Messaging.send((Player) context.getForWhom(), "<a>Changed entry at index <e>" + index + " <a>to <e>" + input
-                + "<a>.");
+        Messaging.send((Player) context.getForWhom(), "<a>Changed entry at index <e>" + index + " <a>to <e>"
+                + input + "<a>.");
         return new StartPrompt(text);
     }
 
diff --git a/src/main/java/net/citizensnpcs/trait/waypoint/WanderingWaypointProvider.java b/src/main/java/net/citizensnpcs/trait/waypoint/WanderingWaypointProvider.java
index 721d119c3..ab9074c89 100644
--- a/src/main/java/net/citizensnpcs/trait/waypoint/WanderingWaypointProvider.java
+++ b/src/main/java/net/citizensnpcs/trait/waypoint/WanderingWaypointProvider.java
@@ -49,6 +49,7 @@ public class WanderingWaypointProvider implements WaypointProvider {
         xrange = key.getInt("xrange", DEFAULT_XRANGE);
         yrange = key.getInt("yrange", DEFAULT_YRANGE);
     }
+
     @Override
     public void onSpawn(NPC npc) {
         this.npc = npc;
diff --git a/src/main/java/net/citizensnpcs/util/Paginator.java b/src/main/java/net/citizensnpcs/util/Paginator.java
index a0c07f252..b3ecd7f23 100644
--- a/src/main/java/net/citizensnpcs/util/Paginator.java
+++ b/src/main/java/net/citizensnpcs/util/Paginator.java
@@ -20,7 +20,8 @@ public class Paginator {
     }
 
     public boolean sendPage(CommandSender sender, int page) {
-        int pages = (int) ((lines.size() / LINES_PER_PAGE == 0) ? 1 : Math.ceil((double) lines.size() / LINES_PER_PAGE));
+        int pages = (int) ((lines.size() / LINES_PER_PAGE == 0) ? 1 : Math.ceil((double) lines.size()
+                / LINES_PER_PAGE));
         if (page < 0 || page > pages)
             return false;
 
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index a3800977b..ac3d7b7a7 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 name: Citizens
 authors: [aPunch, fullwall]
 softdepend: [Vault]
-version: 2.0.1
+version: 2.0.2
 main: net.citizensnpcs.Citizens
 website: http://www.citizensnpcs.net
 commands: