diff --git a/src/main/java/com/comandante/creeper/CreeperConfiguration.java b/src/main/java/com/comandante/creeper/CreeperConfiguration.java
index 79729b0c4355c4d104c83a69b6f1d5e71b7285de..ca65d90f87c9fe9ef25dce43045a4af15a13cea7 100644
--- a/src/main/java/com/comandante/creeper/CreeperConfiguration.java
+++ b/src/main/java/com/comandante/creeper/CreeperConfiguration.java
@@ -66,7 +66,7 @@ public class CreeperConfiguration {
     public final String weatherUndergroundApiKey;
 
     public static final String MAX_GOSSIP_CACHE_SIZE = "max.gossip.cache.size";
-    public static final int MAX_GOSSIP_CACHE_SIZE_DEFAULT = 100;
+    public static final int MAX_GOSSIP_CACHE_SIZE_DEFAULT = 1000;
     public final int maxGossipCacheSize;
 
     public CreeperConfiguration(Configuration configuration) {
diff --git a/src/main/java/com/comandante/creeper/command/CastCommand.java b/src/main/java/com/comandante/creeper/command/CastCommand.java
index 4509b6ee62e35789358970b5ed676299b4598086..ae7e281d4090f26e90bf111002dc3edb6841456a 100644
--- a/src/main/java/com/comandante/creeper/command/CastCommand.java
+++ b/src/main/java/com/comandante/creeper/command/CastCommand.java
@@ -27,7 +27,7 @@ public class CastCommand extends Command {
 
     @Override
     public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Exception {
-        this.execCommand(ctx, e, () -> {
+        execCommand(ctx, e, () -> {
             if (player.getCurrentHealth() <= 0) {
                 write("You have no health and as such you can not attack.");
                 return;
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
index 258865bc32331b748a00123119fa8b78c4585575..743f940f2884c3ecf1a70d34232dfca03fad7426 100755
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -391,7 +391,7 @@ public class GameManager {
                 channelUtils.write(player.getPlayerId(), "Your inventory is full, drop some items to free up room.\r\n");
                 if (isFromLoot) {
                     player.getCurrentRoom().addPresentItem(itemId);
-                    roomSay(player.getCurrentRoom().getRoomId(), player.getPlayerName() + " dropped " + itemEntity.getItemName(), player.getPlayerId());
+                    roomSay(player.getCurrentRoom().getRoomId(), player.getPlayerName() + " dropped " + itemEntity.getItemName(), player.getPlayerId() + "\r\n");
                 }
                 return false;
             }
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index 2f736a9bbbeee031dd1b35ccfdfd4e9073d78c06..5a0172536892e379bd8aabc6a993c6bdfb0b7545 100755
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -95,19 +95,14 @@ public class Player extends CreeperEntity {
     }
 
     private void processFightRounds() {
-        for (ActiveFight activeFight : activeFights.values()) {
-            doFightRound(activeFight);
-        }
+        activeFights.forEach((aLong, activeFight) -> doFightRound(activeFight));
     }
 
     private void processRegens() {
         synchronized (interner.intern(playerId)) {
             PlayerMetadata playerMetadata = gameManager.getPlayerManager().getPlayerMetadata(playerId);
             Stats stats = getPlayerStatsWithEquipmentAndLevel();
-            if (isActive(CoolDownType.NPC_FIGHT)) {
-                return;
-            }
-            if (isActive(CoolDownType.DEATH)) {
+            if (isActive(CoolDownType.NPC_FIGHT) || isActive(CoolDownType.DEATH)) {
                 return;
             }
             if (playerMetadata.getStats().getCurrentHealth() < stats.getMaxHealth()) {
diff --git a/src/main/java/com/comandante/creeper/server/GossipCache.java b/src/main/java/com/comandante/creeper/server/GossipCache.java
index 402c7c8762bde3b4ffa5ee72e576b337a4733e27..3a22c1bc0ab1fb969938cab8eb94fe7f8b8e5859 100644
--- a/src/main/java/com/comandante/creeper/server/GossipCache.java
+++ b/src/main/java/com/comandante/creeper/server/GossipCache.java
@@ -4,7 +4,9 @@ import com.comandante.creeper.managers.GameManager;
 import com.google.api.client.util.Lists;
 import com.google.common.collect.EvictingQueue;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class GossipCache {
 
@@ -22,12 +24,8 @@ public class GossipCache {
 
     public List<String> getRecent(int size) {
         List<String> recent = Lists.newArrayList();
-        List<String> currentEntries = Lists.newArrayList();
-        Iterator<String> iterator = evictingQueue.iterator();
-        while (iterator.hasNext()) {
-            String next = iterator.next();
-            currentEntries.add(next);
-        }
+        List<String> currentEntries = evictingQueue.stream().collect(Collectors.toList());
+
         Collections.reverse(currentEntries);
         int i = 0;
         for (String s : currentEntries) {
diff --git a/src/test/com/comandante/creeper/server/GossipCacheTest.java b/src/test/com/comandante/creeper/server/GossipCacheTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..56710ea87146f1b4f1378427f4832c854182e7df
--- /dev/null
+++ b/src/test/com/comandante/creeper/server/GossipCacheTest.java
@@ -0,0 +1,38 @@
+package com.comandante.creeper.server;
+
+import com.comandante.creeper.CreeperConfiguration;
+import com.comandante.creeper.managers.GameManager;
+import com.google.api.client.util.Maps;
+import org.apache.commons.configuration.MapConfiguration;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class GossipCacheTest {
+
+    GossipCache gossipCache;
+
+    @Before
+    public void setUp() throws Exception {
+        GameManager mock = mock(GameManager.class);
+        HashMap<String, Object> configuration = Maps.newHashMap();
+        configuration.put("max.gossip.cache.size", 100);
+        CreeperConfiguration creeperConfiguration = new CreeperConfiguration(new MapConfiguration(configuration));
+        when(mock.getCreeperConfiguration()).thenReturn(creeperConfiguration);
+        this.gossipCache = new GossipCache(mock);
+    }
+
+    @Test
+    public void testRecentGossip() throws Exception {
+        for (int i = 0; i < 20; i++) {
+            gossipCache.addGossipLine(String.valueOf(i));
+        }
+        List<String> recent = gossipCache.getRecent(20);
+    }
+
+}
\ No newline at end of file
diff --git a/world/npcs/treeberserker.json b/world/npcs/treeberserker.json
index 9f7926592374dcc771e0759a3a06754d823e4418..0e8d951bd590f2a3133eea7e4e6e7f011b268057 100755
--- a/world/npcs/treeberserker.json
+++ b/world/npcs/treeberserker.json
@@ -37,6 +37,7 @@
   },
   "validTriggers": [
     "t",
+    "tree",
     "tree berserker",
     "berserker",
     "b"