diff --git a/classes/class_irc.php b/classes/class_irc.php
index 40f6e6d8..4c28b835 100644
--- a/classes/class_irc.php
+++ b/classes/class_irc.php
@@ -192,10 +192,10 @@ protected function listen() {
 				}
 
 				if (preg_match("/:([^!]+)![^\s]* KICK #what.cd-disabled.* /", $this->Data, $Nick)) {
-					if (isset($this->DisabledUsers[$Nick[1]])) {
-						$Nick = explode(" ", $Nick[0]);
+					$Nick = explode(" ", $Nick[0]);
+					if (isset($this->DisabledUsers[$Nick[3]])) {
 						$DB->query("DELETE FROM disable_list WHERE Nick = '" . $Nick[3] . "'");
-						unset($this->DisabledUsers[$Nick[1]]);
+						unset($this->DisabledUsers[$Nick[3]]);
 					}
 				}
 
diff --git a/classes/class_votes.php b/classes/class_votes.php
index dc2992fc..d01ccdf8 100644
--- a/classes/class_votes.php
+++ b/classes/class_votes.php
@@ -61,7 +61,7 @@ public static function get_group_votes($GroupID) {
 			} else {
 				$GroupVotes = $DB->next_record(MYSQLI_ASSOC, false);
 			}
-			$Cache->cache_value('votes_'.$GroupID, $GroupVotes);
+			$Cache->cache_value('votes_'.$GroupID, $GroupVotes, 259200);
 		}
 		return $GroupVotes;
 	}
@@ -211,7 +211,7 @@ public static function get_rank_all($GroupID) {
 			while (list($GID) = $DB->next_record()) {
 				$Rankings[$GID] = ++$i;
 			}
-			$Cache->cache_value('voting_ranks_overall', $Rankings);
+			$Cache->cache_value('voting_ranks_overall', $Rankings, 259200);
 		}
 
 		return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;
@@ -246,7 +246,7 @@ public static function get_rank_year($GroupID, $Year) {
 			while (list($GID) = $DB->next_record()) {
 				$Rankings[$GID] = ++$i;
 			}
-			$Cache->cache_value('voting_ranks_year_'.$Year , $Rankings);
+			$Cache->cache_value('voting_ranks_year_'.$Year , $Rankings, 259200);
 		}
 
 		return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;
@@ -286,7 +286,7 @@ public static function get_rank_decade($GroupID, $Year) {
 			while (list($GID) = $DB->next_record()) {
 				$Rankings[$GID] = ++$i;
 			}
-			$Cache->cache_value('voting_ranks_decade_'.$Year , $Rankings);
+			$Cache->cache_value('voting_ranks_decade_'.$Year , $Rankings, 259200);
 		}
 
 		return isset($Rankings[$GroupID])?$Rankings[$GroupID]:false;
diff --git a/sections/tools/misc/update_geoip.php b/sections/tools/misc/update_geoip.php
index f0eeb3f4..f548ff39 100644
--- a/sections/tools/misc/update_geoip.php
+++ b/sections/tools/misc/update_geoip.php
@@ -11,7 +11,7 @@
 shell_exec('unzip GeoLiteCity-latest.zip');
 shell_exec('rm GeoLiteCity-latest.zip');
 
-if(($Locations = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Locations = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Location.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	error("Download or extraction of maxmind database failed");
 }
 array_shift($Locations);
@@ -30,7 +30,7 @@
 echo "There are ".count($CountryIDs)." CountryIDs";
 echo "<br />";
 
-if(($Blocks = file("GeoLiteCity_".date('Ym')."05/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
+if(($Blocks = file("GeoLiteCity_".date('Ym')."02/GeoLiteCity-Blocks.csv", FILE_IGNORE_NEW_LINES)) === false) {
 	echo "Error";
 }
 array_shift($Blocks);
diff --git a/static/styles/dark_ambient/style.css b/static/styles/dark_ambient/style.css
index 1ee8a006..1086a493 100644
--- a/static/styles/dark_ambient/style.css
+++ b/static/styles/dark_ambient/style.css
@@ -247,6 +247,7 @@ ul#userinfo_username li, ul#userinfo_major li, ul#userinfo_stats li {
 }
 
 ul#userinfo_username li a {
+	overflow: hidden;
 	color: #d5efff;
 }
 
@@ -394,7 +395,12 @@ ul#userinfo_stats {
 ul#userinfo_username {
 	z-index: 6;
 	padding-left: 320px;
-	width: 175px;
+	width: 185px;
+}
+
+.username {
+	text-overflow: ellipsis;
+	max-width: 70px;
 }
 
 #alerts {
diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css
index 8baf48e6..b0c8b328 100644
--- a/static/styles/proton/style.css
+++ b/static/styles/proton/style.css
@@ -255,6 +255,7 @@ ul#userinfo_username li, ul#userinfo_major li, ul#userinfo_stats li {
 
 ul#userinfo_username li a {
 	color: #bebebe;
+	overflow: hidden;
 }
 
 ul#userinfo_username li a:hover {
@@ -264,6 +265,8 @@ ul#userinfo_username li a:hover {
 
 ul#userinfo_username li a.username {
 	color: #575757;
+	max-width: 70px;
+	text-overflow: ellipsis;
 }
 
 ul#userinfo_username li a.username:hover {
@@ -380,6 +383,7 @@ ul#userinfo_minor a:hover {
 ul#userinfo_major {
 	z-index: 2;
 	padding-left: 510px;
+	width: 300px;
 }
 
 ul#userinfo_minor {
@@ -397,6 +401,7 @@ ul#userinfo_stats {
 ul#userinfo_username {
 	z-index: 5;
 	padding-left: 290px;
+	width: 200px;
 }
 
 #alerts {
@@ -1533,11 +1538,11 @@ h3 {
 }
 
 #userinfo_username .brackets {
-	padding: 0;
+	padding: 0 8px;
 }
 
 #userinfo_major .brackets {
-	padding: 0;
+	padding: 0 8px 0 0;
 }
 
 #forums table.border .cat_list {