diff --git a/assets/mods/basegame/creatures/CreatureHuman.json b/assets/mods/basegame/creatures/CreatureHuman.json
index 8edff9f70..24ffb9092 100644
--- a/assets/mods/basegame/creatures/CreatureHuman.json
+++ b/assets/mods/basegame/creatures/CreatureHuman.json
@@ -23,7 +23,7 @@
 
   "encumbrance": 1000,
   "basedefence": 100,
-  "basereach": 56,
+  "basereach": 84,
 
   "toolsize": 15,
   
diff --git a/assets/mods/basegame/creatures/CreatureWerebeastBase.json b/assets/mods/basegame/creatures/CreatureWerebeastBase.json
index 74ebbe3bf..319b55afd 100644
--- a/assets/mods/basegame/creatures/CreatureWerebeastBase.json
+++ b/assets/mods/basegame/creatures/CreatureWerebeastBase.json
@@ -23,7 +23,7 @@
 
   "encumbrance": 10000,
   "basedefence": 100,
-  "basereach": 114,
+  "basereach": 180,
 
   "toolsize": 40,
 
diff --git a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
index 6a7491857..4062e68f0 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameactors/PlayerBuilderSigrid.kt
@@ -1,11 +1,7 @@
 package net.torvald.terrarum.modulebasegame.gameactors
 
 import net.torvald.terrarum.App
-import net.torvald.terrarum.ModMgr
 import net.torvald.terrarum.WireCodex
-import net.torvald.terrarum.gameactors.AVKey
-import net.torvald.terrarum.gameactors.faction.FactionFactory
-import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 
 /**
  * Created by minjaesong on 2016-02-03.
@@ -13,7 +9,7 @@ import net.torvald.terrarumsansbitmap.gdx.TextureRegionPack
 
 object PlayerBuilderSigrid {
 
-    operator fun invoke(): IngamePlayer {
+    /*operator fun invoke(): IngamePlayer {
         val p = IngamePlayer("lol", "lol_glow", - 9223372036854775807L) // XD
 
         //p.referenceID = 0x51621D // the only constant of this procedural universe
@@ -41,7 +37,7 @@ object PlayerBuilderSigrid {
         p.actorValue[AVKey.STRENGTH] = 1414 // this is test character, after all.
         p.actorValue[AVKey.ENCUMBRANCE] = 1000
         p.actorValue[AVKey.BASEHEIGHT] = 46
-        p.actorValue[AVKey.BASEREACH] = 50
+        p.actorValue[AVKey.BASEREACH] = 84
 
         p.actorValue[AVKey.NAME] = "Sigrid"
 
@@ -72,7 +68,7 @@ object PlayerBuilderSigrid {
 
 
         return p
-    }
+    }*/
 
     fun fillTestInventory(inventory: ActorInventory) {
 
diff --git a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
index fe29e9f9e..d8fac983a 100644
--- a/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
+++ b/src/net/torvald/terrarum/modulebasegame/gameitems/PickaxeGeneric.kt
@@ -8,6 +8,7 @@ import net.torvald.terrarum.gameactors.AVKey
 import net.torvald.terrarum.gameactors.ActorWithBody
 import net.torvald.terrarum.gameitem.GameItem
 import net.torvald.terrarum.gameitem.ItemID
+import net.torvald.terrarum.gameitem.inInteractableRange
 import net.torvald.terrarum.itemproperties.Calculate
 import net.torvald.terrarum.modulebasegame.gameactors.DroppedItem
 import net.torvald.terrarum.modulebasegame.gameitems.PickaxeCore.BASE_MASS_AND_SIZE
@@ -18,7 +19,7 @@ import kotlin.math.roundToInt
  * Created by minjaesong on 2019-03-10.
  */
 object PickaxeCore {
-    fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {
+    fun startPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem) = inInteractableRange(actor) {
         val mouseTileX = Terrarum.mouseTileX
         val mouseTileY = Terrarum.mouseTileY
 
@@ -39,7 +40,7 @@ object PickaxeCore {
 
         // return false if here's no tile
         if (Block.AIR == (INGAME.world).getTileFromTerrain(mouseTileX, mouseTileY))
-            return false
+            return@inInteractableRange false
 
         // filter passed, do the job
         val swingDmgToFrameDmg = delta.toDouble() / actorvalue.getAsDouble(AVKey.ACTION_INTERVAL)!!
@@ -54,7 +55,7 @@ object PickaxeCore {
             }
         }
 
-        return true
+        true
     }
 
     fun endPrimaryUse(actor: ActorWithBody, delta: Float, item: GameItem): Boolean {