diff --git a/client/src/components/faceoff.jsx b/client/src/components/faceoff.jsx
index 251f10e6..ea3858cd 100644
--- a/client/src/components/faceoff.jsx
+++ b/client/src/components/faceoff.jsx
@@ -1,34 +1,25 @@
 const preact = require('preact');
 const { connect } = require('preact-redux');
 
-const actions = require('../actions');
-
 const { ConstructAvatar } = require('./construct');
-const Controls = require('./controls');
 
 const addState = connect(
     function receiveState(state) {
         const {
-            ws,
             instance,
             account,
         } = state;
 
-        function sendInstanceReady() {
-            return ws.sendInstanceReady(instance.id);
-        }
-
         return {
             instance,
             account,
-            sendInstanceReady,
         };
-    },
+    }
 );
 
 function FaceoffConstruct(args) {
     const {
-        construct
+        construct,
     } = args;
 
     return (
@@ -39,75 +30,82 @@ function FaceoffConstruct(args) {
                 <ConstructAvatar construct={construct} />
             </div>
         </div>
-    )
-}
-
-function Faceoff(props) {
-    const {
-        instance,
-        account,
-        sendInstanceReady,
-    } = props;
-
-    if (!instance) return <div>...</div>;
-
-    const otherTeam = instance.players.find(t => t.id !== account.id);
-    const playerTeam = instance.players.find(t => t.id === account.id);
-
-    function PlayerTeam(team) {
-        const constructs = team.constructs.map((c, i) =>
-            <FaceoffConstruct key={c.id} construct={c}/>);
-
-        const winner = instance.winner === team.id;
-        const classes = `team player ${winner ? 'winner' : team.ready ? 'ready' : ''}`
-        return (
-            <div class={classes}>
-                {constructs}
-            </div>
-        );
-    }
-
-
-    function OpponentTeam(team) {
-        const constructs = team.constructs.map((c, i) =>
-            <FaceoffConstruct key={c.id} construct={c}/>);
-
-        const winner = instance.winner === team.id;
-        const classes = `team opponent ${winner ? 'winner' : team.ready ? 'ready' : ''}`
-
-        return (
-            <div class={classes}>
-                {constructs}
-            </div>
-        );
-    }
-    function faceoffText() {
-        if (!instance.winner) {
-            return (
-                <div class="faceoff-text">
-                    <div class="opponent-text"> {otherTeam.name} </div>
-                    <div class="vs"> vs </div>
-                    <div class="player-text"> {playerTeam.name} </div>
-                </div>
-            );
-        }
-        const winner = instance.winner === playerTeam.id ? playerTeam : otherTeam;
-        return (
-            <div class="faceoff-text winner">
-                <div> {winner.name} </div>
-                <div> wins </div>
-            </div>
-        )
-
-    }
-
-    return (
-        <main class="faceoff">
-            {OpponentTeam(otherTeam)}
-            {faceoffText()}
-            {PlayerTeam(playerTeam)}
-        </main>
     );
 }
 
+class Faceoff extends preact.Component {
+    shouldComponentUpdate(newProps) {
+        if (newProps.instance !== this.props.instance) return true;
+        if (newProps.account !== this.props.account) return true;
+        return false;
+    }
+
+    render(props) {
+        const {
+            instance,
+            account,
+        } = props;
+
+        if (!instance) return <div>...</div>;
+
+        const otherTeam = instance.players.find(t => t.id !== account.id);
+        const playerTeam = instance.players.find(t => t.id === account.id);
+
+        function PlayerTeam(team) {
+            const constructs = team.constructs.map((c, i) =>
+                <FaceoffConstruct key={c.id} construct={c}/>);
+
+            const winner = instance.winner === team.id;
+            const classes = `team player ${winner ? 'winner' : team.ready ? 'ready' : ''}`;
+            return (
+                <div class={classes}>
+                    {constructs}
+                </div>
+            );
+        }
+
+
+        function OpponentTeam(team) {
+            const constructs = team.constructs.map((c, i) =>
+                <FaceoffConstruct key={c.id} construct={c}/>);
+
+            const winner = instance.winner === team.id;
+            const classes = `team opponent ${winner ? 'winner' : team.ready ? 'ready' : ''}`;
+
+            return (
+                <div class={classes}>
+                    {constructs}
+                </div>
+            );
+        }
+        function faceoffText() {
+            if (!instance.winner) {
+                return (
+                    <div class="faceoff-text">
+                        <div class="opponent-text"> {otherTeam.name} </div>
+                        <div class="vs"> vs </div>
+                        <div class="player-text"> {playerTeam.name} </div>
+                    </div>
+                );
+            }
+            const winner = instance.winner === playerTeam.id ? playerTeam : otherTeam;
+            return (
+                <div class="faceoff-text winner">
+                    <div> {winner.name} </div>
+                    <div> wins </div>
+                </div>
+            )
+
+        }
+
+        return (
+            <main class="faceoff">
+                {OpponentTeam(otherTeam)}
+                {faceoffText()}
+                {PlayerTeam(playerTeam)}
+            </main>
+        );
+    }
+}
+
 module.exports = addState(Faceoff);
diff --git a/client/src/components/info.component.jsx b/client/src/components/info.component.jsx
index 87c96eeb..1c7010fc 100644
--- a/client/src/components/info.component.jsx
+++ b/client/src/components/info.component.jsx
@@ -3,7 +3,7 @@ const reactStringReplace = require('react-string-replace');
 
 const specThresholds = require('./info.thresholds');
 const { INFO } = require('./../constants');
-const { convertItem, removeTier, formatInfo } = require('../utils');
+const { convertItem, removeTier } = require('../utils');
 const { tutorialStage } = require('../tutorial.utils');
 const shapes = require('./shapes');
 
@@ -75,8 +75,8 @@ class InfoComponent extends preact.Component {
             };
 
             if (isSkill || isSpec) {
-                let infoText = info;
-                while (infoText.includes('Plus')) infoText = infoText.replace('Plus', '+');
+                let infoName = info;
+                while (infoName.includes('Plus')) infoName = infoName.replace('Plus', '+');
 
                 const header = isSkill ? <h3> SKILL </h3> : <h3> SPEC </h3>;
 
@@ -101,7 +101,7 @@ class InfoComponent extends preact.Component {
 
                 return (
                     <div class={isSkill ? 'info-skill' : 'info-spec'}>
-                        <h2>{infoText} {fullInfo.cost}b</h2>
+                        <h2>{infoName} {fullInfo.cost}b</h2>
                         {header}
                         {itemSourceInfo}
                         {cooldown}
diff --git a/client/src/components/instance.component.jsx b/client/src/components/instance.component.jsx
index d4953550..b5e98674 100644
--- a/client/src/components/instance.component.jsx
+++ b/client/src/components/instance.component.jsx
@@ -13,11 +13,13 @@ const actions = require('../actions');
 
 const addState = connect(
     function receiveState(state) {
-        const { instance,
+        const {
+            instance,
             nav,
             navInstance,
         } = state;
-        return { instance,
+        return {
+            instance,
             nav,
             navInstance,
         };
@@ -52,7 +54,7 @@ const addState = connect(
 );
 
 class Instance extends Component {
-    componentShouldUpdate(newProps) {
+    shouldComponentUpdate(newProps) {
         if (newProps.instance !== this.props.instance) return true;
         return false;
     }
diff --git a/client/src/components/main.jsx b/client/src/components/main.jsx
index ab923182..b03e0069 100644
--- a/client/src/components/main.jsx
+++ b/client/src/components/main.jsx
@@ -16,35 +16,45 @@ const addState = connect(
     }
 );
 
-function Main(props) {
-    const {
-        game,
-        instance,
-        account,
-        nav,
-    } = props;
-
-    if (!account) {
-        return <Welcome />;
+class Main extends preact.Component {
+    shouldComponentUpdate(newProps) {
+        if (newProps.game !== this.props.game) return true;
+        if (newProps.instance !== this.props.instance) return true;
+        if (newProps.account !== this.props.account) return true;
+        if (newProps.nav !== this.props.nav) return true;
+        return false;
     }
 
-    if (game) {
-        return <Game />;
+    render(props) {
+        const {
+            game,
+            instance,
+            account,
+            nav,
+        } = props;
+
+        if (!account) {
+            return <Welcome />;
+        }
+
+        if (game) {
+            return <Game />;
+        }
+
+        if (instance) {
+            return <Instance />;
+        }
+
+        if (nav === 'transition') return false;
+
+        return (
+            <main class="menu">
+                <Header />
+                <Top />
+                <Bottom />
+            </main>
+        );
     }
-
-    if (instance) {
-        return <Instance />;
-    }
-
-    if (nav === 'transition') return false;
-
-    return (
-        <main class="menu">
-            <Header />
-            <Top />
-            <Bottom />
-        </main>
-    );
 }
 
 module.exports = addState(Main);
diff --git a/client/src/components/mnml.jsx b/client/src/components/mnml.jsx
index 5c4ae51b..60dad587 100644
--- a/client/src/components/mnml.jsx
+++ b/client/src/components/mnml.jsx
@@ -10,11 +10,21 @@ const addState = connect(
     state => ({ showNav: state.showNav })
 );
 
-const Mnml = ({ showNav }) =>
-    <div id="mnml" class={showNav ? 'nav-visible' : ''}>
-        <Main />
-        <Controls />
-        <Footer />
-    </div>;
+class Mnml extends preact.Component {
+    shouldComponentUpdate(newProps) {
+        if (newProps.showNav !== this.props.showNav) return true;
+        return false;
+    }
+
+    render(args) {
+        return (
+            <div id="mnml" class={args.showNav ? 'nav-visible' : ''}>
+                <Main />
+                <Controls />
+                <Footer />
+            </div>
+        );
+    }
+}
 
 module.exports = addState(Mnml);