diff --git a/event.inc b/event.inc
index 253b07b..062f63a 100644
--- a/event.inc
+++ b/event.inc
@@ -102,12 +102,8 @@ hook OnPlayerCommandText(playerid, cmdtext[]) {
 
     for(new i = 0; i < EVENT_MAX_CONCURRENT; i++) {
         if(gEventData[i][eID] != 0) {
-            
-            new buffer[30];
-            strcat(buffer, "/");
-            strcat(buffer, gEventData[i][eCommand]);
 
-            if(!strcmp(cmdtext, buffer, true)) {
+            if(!strcmp(cmdtext, gEventData[i][eCommand], true)) {
                 PutPlayerInEvent(playerid, i);
                 return 1;
             }
@@ -231,9 +227,10 @@ public RemovePlayerFromEvent(playerid) {
     return 0;
 }
 
-forward GetEventName(eventid);
-public GetEventName(eventid) {
-    return gEventData[eventid][eName];
+forward GetEventName(eventid, buffer[], size);
+public GetEventName(eventid, buffer[], size) {
+    strcat(buffer, gEventData[eventid][eName], size);
+    return 1;
 }
 
 forward GetEventCommand(eventid);
diff --git a/event_api.inc b/event_api.inc
index 6bafd2d..04da5b4 100644
--- a/event_api.inc
+++ b/event_api.inc
@@ -52,7 +52,9 @@ public API_OnPlayerSpawnInEvent(playerid, id) {
 }
 
 stock GetName() {
-    return CallRemoteFunction("GetEventName", "i", gEventID);
+    new buffer[60];
+    CallRemoteFunction("GetEventName", "iai", gEventID, buffer, sizeof(buffer));
+    return buffer;
 }
 
 stock GetCommand() {
diff --git a/filterscripts/minigun-dm/minigun-dm.pwn b/filterscripts/minigun-dm/minigun-dm.pwn
index 8fd7add..f89da33 100644
--- a/filterscripts/minigun-dm/minigun-dm.pwn
+++ b/filterscripts/minigun-dm/minigun-dm.pwn
@@ -5,7 +5,7 @@
 #include <a_samp>
 #include <event_api>
 
-const Float: gSpawnPoints[][4] = 
+static const Float: gSpawnPoints[][4] = 
 {
 	{ 2552.7036,2813.3635,27.8203,180.5949 },
 	{ 2610.1797,2820.7148,27.8203,173.7014 },
@@ -74,7 +74,7 @@ public OnPlayerDeath(playerid, killerid, reason) {
 }
 
 SetUpPlayer(playerid) {
-    new idx = random(sizeof(g_SpawnPoints));
+    new idx = random(sizeof(gSpawnPoints));
     SetPlayerPos(playerid, gSpawnPoints[idx][0], gSpawnPoints[idx][1], gSpawnPoints[idx][2]);
     SetPlayerFacingAngle(playerid, gSpawnPoints[idx][3]);
     GivePlayerWeapon(playerid, 38, 5000);
diff --git a/filterscripts/minigun-dm/pawn.json b/filterscripts/minigun-dm/pawn.json
index 92a3ae0..5ef2559 100644
--- a/filterscripts/minigun-dm/pawn.json
+++ b/filterscripts/minigun-dm/pawn.json
@@ -4,6 +4,7 @@
 	"entry": "minigun-dm.pwn",
 	"output": "../minigun-dm.amx",
 	"dependencies": [
-		"sampctl/samp-stdlib"
+		"sampctl/samp-stdlib",
+		"bwhitmire55/samp-event"
 	]
 }
\ No newline at end of file
diff --git a/test.pwn b/test.pwn
index 5d515f5..71305ab 100644
--- a/test.pwn
+++ b/test.pwn
@@ -6,6 +6,18 @@ main() {
 
 public OnGameModeInit() {
     print("Test mode for event.inc");
-    LoadEvent(1);
     return 1;
+}
+
+public OnPlayerCommandText(playerid, cmdtext[]) {
+    if(!strcmp(cmdtext, "/test1", true)) {
+        LoadEvent(1);
+        return 1;
+    }
+
+    if(!strcmp(cmdtext, "/test2", true)) {
+        LoadEvent(2);
+        return 1;
+    }
+    return 0;
 }
\ No newline at end of file