diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index b97589c..7179e41 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
index ddc8fc1..485e164 100644
--- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
+++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
@@ -141,8 +141,9 @@ public class PlayerListener implements Listener { // 2015.07.16.
 		}
 
 		boolean greentext = event.getMessage().startsWith(">");
-		Commands.Lastlol = MaybeOfflinePlayer.AllPlayers.get(event.getPlayer()
-				.getUniqueId());
+		if (event.getMessage().contains("lol"))
+			Commands.Lastlol = MaybeOfflinePlayer.AllPlayers.get(event
+					.getPlayer().getUniqueId());
 
 		MaybeOfflinePlayer player = MaybeOfflinePlayer.AllPlayers.get(event
 				.getPlayer().getUniqueId());
@@ -300,15 +301,15 @@ public class PlayerListener implements Listener { // 2015.07.16.
 					index = PluginMain.Instance.Towns.size() - 1;
 				}
 				// PluginMain.SB.getObjective("town").getScore(event.getPlayer().getName()).setScore(index);
-				//System.out.println("index: " + index);
+				// System.out.println("index: " + index);
 				Objective obj = PluginMain.SB.getObjective("town");
-				//System.out.println("obj: " + obj);
+				// System.out.println("obj: " + obj);
 				for (Player p : PluginMain.GetPlayers()) {
 					System.out.println(town.getName());
 					try {
 						if (PluginMain.Instance.TU.getResidentMap()
-								.get(p.getName().toLowerCase()).getTown().getName()
-								.equals(town.getName()))
+								.get(p.getName().toLowerCase()).getTown()
+								.getName().equals(town.getName()))
 							obj.getScore(p.getName()).setScore(index);
 						else
 							obj.getScore(p.getName()).setScore(-1);
@@ -370,8 +371,8 @@ public class PlayerListener implements Listener { // 2015.07.16.
 				for (Player p : PluginMain.GetPlayers()) {
 					try {
 						if (PluginMain.Instance.TU.getResidentMap()
-								.get(p.getName().toLowerCase()).getTown().getNation()
-								.getName().equals(nation.getName()))
+								.get(p.getName().toLowerCase()).getTown()
+								.getNation().getName().equals(nation.getName()))
 							obj.getScore(p.getName()).setScore(index);
 					} catch (Exception e) {
 					}
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class
index 65fc67a..9005a57 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class differ
diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class
index 44fc632..361b0c3 100644
Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ