diff --git a/scripting/include/feedthetrolls/base.inc b/scripting/include/feedthetrolls/base.inc
index c1d8837..1e990f2 100644
--- a/scripting/include/feedthetrolls/base.inc
+++ b/scripting/include/feedthetrolls/base.inc
@@ -1,8 +1,11 @@
 
 #define MAX_TROLL_NAME_LENGTH 32
 #define MAX_TROLL_FLAG_LENGTH 32
-#define MAX_TROLLS 29
-//#define DEBUG 1
+//Allow MAX_TROLLS to be defined elsewhere
+#if defined MAX_TROLLS
+#else
+    #define MAX_TROLLS 29
+#endif
 
 enum trollModifier {
     TrollMod_Invalid = 0,
@@ -28,15 +31,14 @@ char trollIds[MAX_TROLLS+1][MAX_TROLL_NAME_LENGTH];
 
 enum struct Troll {
     int id;
+    int categoryID;
 
     char name[MAX_TROLL_NAME_LENGTH];
     char description[128];
 
     int mods;
-    int categoryID;
 
     int activeFlagClients[MAXPLAYERS+1];
-
     ArrayList flagNames;
     int defaultFlags;
     bool flagsMultiselectable;
@@ -101,6 +103,7 @@ enum struct Troll {
     }
 
 /////// TROLL ACTIVATION
+
     void Activate(int client, int activator, trollModifier modifier = TrollMod_Invalid, int flags = 0) {
         if(modifier == TrollMod_Invalid) modifier = this.GetDefaultMod();
         ApplyTroll(client, this.name, activator, modifier, false, flags);
@@ -183,12 +186,6 @@ int GetTrollByKeyIndex(int index, Troll troll) {
     // return GetTroll(name, troll);
 }
 
-bool GetTrollID(int index, char name[MAX_TROLL_NAME_LENGTH]) {
-    if(index > MAX_TROLLS) return false;
-    strcopy(name, sizeof(name), trollIds[index]);
-    return true;
-}
-
 void ToggleTroll(int client, const char[] name, int flags = 0) {
     static Troll troll;
     int index = GetTroll(name, troll);
diff --git a/scripting/include/feedthetrolls/trolls.inc b/scripting/include/feedthetrolls/trolls.inc
index 6f466b2..48a4516 100644
--- a/scripting/include/feedthetrolls/trolls.inc
+++ b/scripting/include/feedthetrolls/trolls.inc
@@ -55,6 +55,14 @@ void SetupTrolls() {
     SetupTroll("Inverted Controls", "Well, aint it obvious", TrollMod_Constant);
     SetupTroll("Stagger", "Like a slap, but different", TrollMod_Instant);
     //INFO: UP MAX_TROLLS when adding new trolls!
+    
+
+    // Initialize the default flag values to -1
+    for(int i = 0; i <= MAX_TROLLS; i++) {
+        for(int j = 1; j <= MAXPLAYERS+1; j++) {
+            Trolls[i].activeFlagClients[j] = -1;
+        }
+    }
 }
 
 void AddMagnetFlags(int index) {