diff --git a/charmaps/default.json b/charmaps/default.json
index cedd656..e5a5d89 100644
--- a/charmaps/default.json
+++ b/charmaps/default.json
@@ -18,7 +18,7 @@
         "stairup": ["<",7],
         "dummy": ["d", 3],
         "spikes": ["^",7],
-        "goblin": ["g",1],
+        "goblin": ["g",2],
         "seed": [":",10],
         "plant": ["Y",10],
         "youngplant": ["v",10],
diff --git a/charmaps/fullwidth.json b/charmaps/fullwidth.json
index 7f34f18..76b131b 100644
--- a/charmaps/fullwidth.json
+++ b/charmaps/fullwidth.json
@@ -18,7 +18,7 @@
         "stairup": ["＜",7],
         "dummy": ["ｄ",3],
         "spikes": ["＾",7],
-        "goblin": ["ｇ",1],
+        "goblin": ["ｇ",2],
         "seed": ["：",10],
         "plant": ["Ｙ",10],
         "youngplant": ["ｖ",10],
diff --git a/client/__init__.py b/client/__init__.py
index 5047151..f2814d7 100644
--- a/client/__init__.py
+++ b/client/__init__.py
@@ -33,6 +33,7 @@ def main(name, socketType, address, keybindings, characters, colours=False):
             client.start()
         except KeyboardInterrupt:
             caught_ctrl_c = True
+            client.keepAlive = False
     
     curses.wrapper(start)
     
diff --git a/docs/charactermaps.md b/docs/charactermaps.md
index 47720f7..1a6c401 100644
--- a/docs/charactermaps.md
+++ b/docs/charactermaps.md
@@ -36,7 +36,9 @@ These colours can differ per terminal, but in most terminals they look like this
 On terminals that have more than 8 colours, the next 8 colours will be the lighter version of the same colour.
 On terminals that only have 8 colours, the next 8 colours will be the same as the first 8 (colour = colour % 8).
 
-run the script test/colourpairs.py to see how the colour combinations look in your terminal.
+Run the script test/colourpairs.py to see how the colour combinations look in your terminal.
+
+The combination 0,0 will always produce the default colour pair for the terminal (which usually looks like 7,0)
 
 ## default
 
diff --git a/docs/client.md b/docs/client.md
index ae0e56f..7fcc60c 100644
--- a/docs/client.md
+++ b/docs/client.md
@@ -1,3 +1,2 @@
 # Client side architecture
 
-The client most probably needs a full rewrite
diff --git a/server/gameobjects.py b/server/gameobjects.py
index 25d63bb..d88321a 100644
--- a/server/gameobjects.py
+++ b/server/gameobjects.py
@@ -79,7 +79,7 @@ entities["spiketrap"] = makeSpikeTrap
 def makeGoblin():
     return Entity(sprite="goblin", height=1.2, components={
         "move": Move(slowness=4),
-        "fighter": Fighter(maxHealth=25, strength=5, slowness=3),
+        "fighter": Fighter(maxHealth=25, strength=5, slowness=6),
         "alignment": Alignment(faction.EVIL),
         "controller": MonsterAi(viewDist=8, moveChance=0.01),
         "loot": Loot([("seed", .5), ("seed", .1)])
@@ -89,7 +89,7 @@ entities["goblin"] = makeGoblin
 def makeTroll():
     return Entity(sprite="troll", height=1.8, components={
         "move": Move(slowness=5),
-        "fighter": Fighter(maxHealth=125, strength=12, slowness=5),
+        "fighter": Fighter(maxHealth=125, strength=12, slowness=10),
         "alignment": Alignment(faction.EVIL),
         "controller": MonsterAi(viewDist=8, moveChance=0.01),
         "loot": Loot([("stone", 1), ("stone", .3), ("pebble", .5), ("pebble", .5), ("pebble", .5)])
diff --git a/server/player.py b/server/player.py
index a8b263b..603b846 100644
--- a/server/player.py
+++ b/server/player.py
@@ -53,9 +53,9 @@ class Player:
                 "inventory": self.inventory,
                 "move": Move(slowness=2),
                 "controller": InputController(),
-                "fighter": Fighter(self.maxHealth, 5, slowness=2, health=self.health or self.maxHealth),
+                "fighter": Fighter(self.maxHealth, 5, slowness=4, health=self.health or self.maxHealth),
                 "alignment": Alignment(faction.GOOD),
-                "heal": Healing(interval=30),
+                "heal": Healing(interval=50),
                 "target": Target()
                 })
         self.entity.construct(room.getRoomData())
@@ -98,6 +98,7 @@ class Player:
             self.entity = None
             self.roomname = None
             self.place = None
+            self.health = self.maxHealth
         
     
     def control(self, action):