diff --git a/DataCollection/gamedata.json b/DataCollection/gamedata.json
index 4b5276e..e2edd54 100644
--- a/DataCollection/gamedata.json
+++ b/DataCollection/gamedata.json
@@ -9,6 +9,7 @@
 	"buddy_request":"Attempting to Add Buddy.  The other player must click ADD BUDDY as well. (Many players reserve this for just a couple players so don't feel insulted if they do not).",
 	"drawing_notice":"Drawing not sent to other players when you are not a subscriber.",
 	"click_nothing_message":"Nothing interesting here...",
+	"playtime_timeout":"You have run out of playtime for now.  In one minute you will be disconnected.  You gain one minute of playtime every 8 minutes.  Please come back later!",
 	"sec_code":{
 		"invalid_sec_code":"Data Code Error. You did not get the bonus. You should reconnect if you get this message again.",
 		"item_earned":"You Earned a %ITEM%!"
@@ -54,6 +55,7 @@
 	"disconnect":{
 		"banned":"Your account has been BANNED. You will no longer be able to login",
 		"dupe_login":"Duplicate Login. Disconnecting Previous.",
+		"no_playtime":"You have run out of Time for this session. As an unsubscriber you gain one minute of playtime every 8 minutes.  Please come back later! ",
 		"client_timeout":{
 			"warn_after":10,
 			"kick_after":25,
@@ -107,16 +109,15 @@
 				"no_competition_gear":"^LYou have nothing interesting for special competition gear.",
 				"competition_gear_selected":"^LYou have the following selected for competition gear:",
 				
-				"seriously_hungry":"seriously hungry",
-				"really_hungry":"really hungry",
-				"hungry":"hungry",
-				"tiny_bit_thirsty":"a tiny bit thirsty",
-				"little_bit_thirsty":"a little bit thirsty",
-				"kind_of_thirsty":"kind of thirsty",
-				"thirsty":"thirsty",
-				"tiny_bit_tired":"a tiny bit tired",
-				"little_bit_tired":"a little bit tired",
-				"not_at_all_tired":"not at all tired"
+				"incredibly":"incredibly %STAT%",
+				"desprately":"desperately %STAT%",
+				"seriously":"seriously %STAT%",
+				"really":"really %STAT%",
+				"normal":"%STAT%",
+				"kind_of":"kind of %STAT",
+				"little_bit":"a little bit %STAT%",
+				"tiny_bit":"a tiny bit %STAT%",
+				"not_at_all":"not at all %STAT%"
 			},
 		},
 		"shop":{
@@ -299,7 +300,7 @@
 			"isle_format":"<B>%USERNAME%:</B> %MESSAGE% [%AMOUNT% on isle]",
 			"near_format":"<B>%USERNAME%:</B> %MESSAGE% [%AMOUNT% near]",
 			"mod_format":"<FONT COLOR='#880000'><B>%USERNAME%:</B> %MESSAGE%</FONT> [%AMOUNT% mods]",
-			"admin_format":"<FONT COLOR='#550000'><B>%USERNAME%:</B> %MESSAGE%</FONT> [%AMOUNT% admins]",
+			"admin_format":"<FONT COLOR='#800000'><B>%USERNAME%:</B> %MESSAGE%</FONT> [%AMOUNT% admins]",
 			"friend_format":"<FONT COLOR='#CC00CC'><B>%USERNAME%:</B> %MESSAGE%</FONT> [%AMOUNT% buds]",
 			"dm_format":"<FONT COLOR='#0000FF'><B>%FROMUSER%>%TOUSER%:</B> %MESSAGE%</FONT>"
 		},
@@ -342,6 +343,10 @@
 			{"word":"my phone","reason_type":"personal_info","match_all":true},
 			{"word":"phone number","reason_type":"personal_info","match_all":true},
 			{"word":"home address","reason_type":"personal_info","match_all":true},
+			{"word":"https","reason_type":"personal_info","match_all":true},
+			{"word":"//","reason_type":"personal_info","match_all":true},
+			{"word":".com","reason_type":"personal_info","match_all":true},
+			{"word":".net","reason_type":"personal_info","match_all":true},
 			{"word":"http","reason_type":"personal_info","match_all":true},
 			{"word":"40lb","reason_type":"personal_info","match_all":true}
 		],
diff --git a/Horse Isle Server/Horse Isle Server/Resources/server.properties b/Horse Isle Server/Horse Isle Server/Resources/server.properties
index 3e07619..e971ad8 100644
--- a/Horse Isle Server/Horse Isle Server/Resources/server.properties	
+++ b/Horse Isle Server/Horse Isle Server/Resources/server.properties	
@@ -16,7 +16,6 @@ db_port=3306
 map=HI1.MAP
 
 # JSON Format Data
-
 gamedata=gamedata.json
 
 # Cross-Domain Policy File
@@ -36,5 +35,9 @@ enable_word_filter=true
 # (NOTE: This feature is also used to filter some less-'bad' words disabling it will allow users to say them!)
 enable_corrections=true
 
+# Wether or not to consider all users "Subscribers"
+all_users_subscribed=false
+
+
 # Should print extra debug logs
 debug=false
\ No newline at end of file
diff --git a/Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs b/Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs
index 2fda49f..34008ee 100644
--- a/Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs	
+++ b/Horse Isle Server/Horse Isle Server/Server/ConfigReader.cs	
@@ -21,6 +21,7 @@ namespace HISP.Server
         public static string CrossDomainPolicyFile;
         public static bool Debug;
 
+        public static bool AllUsersSubbed;
         public static bool BadWords;
         public static bool DoCorrections;
 
@@ -92,6 +93,9 @@ namespace HISP.Server
                     case "crossdomain":
                         CrossDomainPolicyFile = data;
                         break;
+                    case "all_users_subscribed":
+                        AllUsersSubbed = data == "true";
+                        break;
                     case "enable_corrections":
                         BadWords = data == "true";
                         break;