diff --git a/client/src/components/nav.jsx b/client/src/components/nav.jsx
index d054992e..80d4241f 100644
--- a/client/src/components/nav.jsx
+++ b/client/src/components/nav.jsx
@@ -47,6 +47,15 @@ const addState = connect(
         function setNav(place) {
             dispatch(actions.setGame(null));
             dispatch(actions.setInstance(null));
+            dispatch(actions.setCombiner([null, null, null]));
+            dispatch(actions.setReclaiming(false));
+            dispatch(actions.setActiveSkill(null));
+            dispatch(actions.setActiveConstruct(null));
+            dispatch(actions.setInfo(null));
+            dispatch(actions.setItemEquip(null));
+            dispatch(actions.setItemUnequip(null));
+            dispatch(actions.setVboxHighlight([]));
+
             return dispatch(actions.setNav(place));
         }
 
diff --git a/server/src/item.rs b/server/src/item.rs
index 5fda63e7..5e241d4e 100644
--- a/server/src/item.rs
+++ b/server/src/item.rs
@@ -213,7 +213,7 @@ impl Item {
                 let combos = get_combos();
                 let combo = combos.iter().find(|c| c.item == *self)
                     .unwrap_or_else(|| panic!("unable to find components for {:?}", self));
-                
+
                 let mut colour_speed = 0;
                 let mut skill_speed = 0;
                 let mut component_speed = 0;
@@ -233,12 +233,12 @@ impl Item {
                         Item::Debuff => 4,
                         _ => 0,
                     };
-                    if colour_speed == 0 && skill_speed == 0 { 
-                        component_speed = unit.speed(); 
+                    if colour_speed == 0 && skill_speed == 0 {
+                        component_speed = unit.speed();
                     }
                 });
                 if component_speed > 0 { return component_speed };
-                return 24 + colour_speed * skill_speed 
+                return 24 + colour_speed * skill_speed
             }
         }
 
@@ -423,7 +423,8 @@ impl Item {
             Item::Life => format!("Base ITEM for increased LIFE.
                 When your CONSTRUCT reaches 0 GreenLife it becomes KO and cannot cast SKILLS."),
             Item::Speed => format!("Base ITEM for increased SPEED.
-                SPEED determines the order in which skills resolve."),
+                SPEED determines the order in which skills resolve.
+                Some SKILLS (such as STRIKE) have their damage increased by SPEED."),
 
             // Lifes Upgrades
             Item::LifeGGI => format!("Increases CONSTRUCT GreenLife.