diff --git a/plugins/l4d2_feedthetrolls.smx b/plugins/l4d2_feedthetrolls.smx
index 0c4b3c8..255bd73 100644
Binary files a/plugins/l4d2_feedthetrolls.smx and b/plugins/l4d2_feedthetrolls.smx differ
diff --git a/scripting/include/feedthetrolls/base.inc b/scripting/include/feedthetrolls/base.inc
index 0d0b329..bf5de3c 100644
--- a/scripting/include/feedthetrolls/base.inc
+++ b/scripting/include/feedthetrolls/base.inc
@@ -114,12 +114,12 @@ void ApplyTroll(int victim, const char[] name, int activator, trollModifier modi
 
     if(!silent) {
         if(IsTrollActive(victim, name)) {
-            ShowActivity(victim, "deactivated troll \"%s\" on %N. ", troll.name, victim);
+            ShowActivity(activator, "deactivated troll \"%s\" on %N. ", troll.name, victim);
         } else {
             if(modifier == TrollMod_Constant)
-				ShowActivity(victim, "activated constant troll \"%s\" for %N. ", troll.name, victim);
+				ShowActivity(activator, "activated constant troll \"%s\" for %N. ", troll.name, victim);
 			else
-				ShowActivity(victim, "activated troll \"%s\" for %N. ", troll.name, victim);
+				ShowActivity(activator, "activated troll \"%s\" for %N. ", troll.name, victim);
         }
     }
     if(modifier == TrollMod_Constant) {
diff --git a/scripting/include/feedthetrolls/commands.inc b/scripting/include/feedthetrolls/commands.inc
index bace234..1255342 100644
--- a/scripting/include/feedthetrolls/commands.inc
+++ b/scripting/include/feedthetrolls/commands.inc
@@ -263,8 +263,12 @@ public Action Command_ListTheTrolls(int client, int args) {
 	int count = 0;
 	char[][] modeListArr = new char[MAX_TROLLS+1][MAX_TROLL_NAME_LENGTH];
 	static char modeList[255];
-	for(int i = 1; i < MaxClients; i++) {
-		if(IsClientConnected(i) && IsClientInGame(i) && IsPlayerAlive(i) && ActiveTrolls[i] > 0) {
+	for(int i = 1; i <= MaxClients; i++) {
+		if(IsClientConnected(i) && IsClientInGame(i) && GetClientTeam(i) > 1 && ActiveTrolls[i] > 0) {
+			if(IsFakeClient(i)) {
+				int player = GetRealClient(i);
+				if(player != -1) i = player;
+			}
 			int modeCount = 0;
 			static char name[MAX_TROLL_NAME_LENGTH];
 			for(int j = 1; j <= MAX_TROLLS; j++) {
@@ -276,7 +280,10 @@ public Action Command_ListTheTrolls(int client, int args) {
 			}
 
 			ImplodeStrings(modeListArr, modeCount, ", ", modeList, sizeof(modeList));
-			ReplyToCommand(client, "%N | %s", i, modeList);
+			if(IsPlayerAlive(i))
+				ReplyToCommand(client, "%N | %s", i, modeList);
+			else
+				ReplyToCommand(client, "%N (Paused) | %s", i, modeList);
 			count++;
 		}
 	}