diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar
index 57d5d5f..617c758 100644
Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ
diff --git a/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
index 1af8d33..d74721a 100644
--- a/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
+++ b/src/io/github/norbipeti/thebuttonmc/ChatProcessing.java
@@ -363,6 +363,7 @@ public class ChatProcessing {
 						else
 							obj.getScore(p.getName()).setScore(-1);
 					} catch (Exception e) {
+						obj.getScore(p.getName()).setScore(-1);
 					}
 				}
 				PluginMain.Instance
diff --git a/src/io/github/norbipeti/thebuttonmc/Commands.java b/src/io/github/norbipeti/thebuttonmc/Commands.java
index 3003b18..db7f7f0 100644
--- a/src/io/github/norbipeti/thebuttonmc/Commands.java
+++ b/src/io/github/norbipeti/thebuttonmc/Commands.java
@@ -275,7 +275,7 @@ public class Commands implements CommandExecutor {
 				return true;
 			}
 			case "tableflip": {
-				String msg = "(╯°□°）╯︵ ┻━┻";
+				String msg = " (╯°□°）╯︵ ┻━┻";
 				if (args.length > 0) {
 					msg = args[0] + " " + msg;
 				}
@@ -283,7 +283,15 @@ public class Commands implements CommandExecutor {
 				return true;
 			}
 			case "unflip": {
-				String msg = "┬─┬ ノ( ゜-゜ノ)";
+				String msg = " ┬─┬ ノ( ゜-゜ノ)";
+				if (args.length > 0) {
+					msg = args[0] + "" + msg;
+				}
+				player.chat(msg);
+				return true;
+			}
+			case "shrug": {
+				String msg = " ¯\\_(ツ)_/¯";
 				if (args.length > 0) {
 					msg = args[0] + "" + msg;
 				}
diff --git a/src/io/github/norbipeti/thebuttonmc/PlayerListener.java b/src/io/github/norbipeti/thebuttonmc/PlayerListener.java
index 98670dd..3d5f916 100644
--- a/src/io/github/norbipeti/thebuttonmc/PlayerListener.java
+++ b/src/io/github/norbipeti/thebuttonmc/PlayerListener.java
@@ -117,7 +117,7 @@ public class PlayerListener implements Listener {
 					}
 				}
 			};
-			tt.mp = mp;
+			tt.mp = mp;;
 			timer.schedule(tt, 15 * 1000);
 		}
 
@@ -204,8 +204,8 @@ public class PlayerListener implements Listener {
 		tt.mp = mp;
 		int timeout = AuthMe.getInstance().getConfig()
 				.getInt("settings.restrictions.timeout");
-		timer.schedule(tt, timeout / LoginWarningCountTotal * 1000, timeout
-				/ LoginWarningCountTotal * 1000);
+		timer.schedule(tt, (timeout / LoginWarningCountTotal) * 1000,
+				(timeout / LoginWarningCountTotal) * 1000);
 
 		/* NICKNAME LOGIC */
 
@@ -712,20 +712,22 @@ public class PlayerListener implements Listener {
 
 	@EventHandler(priority = EventPriority.LOWEST)
 	public void onPlayerTeleport(PlayerTeleportEvent e) {
-		/*if (BoardColl.get().getFactionAt(PS.valueOf(e.getFrom())).getId()
-				.equalsIgnoreCase("nomansland")
-				|| BoardColl.get().getFactionAt(PS.valueOf(e.getTo())).getId()
-						.equalsIgnoreCase("nomansland")) {*/
-			// e.setTo(e.getFrom());
-			//e.setCancelled(true); // Relative coordinates mess it up
-			/*
-			 * System.out.println("From: " + e.getFrom());
-			 * System.out.println("To: " + e.getTo());
-			 * System.out.println("Cause: "+e.getCause());
-			 */
-			/*e.getPlayer().sendMessage(
-					"§cYou are not allowed to teleport to/from No Mans Land.");
-		}*/
+		/*
+		 * if (BoardColl.get().getFactionAt(PS.valueOf(e.getFrom())).getId()
+		 * .equalsIgnoreCase("nomansland") ||
+		 * BoardColl.get().getFactionAt(PS.valueOf(e.getTo())).getId()
+		 * .equalsIgnoreCase("nomansland")) {
+		 */
+		// e.setTo(e.getFrom());
+		// e.setCancelled(true); // Relative coordinates mess it up
+		/*
+		 * System.out.println("From: " + e.getFrom()); System.out.println("To: "
+		 * + e.getTo()); System.out.println("Cause: "+e.getCause());
+		 */
+		/*
+		 * e.getPlayer().sendMessage(
+		 * "§cYou are not allowed to teleport to/from No Mans Land."); }
+		 */
 
 		if (MaybeOfflinePlayer.GetFromPlayer(e.getPlayer()).ChatOnly) {
 			e.setCancelled(true);