diff --git a/assets/common/items/weapons/bow/wood_shortbow-0.ron b/assets/common/items/weapons/bow/wood_shortbow-0.ron
index c655669510..31bc5aa46c 100644
--- a/assets/common/items/weapons/bow/wood_shortbow-0.ron
+++ b/assets/common/items/weapons/bow/wood_shortbow-0.ron
@@ -6,7 +6,7 @@ Item(
             kind: Bow("WoodShortbow0"),    
             stats: (
                 equip_time_millis: 400,
-                power: 1.0,
+                power: 0.8,
             ),
         )
     ),
diff --git a/assets/common/items/weapons/sword/wood_sword.ron b/assets/common/items/weapons/sword/wood_sword.ron
index 59b674ee19..c7a047b01a 100644
--- a/assets/common/items/weapons/sword/wood_sword.ron
+++ b/assets/common/items/weapons/sword/wood_sword.ron
@@ -6,7 +6,7 @@ Item(
             kind: Sword("WoodTraining"),    
             stats: (
                 equip_time_millis: 400,
-                power: 1.0,
+                power: 0.8,
             ),
         )
     ),
diff --git a/assets/voxygen/element/frames/tt_test_corner_tr.png b/assets/voxygen/element/frames/tt_test_corner_tr.png
index a66a135760..01ebb19e3a 100644
--- a/assets/voxygen/element/frames/tt_test_corner_tr.png
+++ b/assets/voxygen/element/frames/tt_test_corner_tr.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0de494ff10082d841254a96d3ea5d87d3bc77e2b7e10662584c86957b810460
-size 134
+oid sha256:34f8867698f981b35754f6a59d469436b157f6b95c8f7a0fee3340387be901b6
+size 1428
diff --git a/assets/voxygen/element/frames/tt_test_edge.png b/assets/voxygen/element/frames/tt_test_edge.png
index b28d1e380c..8788303d42 100644
--- a/assets/voxygen/element/frames/tt_test_edge.png
+++ b/assets/voxygen/element/frames/tt_test_edge.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3a44ab4a366dd977cd2ece967991b1eb98c271b4c07ee763739af3a50478acb4
-size 117
+oid sha256:c545ceaabad22234ba94c5e76624560bb7f52b18e46eee7e8d9d74e03b5c4857
+size 1421
diff --git a/assets/voxygen/i18n/de_DE.ron b/assets/voxygen/i18n/de_DE.ron
index f5ce2fa8f8..756e30360c 100644
--- a/assets/voxygen/i18n/de_DE.ron
+++ b/assets/voxygen/i18n/de_DE.ron
@@ -329,6 +329,7 @@ magischen Gegenstände ergattern?"#,
         "hud.social.not_yet_available": "Noch nicht verfügbar",
         "hud.social.faction": "Fraktion",
         "hud.social.play_online_fmt": "{nb_player} Spieler online",
+        "hud.social.account": "Account",
 
         "hud.spell": "Zauber",
         
diff --git a/assets/voxygen/i18n/en.ron b/assets/voxygen/i18n/en.ron
index 8e95b9df7d..9d53f77dd8 100644
--- a/assets/voxygen/i18n/en.ron
+++ b/assets/voxygen/i18n/en.ron
@@ -335,6 +335,7 @@ magically infused items?"#,
         "hud.social.name": "Name",
         "hud.social.level": "Level",
         "hud.social.zone": "Zone",
+        "hud.social.account": "Account",
 
 
         "hud.crafting": "Crafting",
diff --git a/voxygen/src/hud/crafting.rs b/voxygen/src/hud/crafting.rs
index 226dbec811..6bf0a59f70 100644
--- a/voxygen/src/hud/crafting.rs
+++ b/voxygen/src/hud/crafting.rs
@@ -183,6 +183,7 @@ impl<'a> Widget for Crafting<'a> {
             .set(ids.align_ing, ui);
         let client = &self.client;
         // First available recipes, then unavailable ones
+        // TODO Sort these alphabetically by using "sort_by_key(|x| x.to_lowercase())"
         let recipe_iter = self
             .client
             .recipe_book()
diff --git a/voxygen/src/hud/social.rs b/voxygen/src/hud/social.rs
index 82d570a15b..130b4c7494 100644
--- a/voxygen/src/hud/social.rs
+++ b/voxygen/src/hud/social.rs
@@ -417,6 +417,11 @@ impl<'a> Widget for Social<'a> {
                 } else {
                     button.down_from(state.ids.player_names[i - 1], 1.0)
                 };
+                let acc_name_txt = format!(
+                    "{}: {}",
+                    &self.localized_strings.get("hud.social.account"),
+                    alias
+                );
                 button
                     .w_h(133.0, 20.0)
                     .hover_image(if selected {
@@ -434,6 +439,7 @@ impl<'a> Widget for Social<'a> {
                     .label_y(conrod_core::position::Relative::Scalar(1.0))
                     .label_font_id(self.fonts.cyri.conrod_id)
                     .label_color(TEXT_COLOR)
+                    .with_tooltip(self.tooltip_manager, &acc_name_txt, "", &button_tooltip)
                     .set(state.ids.player_names[i], ui);
                 // Player Levels
                 Button::image(if !selected {
diff --git a/world/src/layer/mod.rs b/world/src/layer/mod.rs
index c9947b1bbd..c6e689a22c 100644
--- a/world/src/layer/mod.rs
+++ b/world/src/layer/mod.rs
@@ -29,7 +29,7 @@ pub struct Colors {
 fn close(x: f32, tgt: f32, falloff: f32) -> f32 {
     (1.0 - (x - tgt).abs() / falloff).max(0.0).powf(0.5)
 }
-const MUSH_FACT: f32 = 0.0001; // To balance everything around the mushroom spawning rate
+const MUSH_FACT: f32 = 1.0e-4; // To balance everything around the mushroom spawning rate
 pub fn apply_scatter_to<'a>(
     wpos2d: Vec2<i32>,
     mut get_column: impl FnMut(Vec2<i32>) -> Option<&'a ColumnSample<'a>>,
@@ -130,10 +130,10 @@ pub fn apply_scatter_to<'a>(
         // Collecable Objects
         // Only spawn twigs in temperate forests
         (Twigs, false, |c| {
-            ((c.tree_density - 0.5).max(0.0) * 0.001, None)
+            ((c.tree_density - 0.5).max(0.0) * 1.0e-3, None)
         }),
         (Stones, false, |c| {
-            ((c.rockiness - 0.5).max(0.0) * 0.05, None)
+            ((c.rockiness - 0.5).max(0.0) * 1.0e-3, None)
         }),
         // Don't spawn Mushrooms in snowy regions
         (Mushroom, false, |c| {