diff --git a/entities/Player.tscn b/entities/Player.tscn
index 0ae1693..8112ef4 100644
--- a/entities/Player.tscn
+++ b/entities/Player.tscn
@@ -18,7 +18,7 @@ mid_height = 0.4
 
 [sub_resource type="CylinderShape" id=24]
 height = 0.2
-radius = 0.2
+radius = 1.5
 
 [sub_resource type="SphereShape" id=23]
 radius = 0.1
@@ -31,6 +31,7 @@ vertex_color_use_as_albedo = true
 
 [node name="Player" type="KinematicBody"]
 collision_mask = 0
+input_ray_pickable = false
 axis_lock_motion_y = true
 move_lock_y = true
 script = ExtResource( 1 )
@@ -59,7 +60,6 @@ visible = false
 script = ExtResource( 2 )
 
 [node name="ItemAttractorArea" type="Area" parent="."]
-visible = false
 collision_layer = 0
 collision_mask = 8
 input_ray_pickable = false
@@ -70,7 +70,6 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.123516, 0 )
 shape = SubResource( 24 )
 
 [node name="ItemPickupArea" type="Area" parent="."]
-visible = false
 collision_layer = 0
 collision_mask = 8
 input_ray_pickable = false
@@ -81,6 +80,9 @@ shape = SubResource( 23 )
 
 [node name="Geometry" parent="." groups=["GameGeometry"] instance=ExtResource( 4 )]
 
+[node name="Skeleton" parent="Geometry/Armature" index="0"]
+bones/4/bound_children = [  ]
+
 [node name="ToolAttachement" parent="Geometry/Armature/Skeleton" index="5"]
 transform = Transform( 1, 8.68458e-08, -1.04308e-07, 1.74623e-07, -1, -1.30385e-07, 1.41561e-07, 1.50874e-07, -1, -0.72, 0.45, 3.28113e-08 )
 
diff --git a/entities/Tree.tscn b/entities/Tree.tscn
index dc97434..1ce9bc3 100644
--- a/entities/Tree.tscn
+++ b/entities/Tree.tscn
@@ -109,13 +109,13 @@ anims/TreeShake = SubResource( 5 )
 
 [node name="Geometry" parent="." groups=["GameGeometry"] instance=ExtResource( 4 )]
 transform = Transform( 1.5, 0, 0, 0, 0.984723, 0.266325, 0, -0.177712, 1.47574, 0, 0, 0 )
-visible = false
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
-transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0, 0 )
+transform = Transform( 1, 0, 0, 0, -4.37114e-08, -1, 0, 1, -4.37114e-08, 0, 0.5, 0 )
 shape = SubResource( 9 )
 
 [node name="MeshInstance" type="MeshInstance" parent="CollisionShape" groups=["PhysicsGeometry"]]
+visible = false
 mesh = SubResource( 8 )
 skeleton = NodePath("")
 material/0 = ExtResource( 1 )
diff --git a/entities/rockA.tscn b/entities/rockA.tscn
index d71e2d7..eba4053 100644
--- a/entities/rockA.tscn
+++ b/entities/rockA.tscn
@@ -13,6 +13,7 @@ bottom_radius = 0.4
 height = 0.7
 
 [node name="rockA" type="StaticBody"]
+input_ray_pickable = false
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.373712, 0 )
diff --git a/entities/rockB.tscn b/entities/rockB.tscn
index 9c98122..c9c0905 100644
--- a/entities/rockB.tscn
+++ b/entities/rockB.tscn
@@ -13,6 +13,7 @@ bottom_radius = 0.4
 height = 0.7
 
 [node name="rockB" type="StaticBody"]
+input_ray_pickable = false
 
 [node name="CollisionShape" type="CollisionShape" parent="."]
 transform = Transform( 1, 0, 0, 0, 0.999997, -0.00240855, 0, 0.00240855, 0.999997, 0, 0.376176, 0 )
diff --git a/entities/rockC.tscn b/entities/rockC.tscn
index b3814ed..9d3b5f3 100644
--- a/entities/rockC.tscn
+++ b/entities/rockC.tscn
@@ -14,6 +14,7 @@ bottom_radius = 0.4
 height = 0.8
 
 [node name="rockC" type="StaticBody"]
+input_ray_pickable = false
 
 [node name="Geometry" parent="." groups=["GameGeometry"] instance=ExtResource( 1 )]
 transform = Transform( 1.7, 0, 0, 0, 1.7, 0, 0, 0, 1.7, 0, 0, 0 )
diff --git a/scenes/tests/NavigationTests.tscn b/scenes/tests/NavigationTests.tscn
index 4f1bff7..b9ab94b 100644
--- a/scenes/tests/NavigationTests.tscn
+++ b/scenes/tests/NavigationTests.tscn
@@ -115,18 +115,18 @@ transform = Transform( 1, 0, 0, 0, 0.60042, 0.799685, 0, -0.799685, 0.60042, -4.
 [node name="Tree" parent="." instance=ExtResource( 8 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1.54934, 0.00752521, 2.60764 )
 
-[node name="Geometry" parent="Tree" index="3"]
+[node name="Geometry" parent="Tree" index="2"]
 transform = Transform( 1.5, 0, 0, 0, 0.984722, 0.266325, 0, -0.177712, 1.47574, 0, 0, 0 )
 
 [node name="Tree2" parent="." instance=ExtResource( 8 )]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 3.73489, 0, 0.451849 )
 
-[node name="AnimationPlayer" parent="Tree2" index="2"]
+[node name="AnimationPlayer" parent="Tree2" index="1"]
 anims/Idle = SubResource( 5 )
 anims/RESET = SubResource( 6 )
 anims/TreeShake = SubResource( 7 )
 
-[node name="Geometry" parent="Tree2" index="3"]
+[node name="Geometry" parent="Tree2" index="2"]
 transform = Transform( 1.5, 0, 0, 0, 0.984722, 0.266325, 0, -0.177712, 1.47574, 0, 0, 0 )
 
 [node name="TilePatch" parent="." instance=ExtResource( 9 )]