diff --git a/client/src/components/game.component.jsx b/client/src/components/game.component.jsx
index a7f60dcf..0b613f02 100644
--- a/client/src/components/game.component.jsx
+++ b/client/src/components/game.component.jsx
@@ -1,4 +1,5 @@
 const preact = require('preact');
+const { STATS, eventClasses, getCombatText, ConstructAvatar } = require('../utils');
 // const { animationDivs } = require('../animations');
 const GameConstruct = require('./game.construct');
 
diff --git a/client/src/components/game.construct.jsx b/client/src/components/game.construct.jsx
index fa90a8c8..3ce45990 100644
--- a/client/src/components/game.construct.jsx
+++ b/client/src/components/game.construct.jsx
@@ -3,7 +3,7 @@ const preact = require('preact');
 const range = require('lodash/range');
 
 const actions = require('../actions');
-const { STATS, eventClasses, getCombatText, constructAvatar, constructHealth } = require('../utils');
+const { STATS, eventClasses, getCombatText, ConstructAvatar, constructHealth } = require('../utils');
 const { animationDivs } = require('../animations');
 const shapes = require('./shapes');
 
@@ -106,7 +106,7 @@ function GameConstruct(props) {
             <figure
                 className="img"
                 onClick={() => selectSkillTarget(construct.id)} >
-                {constructAvatar(construct.name, construct.id)}
+                <ConstructAvatar name={construct.name} id={construct.id} />
                 {combatTextEl}
             </figure>
             <div className="effects"> {effects} </div>
diff --git a/client/src/components/list.jsx b/client/src/components/list.jsx
index 778f9e11..203b7789 100644
--- a/client/src/components/list.jsx
+++ b/client/src/components/list.jsx
@@ -1,7 +1,7 @@
 const { connect } = require('preact-redux');
 const preact = require('preact');
 
-const { stringSort, NULL_UUID, COLOURS, constructAvatar } = require('./../utils');
+const { stringSort, NULL_UUID, COLOURS, ConstructAvatar } = require('./../utils');
 const actions = require('./../actions');
 const InstanceCreateForm = require('./instance.create.form');
 
@@ -118,7 +118,7 @@ function List(args) {
             <div
                 key={construct.id}
                 className="menu-construct" >
-                {constructAvatar(construct.name, construct.id)}
+                <ConstructAvatar name={construct.name} id={construct.id} />
                 <h2>{construct.name}</h2>
             </div>
         );
diff --git a/client/src/components/login.component.jsx b/client/src/components/login.component.jsx
index 2e8ba903..43c7671f 100644
--- a/client/src/components/login.component.jsx
+++ b/client/src/components/login.component.jsx
@@ -14,13 +14,13 @@ function renderLogin({ submitLogin, submitRegister }) {
                     className="login-input"
                     type="email"
                     placeholder="username"
-                    onChange={e => (details.name = e.target.value)}
+                    onInput={e => (details.name = e.target.value)}
                 />
                 <input
                     className="login-input"
                     type="password"
                     placeholder="password"
-                    onChange={e => (details.password = e.target.value)}
+                    onInput={e => (details.password = e.target.value)}
                 />
                 <button
                     className="login-btn"
diff --git a/client/src/components/team.jsx b/client/src/components/team.jsx
index 0acb1b3f..08772138 100644
--- a/client/src/components/team.jsx
+++ b/client/src/components/team.jsx
@@ -4,7 +4,7 @@ const range = require('lodash/range');
 
 const actions = require('./../actions');
 const { COLOURS } = require('./../utils');
-const { stringSort, constructAvatar } = require('./../utils');
+const { stringSort, ConstructAvatar } = require('./../utils');
 const SpawnButton = require('./spawn.button');
 
 const idSort = stringSort('id');
@@ -86,7 +86,7 @@ function Team(args) {
                 className="menu-construct"
                 style={ { 'border-color': borderColour || 'whitesmoke' } }
                 onClick={() => selectConstruct(construct.id)} >
-                {constructAvatar(construct.name, construct.id)}
+                <ConstructAvatar name={construct.name} id={construct.id} />
                 <h2>{construct.name}</h2>
             </div>
         );
diff --git a/client/src/utils.jsx b/client/src/utils.jsx
index b4f26ee2..42de2871 100644
--- a/client/src/utils.jsx
+++ b/client/src/utils.jsx
@@ -1,4 +1,5 @@
 const preact = require('preact');
+const { Component } = require('preact');
 
 const get = require('lodash/get');
 const anime = require('animejs').default;
@@ -78,20 +79,25 @@ function clearAnimation(id) {
     animations[id] = false;
 }
 
-function constructAvatar(name, id) {
-    // useEffect(() => {
-    //     animateConstruct(id);
-    //     return () => clearAnimation(id);
-    // });
+class ConstructAvatar extends Component {
+    render() {
+        return (
+            <img
+                id={this.props.id}
+                src={`/molecules/${genAvatar(this.props.name)}.svg`}
+                height="500"
+                onError={event => event.target.setAttribute('src', '/molecules/726.svg')}
+            />
+        );
+    }
 
-    return (
-        <img
-            id={id}
-            src={`/molecules/${genAvatar(name)}.svg`}
-            height="500"
-            onError={event => event.target.setAttribute('src', '/molecules/726.svg')}
-        />
-    );
+    componentDidMount() {
+        animateConstruct(this.props.id);
+    }
+
+    componentWillUnmount() {
+        clearAnimation(this.props.id);
+    }
 }
 
 function instanceConstruct(name, id) {
@@ -100,6 +106,8 @@ function instanceConstruct(name, id) {
     //     return () => clearAnimation(id);
     // });
 
+    setTimeout(() => animateConstruct(id), 50);
+
     return (
         <div
             className="avatar"
@@ -109,23 +117,6 @@ function instanceConstruct(name, id) {
     );
 }
 
-function gameConstructImg(name, id, combatTextEl, selectSkillTarget) {
-    // useEffect(() => {
-    //     animateConstruct(id);
-    //     return () => clearAnimation(id);
-    // });
-
-    return (
-        <div
-            className="avatar"
-            id={id}
-            onClick={() => selectSkillTarget(id)}
-            style={{ 'background-image': `url(/molecules/${genAvatar(name)}.svg)` }} >
-            {combatTextEl}
-        </div>
-    );
-}
-
 const NULL_UUID = '00000000-0000-0000-0000-000000000000';
 
 const STATS = {
@@ -491,9 +482,8 @@ module.exports = {
     convertItem,
     numSort,
     genAvatar,
-    constructAvatar,
+    ConstructAvatar,
     instanceConstruct,
-    gameConstructImg,
     requestAvatar,
     eventClasses,
     getCombatSequence,
diff --git a/server/src/construct.rs b/server/src/construct.rs
index 5473a563..99425daa 100644
--- a/server/src/construct.rs
+++ b/server/src/construct.rs
@@ -373,7 +373,7 @@ impl Construct {
 
         let i = match available.len() {
             1 => 0,
-            _ => rng.gen_range(0, available.len() - 1),
+            _ => rng.gen_range(0, available.len()),
         };
 
         return Some(available[i].skill);