diff --git a/index.html b/index.html
index fcb11b5..494fcdf 100644
--- a/index.html
+++ b/index.html
@@ -82,12 +82,14 @@ <h2>Upgrades</h2>
     </div>
 
     <div class="health template">
-        <img src=res/heart.png />
+        <span class=heart>&hearts;</span>
         <span class=value></span>
     </div>
 
     <div class="weapons template"></div>
 
+    <div class="achievements template"></div>
+
     <script id="upgrade-img-template" type="text/x-handlebars-template">
         <div class="tooltip upgrade {{#if canPurchase}}can-purchase{{/if}}" data-id="{{ id }}">
             <img class=upgrade-purchase src=res/achievements/{{ img }} />
@@ -115,6 +117,7 @@ <h2>Upgrades</h2>
 
 
     <script id="achievements-list-template" type="text/x-handlebars-template">
+        <a href=javascript:; class=back-button>[Back]</a>
         <h1>Achievements</h1>
         <div class="achievement-list">
             {{#each achievements}}
diff --git a/res/achievements/blast.png b/res/achievements/blast.png
index 9f364fd..b780127 100644
Binary files a/res/achievements/blast.png and b/res/achievements/blast.png differ
diff --git a/res/achievements/blue_laser.png b/res/achievements/blue_laser.png
index 3485bac..3baf0db 100644
Binary files a/res/achievements/blue_laser.png and b/res/achievements/blue_laser.png differ
diff --git a/res/achievements/blue_rotate.png b/res/achievements/blue_rotate.png
index 51732b7..00f3b98 100644
Binary files a/res/achievements/blue_rotate.png and b/res/achievements/blue_rotate.png differ
diff --git a/res/achievements/cheater.png b/res/achievements/cheater.png
new file mode 100644
index 0000000..2954e5d
Binary files /dev/null and b/res/achievements/cheater.png differ
diff --git a/res/achievements/cursor.png b/res/achievements/cursor.png
new file mode 100644
index 0000000..46aab6e
Binary files /dev/null and b/res/achievements/cursor.png differ
diff --git a/res/achievements/default.png b/res/achievements/default.png
index eaaf0c0..9680198 100644
Binary files a/res/achievements/default.png and b/res/achievements/default.png differ
diff --git a/res/achievements/fifty_kills.png b/res/achievements/fifty_kills.png
index 07ed54d..7ece36a 100644
Binary files a/res/achievements/fifty_kills.png and b/res/achievements/fifty_kills.png differ
diff --git a/res/achievements/first.png b/res/achievements/first.png
index 5aa9679..408e3fd 100644
Binary files a/res/achievements/first.png and b/res/achievements/first.png differ
diff --git a/res/achievements/first_kill.png b/res/achievements/first_kill.png
index 68d42d6..b03a1fc 100644
Binary files a/res/achievements/first_kill.png and b/res/achievements/first_kill.png differ
diff --git a/res/achievements/grand.png b/res/achievements/grand.png
index 79db9fc..0704a25 100644
Binary files a/res/achievements/grand.png and b/res/achievements/grand.png differ
diff --git a/res/achievements/green_laser.png b/res/achievements/green_laser.png
index 14c8211..e5f729c 100644
Binary files a/res/achievements/green_laser.png and b/res/achievements/green_laser.png differ
diff --git a/res/achievements/green_rotate.png b/res/achievements/green_rotate.png
index 3a58732..0a79e0f 100644
Binary files a/res/achievements/green_rotate.png and b/res/achievements/green_rotate.png differ
diff --git a/res/achievements/hundred.png b/res/achievements/hundred.png
index 66b001f..7ed7315 100644
Binary files a/res/achievements/hundred.png and b/res/achievements/hundred.png differ
diff --git a/res/achievements/hundred_kills.png b/res/achievements/hundred_kills.png
index cfd8bf2..e6a862d 100644
Binary files a/res/achievements/hundred_kills.png and b/res/achievements/hundred_kills.png differ
diff --git a/res/achievements/leet.png b/res/achievements/leet.png
new file mode 100644
index 0000000..4fdcf05
Binary files /dev/null and b/res/achievements/leet.png differ
diff --git a/res/achievements/orange_laser.png b/res/achievements/orange_laser.png
index 33d75e0..83e5104 100644
Binary files a/res/achievements/orange_laser.png and b/res/achievements/orange_laser.png differ
diff --git a/res/achievements/over_nine_thousand.png b/res/achievements/over_nine_thousand.png
new file mode 100644
index 0000000..7c1ae50
Binary files /dev/null and b/res/achievements/over_nine_thousand.png differ
diff --git a/res/achievements/pot-o-gold.png b/res/achievements/pot-o-gold.png
index e41d48d..abc84fe 100644
Binary files a/res/achievements/pot-o-gold.png and b/res/achievements/pot-o-gold.png differ
diff --git a/res/achievements/purple_laser.png b/res/achievements/purple_laser.png
index 1a40428..15f5fc6 100644
Binary files a/res/achievements/purple_laser.png and b/res/achievements/purple_laser.png differ
diff --git a/res/achievements/red_laser.png b/res/achievements/red_laser.png
index 81b73ec..e3277fa 100644
Binary files a/res/achievements/red_laser.png and b/res/achievements/red_laser.png differ
diff --git a/res/achievements/shockwave_range.png b/res/achievements/shockwave_range.png
index 913ac72..d048ac2 100644
Binary files a/res/achievements/shockwave_range.png and b/res/achievements/shockwave_range.png differ
diff --git a/res/achievements/slowmolize.png b/res/achievements/slowmolize.png
index 4770bda..7cb299e 100644
Binary files a/res/achievements/slowmolize.png and b/res/achievements/slowmolize.png differ
diff --git a/res/achievements/thousand_kills.png b/res/achievements/thousand_kills.png
index 5cfaf70..120a950 100644
Binary files a/res/achievements/thousand_kills.png and b/res/achievements/thousand_kills.png differ
diff --git a/res/achievements/twenty_kills.png b/res/achievements/twenty_kills.png
index 945426c..58a63ac 100644
Binary files a/res/achievements/twenty_kills.png and b/res/achievements/twenty_kills.png differ
diff --git a/res/achievements/yellow_laser.png b/res/achievements/yellow_laser.png
index fd1b450..216e54b 100644
Binary files a/res/achievements/yellow_laser.png and b/res/achievements/yellow_laser.png differ
diff --git a/res/blue_laser_beam.png b/res/blue_laser_beam.png
index 863ad90..a276bb8 100644
Binary files a/res/blue_laser_beam.png and b/res/blue_laser_beam.png differ
diff --git a/res/dog/dog-dead-1.png b/res/dog/dog-dead-1.png
index 76e03ef..b0e976f 100644
Binary files a/res/dog/dog-dead-1.png and b/res/dog/dog-dead-1.png differ
diff --git a/res/dog/dog-walking-1.png b/res/dog/dog-walking-1.png
index 9d9ac6f..e28aed4 100644
Binary files a/res/dog/dog-walking-1.png and b/res/dog/dog-walking-1.png differ
diff --git a/res/dog/dog-walking-2.png b/res/dog/dog-walking-2.png
index ce0961d..775e07b 100644
Binary files a/res/dog/dog-walking-2.png and b/res/dog/dog-walking-2.png differ
diff --git a/res/dog/dog-walking-3.png b/res/dog/dog-walking-3.png
index dd19533..9917f9a 100644
Binary files a/res/dog/dog-walking-3.png and b/res/dog/dog-walking-3.png differ
diff --git a/res/dog/dog-walking-4.png b/res/dog/dog-walking-4.png
index 9c93b9a..59e2a76 100644
Binary files a/res/dog/dog-walking-4.png and b/res/dog/dog-walking-4.png differ
diff --git a/res/dog/dog-walking-5.png b/res/dog/dog-walking-5.png
index 0894bb3..6e40c3c 100644
Binary files a/res/dog/dog-walking-5.png and b/res/dog/dog-walking-5.png differ
diff --git a/res/dog/dog-walking-6.png b/res/dog/dog-walking-6.png
index c5f8c82..e2a3746 100644
Binary files a/res/dog/dog-walking-6.png and b/res/dog/dog-walking-6.png differ
diff --git a/res/dog/dog-walking-7.png b/res/dog/dog-walking-7.png
index fd750e8..9450d98 100644
Binary files a/res/dog/dog-walking-7.png and b/res/dog/dog-walking-7.png differ
diff --git a/res/dog/dog-walking-8.png b/res/dog/dog-walking-8.png
index 3a4186d..8809281 100644
Binary files a/res/dog/dog-walking-8.png and b/res/dog/dog-walking-8.png differ
diff --git a/res/effects/blue_effect.png b/res/effects/blue_effect.png
new file mode 100644
index 0000000..d306e79
Binary files /dev/null and b/res/effects/blue_effect.png differ
diff --git a/res/effects/green_effect.png b/res/effects/green_effect.png
new file mode 100644
index 0000000..d2598be
Binary files /dev/null and b/res/effects/green_effect.png differ
diff --git a/res/effects/orange_effect.png b/res/effects/orange_effect.png
new file mode 100644
index 0000000..b23d4d9
Binary files /dev/null and b/res/effects/orange_effect.png differ
diff --git a/res/elephant/elephant-dead-1.png b/res/elephant/elephant-dead-1.png
index 73db500..19a42e7 100644
Binary files a/res/elephant/elephant-dead-1.png and b/res/elephant/elephant-dead-1.png differ
diff --git a/res/elephant/elephant-walking-1.png b/res/elephant/elephant-walking-1.png
index d2f210c..18aee8a 100644
Binary files a/res/elephant/elephant-walking-1.png and b/res/elephant/elephant-walking-1.png differ
diff --git a/res/elephant/elephant-walking-2.png b/res/elephant/elephant-walking-2.png
index b9cf14e..1e2e38c 100644
Binary files a/res/elephant/elephant-walking-2.png and b/res/elephant/elephant-walking-2.png differ
diff --git a/res/elephant/elephant-walking-3.png b/res/elephant/elephant-walking-3.png
index 6a7c62f..71a3e23 100644
Binary files a/res/elephant/elephant-walking-3.png and b/res/elephant/elephant-walking-3.png differ
diff --git a/res/elephant/elephant-walking-4.png b/res/elephant/elephant-walking-4.png
index 6b98dff..85cd5a2 100644
Binary files a/res/elephant/elephant-walking-4.png and b/res/elephant/elephant-walking-4.png differ
diff --git a/res/elephant/elephant-walking-5.png b/res/elephant/elephant-walking-5.png
index 1e35025..4dde46a 100644
Binary files a/res/elephant/elephant-walking-5.png and b/res/elephant/elephant-walking-5.png differ
diff --git a/res/elephant/elephant-walking-6.png b/res/elephant/elephant-walking-6.png
index 6ca1939..4d284bc 100644
Binary files a/res/elephant/elephant-walking-6.png and b/res/elephant/elephant-walking-6.png differ
diff --git a/res/elephant/elephant.png b/res/elephant/elephant.png
index d2f210c..18aee8a 100644
Binary files a/res/elephant/elephant.png and b/res/elephant/elephant.png differ
diff --git a/res/green_laser_beam.png b/res/green_laser_beam.png
index b5dfe62..af6db76 100644
Binary files a/res/green_laser_beam.png and b/res/green_laser_beam.png differ
diff --git a/res/heart.png b/res/heart.png
deleted file mode 100644
index 6826324..0000000
Binary files a/res/heart.png and /dev/null differ
diff --git a/res/pinkbear/pinkbear-dead-1.png b/res/pinkbear/pinkbear-dead-1.png
index 86df108..5a698e5 100644
Binary files a/res/pinkbear/pinkbear-dead-1.png and b/res/pinkbear/pinkbear-dead-1.png differ
diff --git a/res/pinkbear/pinkbear-walking-1.png b/res/pinkbear/pinkbear-walking-1.png
index 3b7ef4e..1840190 100644
Binary files a/res/pinkbear/pinkbear-walking-1.png and b/res/pinkbear/pinkbear-walking-1.png differ
diff --git a/res/pinkbear/pinkbear-walking-2.png b/res/pinkbear/pinkbear-walking-2.png
index 1a89ee4..5e2af32 100644
Binary files a/res/pinkbear/pinkbear-walking-2.png and b/res/pinkbear/pinkbear-walking-2.png differ
diff --git a/res/pinkbear/pinkbear-walking-3.png b/res/pinkbear/pinkbear-walking-3.png
index 8b4e8fa..1840190 100644
Binary files a/res/pinkbear/pinkbear-walking-3.png and b/res/pinkbear/pinkbear-walking-3.png differ
diff --git a/res/pinkbear/pinkbear-walking-4.png b/res/pinkbear/pinkbear-walking-4.png
index d904f92..e839baf 100644
Binary files a/res/pinkbear/pinkbear-walking-4.png and b/res/pinkbear/pinkbear-walking-4.png differ
diff --git a/res/pot.png b/res/pot.png
index 783c17e..2197f61 100644
Binary files a/res/pot.png and b/res/pot.png differ
diff --git a/res/rainbow.png b/res/rainbow.png
index 9805c70..2661023 100644
Binary files a/res/rainbow.png and b/res/rainbow.png differ
diff --git a/res/red_laser_beam.png b/res/red_laser_beam.png
index 9951ec1..f3e4127 100644
Binary files a/res/red_laser_beam.png and b/res/red_laser_beam.png differ
diff --git a/res/style.css b/res/style.css
index fc2f0fd..19ca4da 100644
--- a/res/style.css
+++ b/res/style.css
@@ -1,16 +1,19 @@
-*{
-    margin:0;
-    padding:0;
-    border:0;
-    outline:0;
-}
-html,body {
-    overflow:hidden;
-    background:black;
+* {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    outline: 0;
+}
+
+html, body {
+    overflow: hidden;
+    background: black;
     user-select: none;
     -ms-user-select: none;
     -moz-user-select: none;
     -webkit-user-select: none;
+    -webkit-touch-callout: none;
+    -ms-touch-action: none;
     font-family: 'blackoutmidnight';
     cursor: default;
 }
@@ -24,13 +27,12 @@ button {
     top: 75%;
     left: 0;
     margin: 0 auto;
-    width:100%;
-    background: white;
+    width: 100%;
     padding: 2%;
     text-align: center;
     font-size: 300%;
     display: none;
-    background: rgba(0,0,0,0.5);
+    background: rgba(0, 0, 0, 0.5);
     color: white;
 }
 
@@ -49,7 +51,7 @@ button {
 }
 
 .achievement .image {
-    float:left;
+    float: left;
     margin-right: 1%;
     width: 10%;
 }
@@ -76,20 +78,13 @@ button {
     text-align: center;
     color: #d6116e;
     display: none;
-}
-
-.health img {
-    width: 4%;
-}
-
-.health .value {
-    font-size: 100%;
+    font-size: 180%;
 }
 
 @font-face {
     font-family: 'blackoutmidnight';
     src: url('fonts/blackout-nor-webfont.eot');
-    src: url('fonts/blackout-nor-webfont.eot') format('embedded-opentype'),url('fonts/blackout-nor-webfont.woff') format('woff'),url('fonts/blackout-nor-webfont.ttf') format('truetype'),url('fonts/blackout-nor-webfont.svg') format('svg');
+    src: url('fonts/blackout-nor-webfont.eot') format('embedded-opentype'), url('fonts/blackout-nor-webfont.woff') format('woff'), url('fonts/blackout-nor-webfont.ttf') format('truetype'), url('fonts/blackout-nor-webfont.svg') format('svg');
     font-weight: normal;
     font-style: normal;
 }
@@ -97,16 +92,16 @@ button {
 #overlay {
     z-index: 1000;
     position: fixed;
-    top:0;
-    left:0;
-    width:100%;
-    height:100%;
-    background: rgba(0,0,0,0.5);
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
 }
 
 #game-over {
     z-index: 1001;
-    position:absolute;
+    position: absolute;
     left: 50%;
     top: 50%;
     width: 300px;
@@ -145,7 +140,7 @@ p {
 }
 
 strong {
-    padding:10px 0;
+    padding: 10px 0;
 }
 
 .upgrade img,
@@ -164,7 +159,7 @@ strong {
     width: 20%;
     top: 2%;
     left: 1%;
-    background: rgba(0,0,0,0.5);
+    background: rgba(0, 0, 0, 0.5);
     color: white;
 }
 
@@ -178,7 +173,7 @@ strong {
 }
 
 .can-purchase {
-    opacity:1;
+    opacity: 1;
 }
 
 .img-upgrade-container {
@@ -186,12 +181,13 @@ strong {
 }
 
 .weapons {
+    display: none;
     position: absolute;
     left: 1%;
     bottom: 2%;
     padding: 1%;
     z-index: 2000;
-    background: rgba(0,0,0,0.5);
+    background: rgba(0, 0, 0, 0.5);
     color: white;
     width: 20%;
 }
@@ -204,34 +200,51 @@ strong {
 }
 
 .weapon img {
-    margin: 0;
+    margin-top: 0;
+}
+
+#wrapper.achievements {
+    background: white;
 }
 
 .achievements {
     position: absolute;
-    left: 10%;
-    right: 10%;
-    top: 5%;
-    bottom: 5%;
-    background: rgba(0,0,0,0.5);
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    background: rgba(0, 0, 0, 0.5);
     font-size: 200%;
     overflow: hidden;
 }
+
 .achievement-element {
-    padding: 1%;
+    padding: 1% 5%;
     clear: both;
     overflow: hidden;
 }
 
 .achievements h1 {
-    padding: .6em 1em;
+    padding-left: 5%;
     background: #01bbd2;
     color: white;
+    height: 15%;
+    line-height: 2.4em;
 }
+
+.achievements .back-button {
+    float: right;
+    text-decoration: none;
+    color: white;
+    line-height: 5em;
+    margin-right: 5%;
+}
+
 .achievement-list {
     overflow: auto;
     width: 100%;
-    height: 100%;
+    top: 15%;
+    bottom: 0;
     position: absolute;
 }
 
diff --git a/src/AchievementState.js b/src/AchievementState.js
index e9cac6a..ae53c96 100644
--- a/src/AchievementState.js
+++ b/src/AchievementState.js
@@ -1,50 +1,66 @@
 // Copy this file, rename to name of state and add to StateManager
-function AchievementState(){
-}
+function AchievementState() {
+};
 
-AchievementState.prototype.init = function(){
-    this.elements = [];
-    var source = $("#achievements-list-template").html();
-    this.template = Handlebars.compile(source);
-}
+AchievementState.prototype.init = function() {
+  this.elements = [];
+  var source = $("#achievements-list-template").html();
+  this.template = Handlebars.compile(source);
 
-AchievementState.prototype.pause = function(){
-  $('#wrapper').empty();
-}
+  this.achievement_data = new Achievements();
+};
 
-AchievementState.prototype.resume = function(){
+AchievementState.prototype.pause = function() {
+  $('#wrapper').empty().removeClass('achievements');
+  $('.back-button').off('click');
+};
+
+AchievementState.prototype.resume = function() {
+  var achievements = this.getAchievements();
+
+  var html = this.template({achievements: achievements});
+
+  this.$achievement_template = $('.achievements.template').clone()
+    .removeClass('template');
+  this.$achievement_template.html(html);
+  $('#wrapper').addClass('achievements').append(this.$achievement_template);
+
+  $('.back-button').on('click touchstart', function() {
+    sm.changeState('menu');
+  });
+};
+
+AchievementState.prototype.render = function(ctx) {
+};
+
+AchievementState.prototype.update = function() {
+  if (KEYS[27]) {
+    sm.changeState("menu");
+  }
+};
+
+AchievementState.prototype.getAchievements = function() {
   var json_data = getCookie("cuteanimals_stats");
   if (json_data === undefined) {
-    return false;
+    return [
+      {
+        name: "No achievements",
+        description: "You should try the game, and come back later!",
+        custom_image: "default"
+      }
+    ];
   }
   var data = JSON.parse(json_data);
   var uniqueNames = [];
-  $.each(data.achievements, function(i, el){
-        if($.inArray(el, uniqueNames) === -1) uniqueNames.push(el);
+  $.each(data.achievements, function(i, el) {
+    if ($.inArray(el, uniqueNames) === -1) uniqueNames.push(el);
   });
-  var achievement_data = new Achievements();
   var achievements = [];
-  for (var i=0;i<uniqueNames.length;i++) {
-    achievements[i] = achievement_data.achievements[uniqueNames[i]];
+  for (var i = 0; i < uniqueNames.length; i++) {
+    achievements[i] = this.achievement_data.achievements[uniqueNames[i]];
     if (achievements[i].custom_image === undefined) {
       achievements[i].custom_image = uniqueNames[i];
     }
   }
-  var html = this.template({achievements: achievements});
-  console.log(achievements);
-  console.log(html);
-
-  this.achievement_template = $('.achievements.template').clone()
-    .removeClass('template');
-  this.achievement_template.html(html);
-  $('#wrapper').append(this.achievement_template);
-}
-
-AchievementState.prototype.render = function(ctx){
-}
-
-AchievementState.prototype.update = function(){
-  if (KEYS[27]) {
-    sm.changeState("menu");
-  }
-}
+  return achievements;
+};
diff --git a/src/Achievements.js b/src/Achievements.js
index 6773813..dc3b78a 100644
--- a/src/Achievements.js
+++ b/src/Achievements.js
@@ -1,108 +1,130 @@
-function Achievements(){
-    var that = this;
-    /* warmup, should not make sound */
-    createjs.Sound.play('res/achievement-T.mp3|res/achievement-T.ogg');
-    createjs.Sound.play('res/achievement-S.mp3|res/achievement-S.ogg');
-    $(function(){
-        that.template = $('.achievement.template');
-    });
-    this.achievements = {
-        welcome: {
-          name: 'What is that?',
-          description: 'The end of the rainbow! And there\'s gold! Clicky clicky!',
-          custom_image: 'pot-o-gold'
-        },
-        first: {
-            name: 'First click',
-            description: 'Gold is so nice! Keep it all for yourself.'
-        },
-        good_luck: {
-          name: 'Good going!',
-          description: 'I\'m going to leave you to it now, good luck and have fun! Remember to buy upgrades!',
-          custom_image: 'blue_laser'
-        },
-        hundred: {
-            name: 'Hundred coins',
-            description: 'Yay! You have earned 100 coins! I remember my first 100...'
-        },
-        grand: {
-            name: 'A grand',
-            description: 'You have totally earned a grand! Awesome!'
-        },
-        green_laser: {
-            name: 'Green laser',
-            description: 'Yay! Make these beasts sick!'
-        },
-        blue_laser: {
-            name: 'Blu-ray',
-            description: 'Slow them down, get away!'
-        },
-        orange_laser: {
-            name: 'Orange laser',
-            description: '(Orange the color, not orange the fruit.)'
-        },
-        purple_laser: {
-            name: 'Purple laser',
-            description: 'Not quite red, not quite blue. Maybe a little bit of both?'
-        },
-        red_laser: {
-            name: 'Red laser',
-            description: 'Sweet! You start the game with a red laser.'
-        },
-        yellow_laser: {
-            name: 'Yellow laser',
-            description: 'Like the yellow sports car, the yellow laser is the epitome of cool.'
-        },
-        first_kill: {
-            name: 'First kill',
-            description: 'Kill them all!'
-        },
-        twenty_kills: {
-            name: 'Twenty kills',
-            description: 'Maybe I can get out?'
-        },
-        fifty_kills: {
-            name: 'Fifty kills',
-            description: 'Hurry!'
-        },
-        hundred_kills: {
-            name: 'Hundred kills',
-            description: 'You now have more kills than there are Luftballons.'
-        },
-        thousand_kills: {
-            name: 'Thousand kills',
-            description: 'Man, you are really killing it! What are you doing now?'
-        },
-        afford_red_laser: {
-            name: 'Is someone coming?',
-            description: 'Quick, you should buy a red laser to keep these guys at bay.',
-            custom_image: 'red_laser' /*TODO: perhaps make an icon with coins on it instead? */
-        },
-        first_wave_completed: {
-            name: 'First wave completed',
-            description: "Alright, no enemies in sight. Click the pot to get more gold while you can!",
-            custom_image: 'first'
-        }
-    };
-}
+function Achievements() {
+  var that = this;
+  /* warmup, should not make sound */
+  createjs.Sound.play('res/achievement-T.mp3|res/achievement-T.ogg');
+  createjs.Sound.play('res/achievement-S.mp3|res/achievement-S.ogg');
+  $(function() {
+    that.template = $('.achievement.template');
+  });
+  this.achievements = {
+    welcome: {
+      name: 'What is that?',
+      description: 'The end of the rainbow! And there\'s gold! Clicky clicky!',
+      custom_image: 'pot-o-gold'
+    },
+    first: {
+      name: 'First click',
+      description: 'Gold is so nice! Keep it all for yourself.'
+    },
+    good_luck: {
+      name: 'Good going!',
+      description: 'I\'m going to leave you to it now, good luck and have fun! Remember to buy upgrades!',
+      custom_image: 'blue_laser'
+    },
+    hundred: {
+      name: 'Hundred coins',
+      description: 'Yay! You have earned 100 coins! I remember my first 100...'
+    },
+    grand: {
+      name: 'A grand',
+      description: 'You have totally earned a grand! Awesome!'
+    },
+    green_laser: {
+      name: 'Green laser',
+      description: 'Yay! Make these beasts sick!'
+    },
+    blue_laser: {
+      name: 'Blu-ray',
+      description: 'Slow them down, get away!'
+    },
+    orange_laser: {
+      name: 'Orange laser',
+      description: '(Orange the color, not orange the fruit.)'
+    },
+    purple_laser: {
+      name: 'Purple laser',
+      description: 'Not quite red, not quite blue. Maybe a little bit of both?'
+    },
+    red_laser: {
+      name: 'Red laser',
+      description: 'Sweet! You start the game with a red laser.'
+    },
+    yellow_laser: {
+      name: 'Yellow laser',
+      description: 'Like the yellow sports car, the yellow laser is the epitome of cool.'
+    },
+    first_kill: {
+      name: 'First kill',
+      description: 'Kill them all!'
+    },
+    twenty_kills: {
+      name: 'Twenty kills',
+      description: 'Maybe I can get out?'
+    },
+    fifty_kills: {
+      name: 'Fifty kills',
+      description: 'Hurry!'
+    },
+    hundred_kills: {
+      name: 'Hundred kills',
+      description: 'You now have more kills than there are Luftballons.'
+    },
+    thousand_kills: {
+      name: 'Thousand kills',
+      description: 'Man, you are really killing it! What are you doing now?'
+    },
+    afford_red_laser: {
+      name: 'Is someone coming?',
+      description: 'Quick, you should buy a red laser to keep these guys at bay.',
+      custom_image: 'red_laser'
+    },
+    first_wave_completed: {
+      name: 'First wave completed',
+      description: "Alright, no enemies in sight. Click the pot to get more gold while you can!",
+      custom_image: 'first'
+    },
+    insane_clicking: {
+      name: 'Insane clicking',
+      description: "Over 100 clicks in 10 seconds! Make sure your fingers don't overheat",
+      custom_image: 'cursor'
+    },
+    forty_two_clicks: {
+      name: '42 clicks',
+      description: "The answer to everything",
+      custom_image: 'cursor'
+    },
+    over_nine_thousand: {
+      name: "It's Over 9000!!!",
+      description: "You have earned more than 9000 coins in total"
+    },
+    leet: {
+      name: "1337 clicks",
+      description: "ZOMG j00 leik, totally pwn"
+    },
+    cheater: {
+      name: "Cheater?",
+      description: "Not sure if you are clicking really fast or cheating"
+    }
+  };
+};
 
-Achievements.prototype.give = function(achievement_key){
+Achievements.prototype.give = function(achievement_key) {
   var achievement = this.achievements[achievement_key];
   if (achievement.achieved) {
-      return;
+    return;
   }
   achievement.achieved = true;
   var achievement_div = this.template.clone().removeClass('template');
   var image_key = achievement.hasOwnProperty('custom_image') ? achievement.custom_image : achievement_key;
   achievement_div.find('.image').attr('src',
-          'res/achievements/' + image_key + '.png');
+    'res/achievements/' + image_key + '.png');
   achievement_div.find('.name').text(achievement.name);
   achievement_div.find('.description').text(achievement.description);
   Toast(achievement_div[0].outerHTML);
   var chord = Math.random() > 0.5 ? 'S' : 'T';
-  createjs.Sound.play('res/achievement-'+chord+'.mp3|res/achievement-'+chord+'.ogg');
+  createjs.Sound.play('res/achievement-' + chord + '.mp3|res/achievement-' + chord + '.ogg');
 
   var ach = JSON.parse(getCookie('cuteanimals_stats'));
-  ach.achievements.push(''+achievement_key);
+  ach.achievements.push('' + achievement_key);
   setCookie("cuteanimals_stats", JSON.stringify(ach));
-}
+};
diff --git a/src/AudioButton.js b/src/AudioButton.js
index 7a84390..5f527f6 100644
--- a/src/AudioButton.js
+++ b/src/AudioButton.js
@@ -11,7 +11,7 @@ function AudioButton() {
   if (this.on) {
     this.getMusicElement().play();
   }
-}
+};
 
 AudioButton.prototype.render = function() {
   var sprite = this.on ? this.sprite_on : this.sprite_off;
@@ -21,11 +21,11 @@ AudioButton.prototype.render = function() {
   ctx.scale(scaler, scaler);
   ctx.drawImage(sprite, -sprite.width / 2, -sprite.height / 2);
   ctx.restore();
-}
+};
 
 AudioButton.prototype.getMusicElement = function() {
   return $("#music")[0];
-}
+};
 
 AudioButton.prototype.pause = function() {
   this.getMusicElement().pause();
@@ -33,9 +33,9 @@ AudioButton.prototype.pause = function() {
   var cookie = JSON.parse(getCookie("cuteanimals_stats"));
   cookie.music = false;
   setCookie("cuteanimals_stats", JSON.stringify(cookie));
-}
+};
 
-AudioButton.prototype.toggleActivated = function(){
+AudioButton.prototype.toggleActivated = function() {
   this.on = !this.on;
   createjs.Sound.setMute(!this.on);
   if (this.on) {
@@ -47,4 +47,4 @@ AudioButton.prototype.toggleActivated = function(){
   var cookie = JSON.parse(getCookie("cuteanimals_stats"));
   cookie.music = this.on;
   setCookie("cuteanimals_stats", JSON.stringify(cookie));
-}
+};
diff --git a/src/Cash.js b/src/Cash.js
index f7217ab..7749ae7 100644
--- a/src/Cash.js
+++ b/src/Cash.js
@@ -3,21 +3,21 @@
  * @param Achievements achievements
  * @constructor
  */
-function Cash(achievements, game){
+function Cash(achievements, game) {
   this.achievements = achievements;
   this.game = game;
   this.accumulatedAmount = 0;
   this.amount = 0;
-}
+};
 
-Cash.prototype.setupView = function(){
+Cash.prototype.setupView = function() {
   this.cash_display = $('.cash.template').clone()
     .removeClass('template');
   $('#wrapper').append(this.cash_display);
   this.render();
 };
 
-Cash.prototype.add = function(amount){
+Cash.prototype.add = function(amount) {
   this.amount += amount;
   this.accumulatedAmount += amount;
 
@@ -30,11 +30,14 @@ Cash.prototype.add = function(amount){
   if (this.accumulatedAmount >= 1000) {
     this.achievements.give('grand');
   }
+  if (this.accumulatedAmount > 9000) {
+    this.achievements.give('over_nine_thousand');
+  }
   this.render();
   this.game.upgrades.render();
-}
+};
 
-Cash.prototype.spend = function(amount){
+Cash.prototype.spend = function(amount) {
   if (!this.canSpend(amount)) {
     return false;
   }
@@ -42,12 +45,12 @@ Cash.prototype.spend = function(amount){
   this.render();
   this.game.upgrades.render();
   return true;
-}
+};
 
 Cash.prototype.canSpend = function(amount) {
   return !(this.amount < amount);
 };
 
-Cash.prototype.render = function(){
+Cash.prototype.render = function() {
   this.cash_display.find('.value').text('$' + Math.floor(this.amount));
-}
+};
diff --git a/src/CreditsState.js b/src/CreditsState.js
index 4539d20..3ef4f53 100644
--- a/src/CreditsState.js
+++ b/src/CreditsState.js
@@ -1,32 +1,34 @@
-function CreditsState(){
-}
+function CreditsState() {
+};
 
-CreditsState.prototype.init = function(){
+CreditsState.prototype.init = function() {
   this.bg_img = loadImage('res/about.png');
-}
+};
 
-CreditsState.prototype.pause = function(){
-}
+CreditsState.prototype.pause = function() {
+};
 
-CreditsState.prototype.resume = function(){
-    this.cooldown = true;
-}
+CreditsState.prototype.resume = function() {
+  this.cooldown = true;
+  this.elements = [
+    [function() {
+      sm.changeState('menu');
+    }, {x: 0, y: 0, w: 16, h: 9}]
+  ];
+};
 
-CreditsState.prototype.render = function(ctx){
+CreditsState.prototype.render = function(ctx) {
   ctx.save();
-  var scaler = 16*GU/this.bg_img.width;
-  ctx.translate(16*GU/2, 9*GU/2);
+  var scaler = 16 * GU / this.bg_img.width;
   ctx.scale(scaler, scaler);
-  ctx.translate(-this.bg_img.width/2, -this.bg_img.height/2);
   ctx.drawImage(this.bg_img, 0, 0);
   ctx.restore();
-  ctx.save();
-}
+};
 
-CreditsState.prototype.update = function(){
+CreditsState.prototype.update = function() {
 
-    if(this.cooldown && KEYS[27]) { /* escape */
-      sm.changeState('menu');
-      this.cooldown = false;
-    }
-}
+  if (this.cooldown && KEYS[27]) { /* escape */
+    sm.changeState('menu');
+    this.cooldown = false;
+  }
+};
diff --git a/src/DotEffect.js b/src/DotEffect.js
index 48f7778..2bfb501 100644
--- a/src/DotEffect.js
+++ b/src/DotEffect.js
@@ -1,71 +1,64 @@
-function DotEffect(maxDpt, tickDuration, applicationsToMax){
+function DotEffect(maxDpt, tickDuration, applicationsToMax) {
   //dpt = damage per tick
   this.maxDpt = maxDpt;
   this.applicationsToMax = applicationsToMax;
-  if(applicationsToMax !== undefined){
-    this.dpt = maxDpt * 1/applicationsToMax;
-  }else{
+  if (applicationsToMax !== undefined) {
+    this.dpt = maxDpt * 1 / applicationsToMax;
+  } else {
     this.dpt = maxDpt;
   }
   this.applications = 1;
   this.duration = tickDuration;
-}
+};
 
-DotEffect.prototype.onApply = function(enemy){
+DotEffect.prototype.onApply = function(enemy) {
   this.appliedT = sm.activeState.t;
-}
+};
 
-DotEffect.prototype.onReapply = function(enemy, newEffect){
+DotEffect.prototype.onReapply = function(enemy, newEffect) {
   this.applications++;
   this.appliedT = sm.activeState.t;
 
 
   //I'm trying to make sure that you never override with worse stats.
-  if(newEffect.maxDpt > this.maxDpt){
-      this.applicationsToMax = newEffect.applicationsToMax;
-      this.maxDpt = newEffect.maxDpt;
-    }
+  if (newEffect.maxDpt > this.maxDpt) {
+    this.applicationsToMax = newEffect.applicationsToMax;
+    this.maxDpt = newEffect.maxDpt;
+  }
 
 
-  if(this.applicationsToMax  !== undefined){
-    this.dpt = this.maxDpt * Math.min(1, this.applications/this.applicationsToMax);
-  }else{
+  if (this.applicationsToMax !== undefined) {
+    this.dpt = this.maxDpt * Math.min(1, this.applications / this.applicationsToMax);
+  } else {
     this.dpt = this.maxDpt;
   }
 
-}
-
-DotEffect.prototype.onRemove = function(enemy){
-}
-
+};
 
-DotEffect.prototype.render = function(ctx, enemy, t){
-  var color = "green";
-  var radius = 0.7*GU, innerRadius = 0.3*GU, outerRadius = 0.9*GU;
+DotEffect.prototype.onRemove = function(enemy) {
+};
 
 
+DotEffect.prototype.render = function(ctx, enemy, t) {
+  var sprite = this.sprite_green;
+  var radius = 1.6;
   //Scale with power.
-  if(this.applicationsToMax !== undefined){
-    radius *= Math.min(1, this.applications/this.applicationsToMax);
-    outerRadius *= Math.min(1, this.applications/this.applicationsToMax);
-    innerRadius *= Math.min(1, this.applications/this.applicationsToMax);
+  if (this.applicationsToMax !== undefined) {
+    radius *= Math.min(1, this.applications / this.applicationsToMax);
   }
 
-  var gradient = ctx.createRadialGradient(enemy.x*GU, enemy.y*GU, innerRadius,
-    enemy.x*GU, enemy.y*GU, outerRadius);
-  gradient.addColorStop(0, color);
-  gradient.addColorStop(1, 'rgba(0,0,0,0)');
-
-  ctx.arc(enemy.x*GU, enemy.y*GU, radius, 0, 2 * Math.PI);
-
-  ctx.fillStyle = gradient;
-  ctx.fill();
-}
+  ctx.save();
+  var scaler = radius * GU / sprite.width;
+  ctx.translate(enemy.x * GU, enemy.y * GU);
+  ctx.scale(scaler, scaler);
+  ctx.drawImage(sprite, -sprite.width * 0.5, -sprite.height * 0.5);
+  ctx.restore();
+};
 
-DotEffect.prototype.update = function(enemy, t){
+DotEffect.prototype.update = function(enemy, t) {
   enemy.hit(this.dpt);
-  if(this.duration == undefined || this.duration <= 0) return;
-  if(sm.activeState.t - this.appliedT >= this.duration){
+  if (this.duration == undefined || this.duration <= 0) return;
+  if (sm.activeState.t - this.appliedT >= this.duration) {
     enemy.removeEffect(this);
   }
-}
+};
diff --git a/src/Enemy.js b/src/Enemy.js
index 04e4a89..42e8d5c 100644
--- a/src/Enemy.js
+++ b/src/Enemy.js
@@ -5,17 +5,17 @@ function Enemy(x, y, enemyType, scaling) {
   this.sprites = enemyType.sprites;
 
   this.small_ps = new ParticleSystem({
-    color: {r:234, g: 48, b: 1},
+    color: {r: 234, g: 48, b: 1},
     blend_mode: 'source-over',
     gravity: {x: 0, y: 0},
     explode_random: {x: 0.1, y: 0.1},
-    size: 0.02,
+    size: 0.025,
     friction: 0.6,
     life: 100
   });
 
   this.ps = new ParticleSystem({
-    color: {r:117, g: 68, b: 67},
+    color: {r: 117, g: 68, b: 67},
     blend_mode: 'source-over',
     gravity: {x: 0, y: 0},
     explode_random: {x: 0.5, y: 0.5},
@@ -27,41 +27,35 @@ function Enemy(x, y, enemyType, scaling) {
   this.maxHP = enemyType.hp + (enemyType.hp * scaling * 100);
   this.hp = this.maxHP;
   this.baseSpeed = enemyType.speed;
-  this.killRadius = 0.0086*GU;
-  this.bounty = Math.round(enemyType.bounty + 200*scaling*enemyType.bounty);
-
+  this.killRadius = 0.0086 * GU;
+  this.bounty = Math.round(enemyType.bounty + 200 * scaling * enemyType.bounty);
   this.effects = [];
-  //Example of how to add enemy
-  //TODO: Remove me
-  //this.addEffect(new DotEffect(0.3));
-
-
   this.width = 40;
   this.height = 40;
   this.animation_ticker = 0;
   this.radius = 0.5;
-}
+};
 
-Enemy.prototype.render = function(ctx){
+Enemy.prototype.render = function(ctx) {
 
   ctx.save();
   this.renderEffects(ctx);
-  var sprite = this.sprites.walking[this.animation_ticker|0];
-  if(this.dead){
+  var sprite = this.sprites.walking[this.animation_ticker | 0];
+  if (this.dead) {
     sprite = this.sprites.dead[0];
-    if(this.dead_time < 20){
+    if (this.dead_time < 20) {
       ctx.globalAlpha = this.dead_time / 20;
     }
   }
-  var scaler = sprite.width * GU * 0.000015 * 0.3;
+  var scaler = sprite.width * GU * 0.000018;
   ctx.translate(this.x * GU, this.y * GU);
-  if(this.x > CENTER.x){
+  if (this.x > CENTER.x) {
     ctx.scale(-scaler, scaler);
-  }else{
+  } else {
     ctx.scale(scaler, scaler);
   }
 
-  if( this.hp > 0  && this.hp != this.maxHP) {
+  if (this.hp > 0 && this.hp != this.maxHP) {
     var rightSide = 1;
     if (this.x > CENTER.x) {
       rightSide = -1;
@@ -69,40 +63,40 @@ Enemy.prototype.render = function(ctx){
 
     ctx.fillStyle = 'rgb(9, 9, 9)';
     ctx.beginPath();
-    ctx.rect(rightSide * (-sprite.width * 0.0068*GU), -sprite.height*0.007955*GU,
-        rightSide * (sprite.width + 0.09*GU), 20);
+    ctx.rect(rightSide * (-sprite.width * 0.0068 * GU), -sprite.height * 0.007955 * GU,
+      rightSide * (sprite.width + 0.09 * GU), 20);
     ctx.closePath();
     ctx.fill();
 
-    var percent = this.hp/this.maxHP;
+    var percent = this.hp / this.maxHP;
     ctx.beginPath();
     ctx.fillStyle = 'rgb(1, 233, 61)';
     ctx.lineWidth = 0;
-    ctx.rect(rightSide * (-sprite.width * 0.0068*GU), -sprite.height*0.007955*GU,
-        rightSide * (sprite.width + 0.09*GU)*percent, 20);
+    ctx.rect(rightSide * (-sprite.width * 0.0068 * GU), -sprite.height * 0.007955 * GU,
+      rightSide * (sprite.width + 0.09 * GU) * percent, 20);
     ctx.closePath();
     ctx.fill();
   }
 
   ctx.rotate((CENTER.y - this.y) / 8);
 
-  ctx.drawImage(sprite, -sprite.width / 2, - sprite.height / 2);
+  ctx.drawImage(sprite, -sprite.width / 2, -sprite.height / 2);
 
   ctx.restore();
   this.ps.render(ctx);
   this.small_ps.render(ctx);
-}
+};
 
-Enemy.prototype.update = function(t){
+Enemy.prototype.update = function(t) {
   this.speed = this.baseSpeed;
   this.effectsUpdate(t);
 
   this.ps.update();
   this.small_ps.update();
 
-  if(this.dead){
+  if (this.dead) {
     this.dead_time && this.dead_time--;
-    if(!this.dead_time){
+    if (!this.dead_time) {
       var index = sm.states.game.enemies.enemies.indexOf(this);
       sm.states.game.enemies.enemies.splice(index, 1);
       sm.states.game.cash.add(this.bounty);
@@ -120,8 +114,8 @@ Enemy.prototype.update = function(t){
   }
 
   //Scale it to 1 amd multiply with speed
-  movex = this.speed * movex/len;
-  movey = this.speed * movey/len;
+  movex = this.speed * movex / len;
+  movey = this.speed * movey / len;
   //Multiply with speed
 
   this.x += movex;
@@ -132,47 +126,49 @@ Enemy.prototype.update = function(t){
   }
 
   this.animation_ticker += 0.2;
-  while(this.animation_ticker >= this.sprites.walking.length){
+  while (this.animation_ticker >= this.sprites.walking.length) {
     this.animation_ticker -= this.sprites.walking.length;
   }
 
   return true;
-}
+};
 
-Enemy.prototype.renderEffects = function(ctx){
-  for(var i = 0; i < this.effects.length; i++){
+Enemy.prototype.renderEffects = function(ctx) {
+  for (var i = 0; i < this.effects.length; i++) {
     this.effects[i].render(ctx, this);
   }
-}
+};
 
-Enemy.prototype.hit = function (damage) {
-  if(!this.dead){
-    this.hp -= damage;
-    this.small_ps.explode(this.x, this.y, 5);
+Enemy.prototype.hit = function(damage) {
+  if (!this.dead) {
+    if (damage > 0) {
+      this.hp -= damage;
+      this.small_ps.explode(this.x, this.y, 3);
+    }
   }
-}
+};
 
-Enemy.prototype.kill = function () {
+Enemy.prototype.kill = function() {
   this.dead = true;
   this.dead_time = 100;
   this.ps.explode(this.x, this.y, 35);
   sm.states.game.spawnMoneyEffect({x: this.x, y: this.y - 1, amount: this.bounty});
   sm.states.game.stats.addKill();
-  var sound_number = (Math.random()*4|0) + 1;
-  createjs.Sound.play('res/kill-'+sound_number+'.mp3|res/kill-'+sound_number+'.ogg');
-}
+  var sound_number = (Math.random() * 4 | 0) + 1;
+  createjs.Sound.play('res/kill-' + sound_number + '.mp3|res/kill-' + sound_number + '.ogg');
+};
 
-Enemy.prototype.effectsUpdate = function(t){
-  for(var i = 0; i < this.effects.length; i++){
-    this.effects[i].update(this,t);
+Enemy.prototype.effectsUpdate = function(t) {
+  for (var i = 0; i < this.effects.length; i++) {
+    this.effects[i].update(this, t);
   }
-}
+};
 
 /** If the enemy has an effect of the same type, it replaces that effect.
  If not it adds the effect to the enemy. */
-Enemy.prototype.addEffect = function(effect){
-  for(var i = 0; i < this.effects.length; i++){
-    if(this.effects[i] instanceof effect.constructor){
+Enemy.prototype.addEffect = function(effect) {
+  for (var i = 0; i < this.effects.length; i++) {
+    if (this.effects[i] instanceof effect.constructor) {
       this.effects[i].onReapply(this, effect);
       return;
     }
@@ -180,18 +176,18 @@ Enemy.prototype.addEffect = function(effect){
 
   this.effects.push(effect);
   effect.onApply(this);
-}
+};
 
 Enemy.prototype.getDistanceToCenter = function() {
   var movex = CENTER.x - this.x;
   var movey = CENTER.y - this.y;
-  return Math.sqrt(movex*movex + movey*movey);
-}
+  return Math.sqrt(movex * movex + movey * movey);
+};
 
 //Removes a debuff of the same type as effect
-Enemy.prototype.removeEffect = function(effect){
-  for(var i = 0; i < this.effects.length; i++){
-    if(this.effects[i] instanceof effect.constructor){
+Enemy.prototype.removeEffect = function(effect) {
+  for (var i = 0; i < this.effects.length; i++) {
+    if (this.effects[i] instanceof effect.constructor) {
       this.effects[i].onRemove();
 
       //Swap with last element and remove it.
@@ -200,30 +196,30 @@ Enemy.prototype.removeEffect = function(effect){
       return;
     }
   }
-}
+};
 
 /** That factory **/
-Enemy.spawnRandom = function(enemyType, scaling){
-  var side = Math.floor(Math.random()*4);
+Enemy.spawnRandom = function(enemyType, scaling) {
+  var side = Math.floor(Math.random() * 4);
   var x = 0;
   var y = 0;
-  switch(side){
-  case 0:
-    x = 0;
-    y = Math.random()*9;
-    break;
-  case 1:
-    x = Math.random()*15;
-    y = 0;
-    break;
-  case 2:
-    x = 16;
-    y = Math.random()*9;
-    break;
-  case 3:
-    x = Math.random()*15;
-    y = 9;
-    break;
+  switch (side) {
+    case 0:
+      x = -0.5;
+      y = Math.random() * 9;
+      break;
+    case 1:
+      x = Math.random() * 15;
+      y = -0.5;
+      break;
+    case 2:
+      x = 16.5;
+      y = Math.random() * 9;
+      break;
+    case 3:
+      x = Math.random() * 15;
+      y = 9.5;
+      break;
   }
-  return new Enemy(x,y,enemyType, scaling);
-}
+  return new Enemy(x, y, enemyType, scaling);
+};
diff --git a/src/EnemyController.js b/src/EnemyController.js
index 79f26e3..8f22859 100644
--- a/src/EnemyController.js
+++ b/src/EnemyController.js
@@ -5,10 +5,10 @@ function EnemyController(game) {
   this.game = game;
   this.enemies = [];
   this.WAVES = WAVES.slice();
-}
+};
 
-EnemyController.prototype.nextWave = function(t, cb){
-  this.waveStartTime = t*20;
+EnemyController.prototype.nextWave = function(t, cb) {
+  this.waveStartTime = t * 20;
   this.numberOfWaves++;
   this.cb = cb;
   if (this.WAVES.length > 0) {
@@ -16,9 +16,9 @@ EnemyController.prototype.nextWave = function(t, cb){
   } else {
     this.currentWave = {
       monsters: Object.keys(this.enemyTypes),
-      numberOfMonsters: this.numberOfWaves*3,
-      scaling: this.numberOfWaves/400,
-      duration: 10000 + 4500*this.numberOfWaves
+      numberOfMonsters: this.numberOfWaves * 3,
+      scaling: this.numberOfWaves / 400,
+      duration: 10000 + 4500 * this.numberOfWaves
     };
   }
   this.currentWave.interval = this.currentWave.duration / this.currentWave.numberOfMonsters;
@@ -27,9 +27,9 @@ EnemyController.prototype.nextWave = function(t, cb){
 };
 
 
-EnemyController.prototype.update = function(t){
+EnemyController.prototype.update = function(t) {
   if (this.currentWave !== undefined) {
-    var waveTime = t*20-this.waveStartTime;
+    var waveTime = t * 20 - this.waveStartTime;
     this.timeLeftOfWave -= 20;
     if (this.timeLeftOfWave == 0) {
       if (this.enemies.length > 0) {
@@ -41,7 +41,7 @@ EnemyController.prototype.update = function(t){
         this.cb();
       }
     } else {
-      if (waveTime > this.currentWave.numberOfMonstersSpawned*this.currentWave.interval) {
+      if (waveTime > this.currentWave.numberOfMonstersSpawned * this.currentWave.interval) {
         this.currentWave.numberOfMonstersSpawned++;
         this.enemies.push(Enemy.spawnRandom(
           this.generateEnemyType(this.currentWave.monsters), this.currentWave.scaling
@@ -50,7 +50,7 @@ EnemyController.prototype.update = function(t){
     }
   }
 
-  for (var i=0;i<this.enemies.length;i++){
+  for (var i = 0; i < this.enemies.length; i++) {
     var enemy = this.enemies[i];
     if (!enemy.update()) {
       this.enemies[i] = this.enemies[this.enemies.length - 1];
@@ -64,7 +64,7 @@ EnemyController.prototype.update = function(t){
 };
 
 EnemyController.prototype.render = function(ctx) {
-  for (var i=0;i<this.enemies.length;i++){
+  for (var i = 0; i < this.enemies.length; i++) {
     var enemy = this.enemies[i];
     enemy.render(ctx);
   }
@@ -72,15 +72,15 @@ EnemyController.prototype.render = function(ctx) {
 
 
 EnemyController.prototype.generateEnemyType = function(enemyTypes) {
-  var enemyId = enemyTypes[Math.floor(Math.random()*enemyTypes.length)];
+  var enemyId = enemyTypes[Math.floor(Math.random() * enemyTypes.length)];
   return this.enemyTypes[enemyId];
-}
+};
 
 EnemyController.prototype.slowDownWithinRadius = function(radius, speedFactor, tickDuration) {
-  for (var i=0;i<this.enemies.length;i++){
+  for (var i = 0; i < this.enemies.length; i++) {
     var enemy = this.enemies[i];
-      if (enemy.getDistanceToCenter() < radius) {
-        enemy.addEffect(new SpeedEffect(speedFactor, tickDuration));
-      }
+    if (enemy.getDistanceToCenter() < radius) {
+      enemy.addEffect(new SpeedEffect(speedFactor, tickDuration));
+    }
   }
-}
+};
diff --git a/src/EnemyTypes.js b/src/EnemyTypes.js
index c6b891c..547e83b 100644
--- a/src/EnemyTypes.js
+++ b/src/EnemyTypes.js
@@ -1,53 +1,45 @@
 /*
-enemies has the following object form:
-name: {
-    sprites: {
-        walking: (function () {})()
-      , dead: [loadIMAGE]
-    }
-  , bounty: NUMBER
-  , hp: NUMBER
-  , speed: NUMBER
-}
-the numbers are the base stats, and will be scaled automagically
-*/
-var ENEMYTYPES = function () {
+ enemies has the following object form:
+ name: {
+   sprites: {
+     walking: (function () {
+     })(), dead: [loadIMAGE]
+   }, bounty: NUMBER, hp: NUMBER, speed: NUMBER
+ }
+ the numbers are the base stats, and will be scaled automagically
+ */
+var ENEMYTYPES = function() {
   return {
     dog: {
-        sprites: {
-            walking: ( function () {
-              var frames = [];
-              for(var i=1;i<=8;i++){
-                frames.push(loadImage('res/dog/dog-walking-' + i + '.png'));
-              } return frames;
-            })()
-          , dead: [loadImage('res/dog/dog-dead-1.png')]
-        }
-      , bounty: 8
-      , hp: 5
-      , speed: 0.08
+      sprites: {
+        walking: (function() {
+          var frames = [];
+          for (var i = 1; i <= 8; i++) {
+            frames.push(loadImage('res/dog/dog-walking-' + i + '.png'));
+          }
+          return frames;
+        })(), dead: [loadImage('res/dog/dog-dead-1.png')]
+      }, bounty: 8, hp: 5, speed: 0.08
     },
     bear: {
-        sprites: {
-            walking: (function(){
-              var frames = [];
-              for(var i=1;i<=4;i++){
-                frames.push(loadImage('res/pinkbear/pinkbear-walking-' + i + '.png'));
-              } return frames;
-            })()
-          , dead: [loadImage('res/pinkbear/pinkbear-dead-1.png')]
-        }
-      , bounty: 15
-      , hp: 18
-      , speed: 0.015
+      sprites: {
+        walking: (function() {
+          var frames = [];
+          for (var i = 1; i <= 4; i++) {
+            frames.push(loadImage('res/pinkbear/pinkbear-walking-' + i + '.png'));
+          }
+          return frames;
+        })(), dead: [loadImage('res/pinkbear/pinkbear-dead-1.png')]
+      }, bounty: 15, hp: 18, speed: 0.015
     },
     elephant: {
       sprites: {
-        walking: (function(){
+        walking: (function() {
           var frames = [];
-          for(var i=1;i<=6;i++){
-              frames.push(loadImage('res/elephant/elephant-walking-' + i + '.png'));
-          } return frames;
+          for (var i = 1; i <= 6; i++) {
+            frames.push(loadImage('res/elephant/elephant-walking-' + i + '.png'));
+          }
+          return frames;
         })(),
         dead: [loadImage('res/elephant/elephant-dead-1.png')]
       },
diff --git a/src/ExampleState.js b/src/ExampleState.js
index b803c57..d0b4e82 100644
--- a/src/ExampleState.js
+++ b/src/ExampleState.js
@@ -1,22 +1,22 @@
 // Copy this file, rename to name of state and add to StateManager
-function ExampleState(){
-}
+function ExampleState() {
+};
 
-ExampleState.prototype.init = function(){
-    this.elements = [];
-    this.t = 0;
-}
+ExampleState.prototype.init = function() {
+  this.elements = [];
+  this.t = 0;
+};
 
-ExampleState.prototype.pause = function(){
-}
+ExampleState.prototype.pause = function() {
+};
 
-ExampleState.prototype.resume = function(){
+ExampleState.prototype.resume = function() {
 
-}
+};
 
-ExampleState.prototype.render = function(ctx){
-}
+ExampleState.prototype.render = function(ctx) {
+};
 
-ExampleState.prototype.update = function(){
-    this.t++;
-}
+ExampleState.prototype.update = function() {
+  this.t++;
+};
diff --git a/src/GameState.js b/src/GameState.js
index 34b8a7f..b862503 100644
--- a/src/GameState.js
+++ b/src/GameState.js
@@ -1,7 +1,7 @@
-function GameState(){
-}
+function GameState() {
+};
 
-GameState.prototype.init = function(){
+GameState.prototype.init = function() {
 
 
   this.green_laser_beam = loadImage('res/green_laser_beam.png');
@@ -11,25 +11,25 @@ GameState.prototype.init = function(){
   this.bg = loadImage('res/bg.png');
   this.vignette = loadImage('res/vignette.png');
 
-}
+};
 
-GameState.prototype.getPotAmount = function(){
+GameState.prototype.getPotAmount = function() {
   var enemyCont = sm.activeState.enemies;
-  if(enemyCont && enemyCont.numberOfWaves > 1){
-    return 1+Math.floor(1.15^enemyCont.numberOfWaves);
-  }else{
+  if (enemyCont && enemyCont.numberOfWaves > 1) {
+    return 1 + Math.floor(1.15 ^ enemyCont.numberOfWaves);
+  } else {
     return 1;
   }
-}
-GameState.prototype.spawnMoneyEffect = function(options){
-    this.moneyEffects.push(new MoneyEffect(options));
-}
+};
+GameState.prototype.spawnMoneyEffect = function(options) {
+  this.moneyEffects.push(new MoneyEffect(options));
+};
 
 
-GameState.prototype.pause = function(){
-}
+GameState.prototype.pause = function() {
+};
 
-GameState.prototype.resume = function(){
+GameState.prototype.resume = function() {
   /* warmup, should not make sound */
   createjs.Sound.play('res/coin.mp3|res/coin.ogg');
   createjs.Sound.play('res/kill-1.mp3|res/kill-1.ogg');
@@ -41,17 +41,19 @@ GameState.prototype.resume = function(){
 
   var that = this;
   this.elements = [
-    [function(){
-      that.rainbow.ps.explode(CENTER.x, CENTER.y, 8);
+    [function() {
+      var numExplosion = Math.floor((that.rainbow.ps.max_particles - that.rainbow.ps.num_particles) * 0.125);
+      that.rainbow.ps.explode(CENTER.x, CENTER.y, numExplosion);
       that.achievements.give('first');
       createjs.Sound.play('res/coin.mp3|res/coin.ogg');
-      that.spawnMoneyEffect({amount: Math.floor(that.goldPerClick), x: CENTER.x, y: CENTER.y-1});
+      that.spawnMoneyEffect({amount: Math.floor(that.goldPerClick), x: CENTER.x - 0.1, y: CENTER.y - 1});
       that.cash.add(Math.floor(that.goldPerClick));
       that.pot.click();
-    }, {x:7.5, y:4, w:1, h:1}],
-    [function(){
+      that.stats.addClick();
+    }, {x: 7.5, y: 4, w: 1, h: 1}],
+    [function() {
       that.audioButton.toggleActivated();
-    }, {x:15, y:0, w:1, h:1}]
+    }, {x: 15, y: 0, w: 1, h: 1}]
   ];
 
   this.moneyEffects = [];
@@ -73,7 +75,7 @@ GameState.prototype.resume = function(){
   this.specialWeaponController = new SpecialWeaponController();
 
   var cookieSet = getCookie("cuteanimals_stats");
-  if(cookieSet === undefined) {
+  if (cookieSet === undefined) {
     var emptyStats = JSON.parse('{"achievements":[], "kills":0, "music":true, "all_time_kills":0}');
     setCookie("cuteanimals_stats", JSON.stringify(emptyStats));
   } else {
@@ -95,23 +97,23 @@ GameState.prototype.resume = function(){
   this.achievements.give('welcome');
   this.cash.setupView();
   this.pot.setupView();
-}
+};
 
-GameState.prototype.render = function(ctx){
+GameState.prototype.render = function(ctx) {
   ctx.save();
-  var scaler = 16*GU/this.bg.width + 1 + 0.01*Math.sin(t/125);
-  ctx.translate(16*GU/2, 9*GU/2);
+  var scaler = 16 * GU / this.bg.width + 1 + 0.01 * Math.sin(t / 125);
+  ctx.translate(16 * GU / 2, 9 * GU / 2);
   ctx.scale(scaler, scaler);
-  ctx.translate(-this.bg.width/2, -this.bg.height/2);
+  ctx.translate(-this.bg.width / 2, -this.bg.height / 2);
   ctx.drawImage(this.bg, 0, 0);
   ctx.restore();
+
   ctx.save();
-  scaler = 16*GU/this.vignette.width;
+  scaler = 16 * GU / this.vignette.width;
   ctx.scale(scaler, scaler);
   ctx.drawImage(this.vignette, 0, 0);
   ctx.restore();
   this.rainbow.render();
-  this.audioButton.render();
 
   this.laserController.render();
   this.pot.render();
@@ -119,42 +121,43 @@ GameState.prototype.render = function(ctx){
   this.enemies.render(ctx);
   this.progressCircle.render(ctx);
 
-  for (var i=0;i<this.moneyEffects.length;i++){
+  for (var i = 0; i < this.moneyEffects.length; i++) {
     var moneyEffect = this.moneyEffects[i];
     moneyEffect.render(ctx);
   }
 
+  this.audioButton.render();
   this.specialWeaponController.render();
-}
+};
 
-GameState.prototype.update = function(){
+GameState.prototype.update = function() {
   var that = this;
   this.t++;
 
   if (!this.isGameOver) {
 
-    if (this.timeToWave > 0){
+    if (this.timeToWave > 0) {
       if (null != this.laserController.redLaser) {
         this.timeToWave -= 20;
       }
     } else if (this.enemies.timeLeftOfWave == 0) {
       this.progressCircle.hide();
-      this.enemies.nextWave(this.t, function () {
+      this.enemies.nextWave(this.t, function() {
         that.progressCircle.show();
         that.timeToWave = 5000;
       });
     }
 
     this.enemies.update(this.t);
-    this.progressCircle.update((5000-this.timeToWave)/5000);
+    this.progressCircle.update((5000 - this.timeToWave) / 5000);
 
     this.rainbow.update(t);
     this.laserController.update(this.t);
 
-    for (var i=0;i<this.moneyEffects.length;i++){
+    for (var i = 0; i < this.moneyEffects.length; i++) {
       var moneyEffect = this.moneyEffects[i];
-      if(!moneyEffect.update()){
-        this.moneyEffects[i] = this.moneyEffects[this.moneyEffects.length-1];
+      if (!moneyEffect.update()) {
+        this.moneyEffects[i] = this.moneyEffects[this.moneyEffects.length - 1];
         this.moneyEffects.pop();
       }
     }
@@ -162,7 +165,7 @@ GameState.prototype.update = function(){
     this.pot.update();
     this.specialWeaponController.update();
   }
-}
+};
 
 GameState.prototype.gameOver = function() {
   this.isGameOver = true;
@@ -170,7 +173,7 @@ GameState.prototype.gameOver = function() {
   this.audioButton.pause();
 
   var stats = JSON.parse(getCookie("cuteanimals_stats"));
-  
+
   var gameOver = "<h1>Game over!</h><h2>Kills: <span class=kills>" +
     stats.kills + "</span></h2><h2>All time kills: <span class=kills>" + stats.all_time_kills + "</span></h2><button id=play-again>Play again?</button>";
 
@@ -184,4 +187,4 @@ GameState.prototype.gameOver = function() {
     sm.addState("menu", new MenuState());
     sm.changeState("menu");
   });
-}
+};
diff --git a/src/Laser.js b/src/Laser.js
index f4f0874..0af55e9 100644
--- a/src/Laser.js
+++ b/src/Laser.js
@@ -1,4 +1,4 @@
-function Laser(color, speed, damage, sprite){
+function Laser(color, speed, damage, sprite) {
   this.color = color;
   this.offset = 0;
   this.speed = speed;
@@ -8,12 +8,12 @@ function Laser(color, speed, damage, sprite){
   this.upgrades = [];
   this.endpoints = this.getEndpoints();
   this.sprite = sprite;
-}
+};
 
-Laser.prototype.update = function(t, humanControlled){
+Laser.prototype.update = function(t, humanControlled) {
   if (humanControlled) {
-    var dx = MOUSE.x-CENTER.x;
-    var dy = MOUSE.y-CENTER.y;
+    var dx = MOUSE.x - CENTER.x;
+    var dy = MOUSE.y - CENTER.y;
     this.angle = Math.atan2(dy, dx);
   } else {
     this.angle = (t * this.speed) % 2 * Math.PI;
@@ -21,50 +21,50 @@ Laser.prototype.update = function(t, humanControlled){
   this.angle += this.offset;
   this.hittedEnemies = this.hits();
   this.endpoints = this.getEndpoints();
-}
+};
 
-Laser.prototype.render = function(){
+Laser.prototype.render = function() {
   ctx.save();
-  var scaler = this.sprite.width * GU * 0.00002;
+  var scaler = GU * 0.01024;
   ctx.translate(CENTER.x * GU, CENTER.y * GU);
   ctx.scale(scaler, scaler);
 
   ctx.rotate(this.angle + Math.PI / 2);
   /*
-  var x = -this.sprite.width * scaler / 2;
-  var y = -this.sprite.height * scaler - 1.6*GU;
-  */
+   var x = -this.sprite.width * scaler / 2;
+   var y = -this.sprite.height * scaler - 1.6*GU;
+   */
   var x = -this.sprite.width / 2;
-  var y = -this.sprite.height - 90;
+  var y = -this.sprite.height - 45;
   ctx.drawImage(this.sprite, x, y);
   ctx.restore();
 };
 
 Laser.prototype.getEndpoints = function() {
   return {
-    x: Math.cos(this.angle)*8+8,
-    y: Math.sin(this.angle)*8+4.5
+    x: Math.cos(this.angle) * 8 + 8,
+    y: Math.sin(this.angle) * 8 + 4.5
   };
 };
 
-Laser.prototype.hits = function () {
+Laser.prototype.hits = function() {
   var enemies = sm.states.game.enemies.enemies;
-  for (var i = 0; i < enemies.length; i++){
-    if (distToSegment({x: enemies[i].x, y: enemies[i].y}, CENTER, this.endpoints) < enemies[i].radius){
+  for (var i = 0; i < enemies.length; i++) {
+    if (distToSegment({x: enemies[i].x, y: enemies[i].y}, CENTER, this.endpoints) < enemies[i].radius) {
       this.nextDamage = this.baseDamage;
       this.upgradesOnHit(enemies[i]);
       enemies[i].hit(this.nextDamage);
     }
   }
-}
+};
 
-Laser.prototype.upgradesOnHit = function(enemy){
-  for(var i = 0; i < this.upgrades.length; i++){
+Laser.prototype.upgradesOnHit = function(enemy) {
+  for (var i = 0; i < this.upgrades.length; i++) {
     this.upgrades[i].onEnemyHit(this, enemy);
   }
-}
+};
 
-Laser.prototype.addUpgrade = function(upgrade){
+Laser.prototype.addUpgrade = function(upgrade) {
   this.upgrades.push(upgrade);
   upgrade.onApply(this);
-}
+};
diff --git a/src/LaserController.js b/src/LaserController.js
index 18fb94f..bec3c9b 100644
--- a/src/LaserController.js
+++ b/src/LaserController.js
@@ -7,7 +7,7 @@ function LaserController() {
   this.startingRotation = null;
   this.startingAngle = null;
   var that = this;
-}
+};
 
 LaserController.prototype.addLaser = function(color, dmg) {
   var laser = new Laser(
@@ -19,35 +19,35 @@ LaserController.prototype.addLaser = function(color, dmg) {
       "#ff0000": sm.states.game.red_laser_beam }[color]
   );
   this.lasers.push(laser);
-  switch(color){
-  case Colors.GREEN:
-    this.greenLaser = laser;
-    this.greenLaser.offset = 0.05;
-    break;
-  case Colors.BLUE:
-    this.blueLaser = laser;
-    break;
-  case Colors.RED:
-    this.redLaser = laser;
-    break;
+  switch (color) {
+    case Colors.GREEN:
+      this.greenLaser = laser;
+      this.greenLaser.offset = 0.05;
+      break;
+    case Colors.BLUE:
+      this.blueLaser = laser;
+      break;
+    case Colors.RED:
+      this.redLaser = laser;
+      break;
   }
   return laser;
-}
+};
 
-LaserController.prototype.update = function(t){
-  if(this.redLaser){
-      this.redLaser.update(t, true);
+LaserController.prototype.update = function(t) {
+  if (this.redLaser) {
+    this.redLaser.update(t, true);
   }
-  if(this.greenLaser){
-      this.greenLaser.update(t, true);
+  if (this.greenLaser) {
+    this.greenLaser.update(t, true);
   }
-  if(this.blueLaser){
-      this.blueLaser.update(-t, false);
+  if (this.blueLaser) {
+    this.blueLaser.update(-t, false);
   }
 };
 
-LaserController.prototype.render = function(){
-  for (var i=0;i<this.lasers.length;i++){
+LaserController.prototype.render = function() {
+  for (var i = 0; i < this.lasers.length; i++) {
     var laser = this.lasers[i];
     laser.render();
   }
diff --git a/src/MenuState.js b/src/MenuState.js
index 93d5289..2833c81 100644
--- a/src/MenuState.js
+++ b/src/MenuState.js
@@ -1,7 +1,7 @@
-function MenuState(){
-}
+function MenuState() {
+};
 
-MenuState.prototype.init = function(){
+MenuState.prototype.init = function() {
   this.bg_img = loadImage('res/bg.png');
   this.vignette_img = loadImage('res/vignette.png');
   this.menu_img = loadImage('res/menu.png');
@@ -11,19 +11,19 @@ MenuState.prototype.init = function(){
 
   var that = this;
   this.elements = [
-    [function(){
+    [function() {
       sm.changeState('game');
-    }, {x:0.5, y:1.8, w:16, h:1.5, hover: function(){
+    }, {x: 0.5, y: 1.8, w: 16, h: 1.5, hover: function() {
       that.select(0);
     }}],
-    [function(){
+    [function() {
       sm.changeState('achievements');
-    }, {x:0.5, y:3.3, w:16, h:1.5, hover: function(){
+    }, {x: 0.5, y: 3.3, w: 16, h: 1.5, hover: function() {
       that.select(1);
     }}],
-    [function(){
+    [function() {
       sm.changeState('credits');
-    }, {x:0.5, y:4.8, w:16, h:1.5, hover: function(){
+    }, {x: 0.5, y: 4.8, w: 16, h: 1.5, hover: function() {
       that.select(2);
     }}]
   ];
@@ -34,91 +34,92 @@ MenuState.prototype.init = function(){
   this.start_y = this.y_values[0];
   this.end_y = this.y_values[0];
   this.selected = 0;
-}
+};
 
-MenuState.prototype.setY = function(y){ 
+MenuState.prototype.setY = function(y) {
   this.start_y = this.y;
   this.end_y = y;
   this.y_time = 0;
-}
+};
 
-MenuState.prototype.select = function(selected){
-  if(this.selected == selected) {
+MenuState.prototype.select = function(selected) {
+  if (this.selected == selected) {
     return;
   }
   this.selected = selected;
   this.setY(this.y_values[this.selected]);
-}
-
-MenuState.prototype.pause = function(){
-    document.removeEventListener('keypress', this.fullscreenHandler);
-}
-
-MenuState.prototype.resume = function(){
-    var that = this;
-  this.fullscreenHandler = document.addEventListener('keypress', function(e){
-      if(e.keyCode == 13 && that.selected == 0){
-        document.body.requestFullscreen && document.body.requestFullscreen();
-        document.body.webkitRequestFullscreen && document.body.webkitRequestFullscreen(); 
-        document.body.mozRequestFullscreen && document.body.mozRequestFullScreen();
-      }
+};
+
+MenuState.prototype.pause = function() {
+  document.removeEventListener('keypress', this.fullscreenHandler);
+};
+
+MenuState.prototype.resume = function() {
+  var that = this;
+  this.fullscreenHandler = document.addEventListener('keypress', function(e) {
+    if (e.keyCode == 13 && that.selected == 0) {
+      document.body.requestFullscreen && document.body.requestFullscreen();
+      document.body.webkitRequestFullscreen && document.body.webkitRequestFullscreen();
+      document.body.mozRequestFullscreen && document.body.mozRequestFullScreen();
+    }
   });
-}
+};
 
-MenuState.prototype.render = function(ctx){
+MenuState.prototype.render = function(ctx) {
 
   ctx.save();
-  var scaler = 16*GU/this.bg_img.width + 1 + 0.01*Math.sin(t/125);
-  ctx.translate(16*GU/2, 9*GU/2);
+  var scaler = 16 * GU / this.bg_img.width + 1 + 0.01 * Math.sin(t / 125);
+  ctx.translate(16 * GU / 2, 9 * GU / 2);
   ctx.scale(scaler, scaler);
-  ctx.translate(-this.bg_img.width/2, -this.bg_img.height/2);
+  ctx.translate(-this.bg_img.width / 2, -this.bg_img.height / 2);
   ctx.drawImage(this.bg_img, 0, 0);
   ctx.restore();
-  ctx.save();
 
-  scaler = 16*GU/this.vignette_img.width;
+  ctx.save();
+  scaler = 16 * GU / this.vignette_img.width;
   ctx.scale(scaler, scaler);
   ctx.drawImage(this.vignette_img, 0, 0);
   ctx.restore();
+
   ctx.save();
-  var scaler = 16*GU/this.bg_title_img.width;
+  scaler = 16 * GU / this.bg_title_img.width;
   ctx.scale(scaler, scaler);
   ctx.drawImage(this.bg_title_img, 0, 0);
   ctx.restore();
 
   ctx.fillStyle = '#8742d1';
-  ctx.fillRect(0, this.y*GU, 16*GU, GU);
+  ctx.fillRect(0, this.y * GU, 16 * GU, GU);
 
   ctx.save();
-  var scaler = 16*GU/this.bg_img.width;
+  scaler = 16 * GU / this.bg_img.width;
   ctx.scale(scaler, scaler);
   ctx.drawImage(this.menu_img, 0, 0);
   ctx.restore();
-}
+};
 
-MenuState.prototype.update = function(){
+MenuState.prototype.update = function() {
   this.key_cooldown && this.key_cooldown--;
   this.y_time += 0.12;
-  if(this.y_time < 1){
+  if (this.y_time < 1) {
     this.y = smoothstep(this.start_y, this.end_y, this.y_time);
-  }else if (this.y_time > 1){
+  } else if (this.y_time > 1) {
     this.y_time = 1;
     this.y = this.end_y;
   }
 
 
-  if(!this.key_cooldown){
-    if(KEYS[40]){ /* key down */
+  if (!this.key_cooldown) {
+    if (KEYS[40]) { /* key down */
       this.selected + 1 < this.y_values.length && this.select(this.selected + 1);
       this.key_cooldown = 10;
     }
-    if(KEYS[38]){ /* key up */
+    if (KEYS[38]) { /* key up */
       this.selected - 1 >= 0 && this.select(this.selected - 1);
       this.key_cooldown = 10;
     }
-    if(KEYS[13]){ /* key enter */
+    if (KEYS[13]) { /* key enter */
       this.key_cooldown = 10;
-      sm.changeState(['game', 'game', 'credits'][this.selected]);
+      sm.changeState(['game', 'achievements', 'credits'][this.selected]);
     }
   }
-}
+};
diff --git a/src/MoneyEffect.js b/src/MoneyEffect.js
index c36558b..1375232 100644
--- a/src/MoneyEffect.js
+++ b/src/MoneyEffect.js
@@ -1,33 +1,33 @@
-function MoneyEffect(options){
-    this.x = options.x + Math.random() * 0.2;
-    this.y = options.y + Math.random() * 0.2;
-    this.amount = options.amount;
-    this.time_left = MoneyEffect.MAX_TIME_LEFT;
-}
+function MoneyEffect(options) {
+  this.x = options.x + Math.random() * 0.2;
+  this.y = options.y + Math.random() * 0.2;
+  this.amount = options.amount;
+  this.time_left = MoneyEffect.MAX_TIME_LEFT;
+};
 
 MoneyEffect.MAX_TIME_LEFT = 60;
 
 
-MoneyEffect.prototype.render = function(ctx){
-    var ratio = this.time_left/MoneyEffect.MAX_TIME_LEFT;
-    ctx.fillStyle = 'rgba(140,120,20,' + (ratio) + ')';
-    ctx.font = 'normal ' + (50 - ratio*40) + 'pt blackoutmidnight';
-    ctx.textAlign = 'center';
-    ctx.fillText(
-        (this.amount > 0 ? '+' : '') + this.amount,
-        (this.x+0.02)*GU,
-        (ratio*0.2 + this.y + 0.02)*GU
-    );
-    ctx.fillStyle = 'rgba(240,228,40,' + (ratio) + ')';
-    ctx.fillText(
-        (this.amount > 0 ? '+' : '') + this.amount,
-        this.x*GU,
-        (ratio*0.2 + this.y)*GU
-    );
-}
+MoneyEffect.prototype.render = function(ctx) {
+  var ratio = this.time_left / MoneyEffect.MAX_TIME_LEFT;
+  ctx.fillStyle = 'rgba(140,120,20,' + (ratio) + ')';
+  ctx.font = 'normal ' + (50 - ratio * 40) + 'pt blackoutmidnight';
+  ctx.textAlign = 'center';
+  ctx.fillText(
+    (this.amount > 0 ? '+' : '') + this.amount,
+    (this.x + 0.02) * GU,
+    (ratio * 0.2 + this.y + 0.02) * GU
+  );
+  ctx.fillStyle = 'rgba(240,228,40,' + (ratio) + ')';
+  ctx.fillText(
+    (this.amount > 0 ? '+' : '') + this.amount,
+    this.x * GU,
+    (ratio * 0.2 + this.y) * GU
+  );
+};
 
 
-MoneyEffect.prototype.update = function(){
-    return this.time_left--;
-}
+MoneyEffect.prototype.update = function() {
+  return this.time_left--;
+};
 
diff --git a/src/ParticleSystem.js b/src/ParticleSystem.js
index 01fb42d..2e1a50c 100644
--- a/src/ParticleSystem.js
+++ b/src/ParticleSystem.js
@@ -1,26 +1,25 @@
-
-function ParticleSystem(options){
+function ParticleSystem(options) {
   options = options || {};
   this.num_particles = 0;
   this.particles = [];
-  this.max_particles = 256;
-  this.color = options.color || {r:32,g:32,b:32};
+  this.max_particles = options.max_particles || 256;
+  this.color = options.color || {r: 32, g: 32, b: 32};
   this.blend_mode = options.blend_mode || 'lighter';
-  this.gravity = options.gravity || {x:0, y: 0.05};
+  this.gravity = options.gravity || {x: 0, y: 0.05};
   this.explode_random = options.explode_random || {x: 0.08, y: 0.03};
   this.size = options.size || 0.12;
   this.friction = options.friction || 0.95;
   this.T = options.life || 100;
-  for(var i=0;i<this.max_particles;i++){
-    this.particles[i] = {x:0,y:0,dx:0,dy:0,t:0};
+  for (var i = 0; i < this.max_particles; i++) {
+    this.particles[i] = {x: 0, y: 0, dx: 0, dy: 0, t: 0};
   }
-}
+};
 
 
-ParticleSystem.prototype.update = function(){
-  for(var i=0;i<this.num_particles;i++){
+ParticleSystem.prototype.update = function() {
+  for (var i = 0; i < this.num_particles; i++) {
     var p = this.particles[i];
-    if(p.t <= 0){
+    if (p.t <= 0 || p.y < -this.size) {
       this.num_particles--;
       var q = this.particles[this.num_particles];
       p.x = q.x;
@@ -28,7 +27,7 @@ ParticleSystem.prototype.update = function(){
       p.dx = q.dx;
       p.dy = q.dy;
       p.t = q.t;
-    }else{
+    } else {
       p.x += p.dx - this.gravity.x;
       p.y += p.dy - this.gravity.y;
       p.dx *= this.friction;
@@ -36,29 +35,29 @@ ParticleSystem.prototype.update = function(){
       p.t--;
     }
   }
-}
+};
 
-ParticleSystem.prototype.render = function(ctx){
+ParticleSystem.prototype.render = function(ctx) {
   ctx.save();
   ctx.globalCompositeOperation = this.blend_mode;
-  for(var i=0;i<this.num_particles;i++){
+  for (var i = 0; i < this.num_particles; i++) {
     var p = this.particles[i];
-    ctx.fillStyle = "rgba("+this.color.r+","+this.color.g+","+this.color.b+","+Math.min(1,p.t/20)+")";
-    ctx.fillRect(p.x*GU,p.y*GU,GU*this.size,GU*this.size);
+    ctx.fillStyle = "rgba(" + this.color.r + "," + this.color.g + "," + this.color.b + "," + Math.min(1, p.t / 20) + ")";
+    ctx.fillRect(p.x * GU, p.y * GU, GU * this.size, GU * this.size);
   }
   ctx.restore();
-}
+};
 
 
-ParticleSystem.prototype.explode = function(x,y, num){
-  for(var i=0;i<num;i++){
-    if(this.num_particles>=this.max_particles-1) return;
+ParticleSystem.prototype.explode = function(x, y, num) {
+  for (var i = 0; i < num; i++) {
+    if (this.num_particles >= this.max_particles - 1) return;
     this.num_particles++;
     var p = this.particles[this.num_particles];
     p.x = x;
     p.y = y;
-    p.dx = this.explode_random.x*(0.5-Math.random());
-    p.dy = this.explode_random.y*(0.5-Math.random());
+    p.dx = this.explode_random.x * (0.5 - Math.random());
+    p.dy = this.explode_random.y * (0.5 - Math.random());
     p.t = this.T;
   }
-}
+};
diff --git a/src/Pot.js b/src/Pot.js
index f215ee9..ac93ce5 100644
--- a/src/Pot.js
+++ b/src/Pot.js
@@ -10,38 +10,38 @@ function Pot(hp) {
   this.clickScaler = 1;
 
   this.hp = hp;
-}
+};
 
-Pot.prototype.setupView = function(){
+Pot.prototype.setupView = function() {
   this.$health = $('.health').clone().removeClass('template');
   this.$health.children().eq(1).html(this.hp);
 
   $('#wrapper').append(this.$health);
-}
+};
 
 Pot.prototype.render = function() {
   ctx.save();
-  var scaler = this.sprite.width * GU * 0.000005 * this.clickScaler;
+  var scaler = this.sprite.width * GU * 0.00002 * this.clickScaler;
   ctx.translate(this.position.x * GU, this.position.y * GU);
   ctx.scale(scaler, scaler);
   ctx.drawImage(this.sprite, -this.sprite.width / 2, -this.sprite.height / 2);
   ctx.restore();
-}
+};
 
-Pot.prototype.update = function(){
+Pot.prototype.update = function() {
   this.clickScaler += 0.1 * (1 - this.clickScaler);
-}
+};
 
 Pot.prototype.click = function() {
   this.clickScaler = 0.8;
-}
+};
 
 Pot.prototype.lostLife = function() {
   this.hp--;
 
   this.$health.children().eq(1).html(this.hp);
 
-  if(this.hp < 20){
+  if (this.hp < 20) {
     this.$health.show();
   }
   if (this.hp < 1) {
@@ -49,4 +49,4 @@ Pot.prototype.lostLife = function() {
   }
 
   return true;
-}
+};
diff --git a/src/ProgressCircle.js b/src/ProgressCircle.js
index 2d5f0b1..d57cb39 100644
--- a/src/ProgressCircle.js
+++ b/src/ProgressCircle.js
@@ -2,12 +2,12 @@ function ProgressCircle(x, y, radius) {
   this.final_x = this.x = x;
   this.final_y = this.y = y;
   this.final_radius = this.radius = radius;
-}
+};
 
 ProgressCircle.prototype.update = function(progress) {
-  this.progress = Math.min(1,Math.max(0,progress));
-  this.progressAngle = (2*Math.PI)*this.progress - Math.PI/2;
-  
+  this.progress = Math.min(1, Math.max(0, progress));
+  this.progressAngle = (2 * Math.PI) * this.progress - Math.PI / 2;
+
 };
 
 ProgressCircle.prototype.render = function(ctx) {
@@ -18,15 +18,15 @@ ProgressCircle.prototype.render = function(ctx) {
   ctx.save();
   ctx.beginPath();
   ctx.arc(
-    this.x*GU,
-    this.y*GU,
-    this.radius*GU,
-    -Math.PI/2,
+    this.x * GU,
+    this.y * GU,
+    this.radius * GU,
+    -Math.PI / 2,
     this.progressAngle,
     false
   );
   ctx.strokeStyle = "white";
-  ctx.lineWidth = .06*GU;
+  ctx.lineWidth = .06 * GU;
   ctx.stroke();
   ctx.closePath();
   ctx.restore();
diff --git a/src/Rainbow.js b/src/Rainbow.js
index 9765be9..3a3ce86 100644
--- a/src/Rainbow.js
+++ b/src/Rainbow.js
@@ -4,27 +4,27 @@ function Rainbow() {
     y: CENTER.y
   };
 
-  this.ps = new ParticleSystem();
+  this.ps = new ParticleSystem({max_particles: 64});
   this.ps_timer = this.psTimerInterval;
-}
+};
 
 Rainbow.prototype.psTimerInterval = 12;
 
 Rainbow.prototype.render = function() {
   ctx.save();
-  var scaler = this.sprite.width * GU * 0.000005;
+  var scaler = this.sprite.width * GU * 0.00002;
   ctx.translate(this.position.x * GU, this.position.y * GU);
-  ctx.scale(scaler, scaler*2);
+  ctx.scale(scaler, scaler * 2);
   ctx.drawImage(this.sprite, -this.sprite.width / 2, -this.sprite.height);
   ctx.restore();
   this.ps.render(ctx);
-}
+};
 
-Rainbow.prototype.update = function(){
+Rainbow.prototype.update = function() {
   this.ps.update();
   this.ps_timer--;
-  if(!this.ps_timer){
-        this.ps_timer = this.psTimerInterval;
-        this.ps.explode(CENTER.x, CENTER.y, 2);
+  if (!this.ps_timer) {
+    this.ps_timer = this.psTimerInterval;
+    this.ps.explode(CENTER.x, CENTER.y, 2);
   }
-}
+};
diff --git a/src/SpecialWeapon.js b/src/SpecialWeapon.js
index 089619b..c1e03de 100644
--- a/src/SpecialWeapon.js
+++ b/src/SpecialWeapon.js
@@ -20,7 +20,7 @@ function SpecialWeapon(type, image, factor, duration) {
   this.active = false;
   this.loading = false;
   this.reset();
-}
+};
 
 SpecialWeapon.prototype.reset = function() {
   this.radius = 0.5;
@@ -36,9 +36,9 @@ SpecialWeapon.prototype.render = function() {
   ctx.globalAlpha = this.getTransparency();
   ctx.drawImage(this.sprite, -this.sprite.width / 2, -this.sprite.height / 2);
   ctx.restore();
-}
+};
 
-SpecialWeapon.prototype.update = function(){
+SpecialWeapon.prototype.update = function() {
   this.radius += 0.2;
 
   if (this.impactInterval-- === 0) {
@@ -50,9 +50,9 @@ SpecialWeapon.prototype.update = function(){
     }
   }
   return this.radius < SpecialWeapon.maxRadius;
-}
+};
 
 SpecialWeapon.prototype.getTransparency = function() {
   var t = this.radius / SpecialWeapon.maxRadius;
   return 1 - t * t;
-}
+};
diff --git a/src/SpecialWeaponController.js b/src/SpecialWeaponController.js
index 7ae50ad..d73dc59 100644
--- a/src/SpecialWeaponController.js
+++ b/src/SpecialWeaponController.js
@@ -1,26 +1,26 @@
-function SpecialWeaponController(){
+function SpecialWeaponController() {
   this.weapons = [];
   this.cooldown = [];
   var that = this;
 
   var source = $("#weapons-list-template").html();
   this.template = Handlebars.compile(source);
-  this.weapons_container = $('.weapons.template').clone()
+  this.$weapons_container = $('.weapons.template').clone()
     .removeClass('template');
-  $('#wrapper').append(this.weapons_container);
-  $("body").on("click touchstart", ".weapon-image", function(){
+  $('#wrapper').append(this.$weapons_container);
+  $("body").on("click touchstart", ".weapon-image", function() {
     var weapon = $(this).parent('.weapon');
     that.activate(weapon, weapon.data('id'));
   });
-}
+};
 
-SpecialWeaponController.prototype.add = function(weapon){
+SpecialWeaponController.prototype.add = function(weapon) {
   this.weapons.push(weapon);
   this.renderList();
 };
 
-SpecialWeaponController.prototype.update = function(){
-  for (var i=0;i<this.weapons.length;i++) {
+SpecialWeaponController.prototype.update = function() {
+  for (var i = 0; i < this.weapons.length; i++) {
     var weapon = this.weapons[i];
     if (weapon.active) {
       if (!weapon.update()) {
@@ -30,22 +30,22 @@ SpecialWeaponController.prototype.update = function(){
     }
   }
   if (KEYS[49] && this.weapons[0]) {
-    var weapon = $('.weapons').find("[data-id='"+0+"']");
+    var weapon = $('.weapons').find("[data-id='" + 0 + "']");
     this.activate(weapon, 0);
   }
   if (KEYS[50] && this.weapons[1]) {
-    var weapon = $('.weapons').find("[data-id='"+1+"']");
+    var weapon = $('.weapons').find("[data-id='" + 1 + "']");
     this.activate(weapon, 1);
   }
   if (KEYS[51] && this.weapons[2]) {
-    var weapon = $('.weapons').find("[data-id='"+2+"']");
+    var weapon = $('.weapons').find("[data-id='" + 2 + "']");
     this.activate(weapon, 2);
   }
 
 };
 
-SpecialWeaponController.prototype.render = function(){
-  for (var i=0;i<this.weapons.length;i++) {
+SpecialWeaponController.prototype.render = function() {
+  for (var i = 0; i < this.weapons.length; i++) {
     var weapon = this.weapons[i];
     if (weapon.active) {
       weapon.render();
@@ -55,7 +55,7 @@ SpecialWeaponController.prototype.render = function(){
 
 
 SpecialWeaponController.prototype.renderList = function() {
-  this.weapons_container.html(this.template({weapons: this.weapons}));
+  this.$weapons_container.html(this.template({weapons: this.weapons})).show();
 };
 
 SpecialWeaponController.prototype.activate = function(weaponDOM, index) {
@@ -66,7 +66,7 @@ SpecialWeaponController.prototype.activate = function(weaponDOM, index) {
   weapon.loading = true;
   weaponDOM.addClass('loading');
   clearTimeout(this.cooldown[index]);
-  this.cooldown[index] = setTimeout(function(){
+  this.cooldown[index] = setTimeout(function() {
     weapon.loading = false;
     weaponDOM.removeClass('loading');
   }, 10000);
diff --git a/src/SpeedEffect.js b/src/SpeedEffect.js
index 021ead2..bf87cbc 100644
--- a/src/SpeedEffect.js
+++ b/src/SpeedEffect.js
@@ -1,88 +1,81 @@
 // Copy this file, rename to name of state and add to StateManager
-function SpeedEffect(maxSpeedFactor, tickDuration, applicationsToMax){
+function SpeedEffect(maxSpeedFactor, tickDuration, applicationsToMax) {
   this.maxSpeedFactor = maxSpeedFactor;
   this.duration = tickDuration;
   this.applications = 1;
   this.applicationsToMax = applicationsToMax;
 
-  if(this.applicationsToMax && this.applicationsToMax > 0){
-    this.speedFactor = maxSpeedFactor * 1/applicationsToMax;
-  }else{
+  if (this.applicationsToMax && this.applicationsToMax > 0) {
+    this.speedFactor = maxSpeedFactor * 1 / applicationsToMax;
+  } else {
     this.speedFactor = maxSpeedFactor;
   }
 
-}
+};
 
-SpeedEffect.prototype.onApply = function(enemy){
+SpeedEffect.prototype.onApply = function(enemy) {
   this.appliedT = sm.activeState.t;
-}
+};
 
 
-SpeedEffect.prototype.onReapply = function(enemy, newEffect){
-  this.applications+=1;
+SpeedEffect.prototype.onReapply = function(enemy, newEffect) {
+  this.applications += 1;
   this.appliedT = sm.activeState.t;
 
   //I'm trying to make sure that you never override with worse stats.
-  if(newEffect.maxSpeedFactor > this.maxSpeedFactor){
-      this.applicationsToMax = newEffect.applicationsToMax;
-      this.maxSpeedFactor = newEffect.maxSpeedFactor;
-    }
-    this.recalculateSpeed();
+  if (newEffect.maxSpeedFactor > this.maxSpeedFactor) {
+    this.applicationsToMax = newEffect.applicationsToMax;
+    this.maxSpeedFactor = newEffect.maxSpeedFactor;
+  }
+  this.recalculateSpeed();
 
-}
+};
 
-SpeedEffect.prototype.onRemove = function(enemy){
-}
+SpeedEffect.prototype.onRemove = function(enemy) {
+};
 
-SpeedEffect.prototype.recalculateSpeed = function(){
-  if(this.applicationsToMax && this.applicationsToMax > 0){
+SpeedEffect.prototype.recalculateSpeed = function() {
+  if (this.applicationsToMax && this.applicationsToMax > 0) {
     this.speedFactor = 1 - (1 - this.maxSpeedFactor)
-          * Math.min(1, this.applications/this.applicationsToMax);
-  }else{
+      * Math.min(1, this.applications / this.applicationsToMax);
+  } else {
     this.speedFactor = this.maxSpeedFactor;
   }
-}
+};
 
-SpeedEffect.prototype.render = function(ctx, enemy){
+SpeedEffect.prototype.render = function(ctx, enemy) {
   var color;
-  if (this.speedFactor < 0){
+  if (this.speedFactor < 0) {
     color = "orange";
-  } else if (this.speedFactor < 1){
+  } else if (this.speedFactor < 1) {
     color = "blue";
   } else {
     color = "yellow";
   }
+  var sprite = this["sprite_" + color];
 
-
-  var radius = 0.7*GU, innerRadius = 0.3*GU, outerRadius = 0.9*GU;
-
+  var radius = 1.6;
   //Scale with power.
-  if(this.applicationsToMax && this.applicationsToMax > 0){
-    radius *= Math.min(1, this.applications/this.applicationsToMax);
-    outerRadius *= Math.min(1, this.applications/this.applicationsToMax);
-    innerRadius *= Math.min(1, this.applications/this.applicationsToMax);
+  if (this.applicationsToMax && this.applicationsToMax > 0) {
+    radius *= Math.min(1, this.applications / this.applicationsToMax);
   }
 
+  ctx.save();
+  var scaler = radius * GU / sprite.width;
+  ctx.translate(enemy.x * GU, enemy.y * GU);
+  ctx.scale(scaler, scaler);
+  ctx.drawImage(sprite, -sprite.width * 0.5, -sprite.height * 0.5);
+  ctx.restore();
+};
 
-  var gradient = ctx.createRadialGradient(enemy.x*GU, enemy.y*GU, innerRadius,
-    enemy.x*GU, enemy.y*GU, outerRadius);
-  gradient.addColorStop(0, color);
-  gradient.addColorStop(1, 'rgba(0,0,0,0)');
-
-  ctx.arc(enemy.x*GU, enemy.y*GU, radius, 0, 2 * Math.PI);
-
-  ctx.fillStyle = gradient;
-  ctx.fill();
-}
-
-SpeedEffect.prototype.update = function(enemy, t){
+SpeedEffect.prototype.update = function(enemy, t) {
   enemy.speed *= this.speedFactor;
-  if(this.duration == undefined || this.duration <= 0) return;
-  if(sm.activeState.t - this.appliedT >= this.duration){
+  if (this.duration == undefined || this.duration <= 0) return;
+  if (sm.activeState.t - this.appliedT >= this.duration) {
     this.applications -= 1;
     this.recalculateSpeed();
-    if(this.applications <= 0){
+    if (this.applications <= 0) {
       enemy.removeEffect(this);
     }
   }
-}
+};
diff --git a/src/Stats.js b/src/Stats.js
index 7b1fade..309f0ae 100644
--- a/src/Stats.js
+++ b/src/Stats.js
@@ -1,9 +1,11 @@
-function Stats(achievements){
+function Stats(achievements) {
   this.achievements = achievements;
   this.kills = 0;
-}
+  this.accumulatedClicks = 0;
+  this.clicks = [];
+};
 
-Stats.prototype.addKill = function(){
+Stats.prototype.addKill = function() {
   this.kills++;
   if (this.kills >= 1) {
     this.achievements.give("first_kill");
@@ -28,4 +30,23 @@ Stats.prototype.addKill = function(){
   ach.kills += 1;
   ach.all_time_kills += 1;
   setCookie("cuteanimals_stats", JSON.stringify(ach));
-}
+};
+
+Stats.prototype.addClick = function() {
+  this.accumulatedClicks++;
+  if (this.accumulatedClicks === 42) {
+    this.achievements.give("forty_two_clicks");
+  }
+  if (this.accumulatedClicks === 1337) {
+    this.achievements.give("leet");
+  }
+  this.clicks.push(t);
+  if (this.clicks.length > 100) {
+    var timeDifference = t - this.clicks[this.clicks.length - 101];
+    if (timeDifference <= 7500) {
+      this.achievements.give("cheater");
+    } else if (timeDifference <= 10000) {
+      this.achievements.give("insane_clicking");
+    }
+  }
+};
\ No newline at end of file
diff --git a/src/Toast.js b/src/Toast.js
index a1a9cc0..8c0c288 100644
--- a/src/Toast.js
+++ b/src/Toast.js
@@ -1,51 +1,51 @@
-Toast = (function(){
-    var toast_template;
-    var active_toast;
-    var active_toast_container;
-    var toast_queue = [];
-    $(function(){
-        toast_template = $('.toast.template');
-    });
+Toast = (function() {
+  var toast_template;
+  var active_toast;
+  var active_toast_container;
+  var toast_queue = [];
+  $(function() {
+    toast_template = $('.toast.template');
+  });
 
-    function Toast(message){
-        toast_queue.push(message);
-        if (active_toast_container != undefined) {
-            active_toast_container.hide().remove();
-        }
-        printMessage(toast_queue.shift());
+  function Toast(message) {
+    toast_queue.push(message);
+    if (active_toast_container != undefined) {
+      active_toast_container.hide().remove();
     }
+    printMessage(toast_queue.shift());
+  }
 
-    function printMessage(message) {
-        active_toast = message;
-        var toast = toast_template.clone()
-            .removeClass('template');
-        toast.find('.message').html(message);
-        $('#wrapper').append(toast);
-        active_toast_container = toast;
-        toast.fadeIn();
-        toast.animate({
-            'margin-top':'-20px'
-        },{
-            duration: 300,
-            queue: false
-        }, 'easeinout');
-        setTimeout(function(){
-            toast.animate({
-                'margin-top':'-=20px'
-            },{
-                duration: 500,
-                queue: false
-            }, 'easeinout');
-            active_toast = undefined;
-            active_toast_container = undefined;
-            if (toast_queue.length > 0) {
-              printMessage(toast_queue.shift());
-            }
-            toast.fadeOut(500, function(){
-                toast.remove();
-            });
-        }, 3000 + 32 * (message.length - 200));
-    }
+  function printMessage(message) {
+    active_toast = message;
+    var toast = toast_template.clone()
+      .removeClass('template');
+    toast.find('.message').html(message);
+    $('#wrapper').append(toast);
+    active_toast_container = toast;
+    toast.fadeIn();
+    toast.animate({
+      'margin-top': '-20px'
+    }, {
+      duration: 300,
+      queue: false
+    }, 'easeinout');
+    setTimeout(function() {
+      toast.animate({
+        'margin-top': '-=20px'
+      }, {
+        duration: 500,
+        queue: false
+      }, 'easeinout');
+      active_toast = undefined;
+      active_toast_container = undefined;
+      if (toast_queue.length > 0) {
+        printMessage(toast_queue.shift());
+      }
+      toast.fadeOut(500, function() {
+        toast.remove();
+      });
+    }, 3200 + 35 * (message.length - 200));
+  }
 
-    return Toast;
+  return Toast;
 })();
diff --git a/src/UpgradeAddBaseDamage.js b/src/UpgradeAddBaseDamage.js
index d201614..790f5a0 100644
--- a/src/UpgradeAddBaseDamage.js
+++ b/src/UpgradeAddBaseDamage.js
@@ -1,19 +1,19 @@
-function UpgradeAddBaseDamage(bonus){
+function UpgradeAddBaseDamage(bonus) {
   this.bonus = bonus;
-}
+};
 
-UpgradeAddBaseDamage.prototype.onApply = function(laser){
+UpgradeAddBaseDamage.prototype.onApply = function(laser) {
   laser.baseDamage += this.bonus;
-}
+};
 
-UpgradeAddBaseDamage.prototype.render = function(ctx){
+UpgradeAddBaseDamage.prototype.render = function(ctx) {
   //TODO: Not called, unsure how whether we need this and how it should be done.
 
-}
+};
 
-UpgradeAddBaseDamage.prototype.update = function(laser){
+UpgradeAddBaseDamage.prototype.update = function(laser) {
   //TODO: Not called. Unsure if we need it.
-}
+};
 
-UpgradeAddBaseDamage.prototype.onEnemyHit = function(laser, enemy){
-}
+UpgradeAddBaseDamage.prototype.onEnemyHit = function(laser, enemy) {
+};
diff --git a/src/UpgradeDamageMultiplier.js b/src/UpgradeDamageMultiplier.js
index 9119250..6387cd1 100644
--- a/src/UpgradeDamageMultiplier.js
+++ b/src/UpgradeDamageMultiplier.js
@@ -1,20 +1,20 @@
-function UpgradeDamageMultiplier(multiplier){
+function UpgradeDamageMultiplier(multiplier) {
   this.multiplier = multiplier;
-}
+};
 
-UpgradeDamageMultiplier.prototype.onApply = function(laser){
+UpgradeDamageMultiplier.prototype.onApply = function(laser) {
 
-}
+};
 
-UpgradeDamageMultiplier.prototype.render = function(ctx){
+UpgradeDamageMultiplier.prototype.render = function(ctx) {
   //TODO: Not called, unsure how whether we need this and how it should be done.
 
-}
+};
 
-UpgradeDamageMultiplier.prototype.update = function(laser){
+UpgradeDamageMultiplier.prototype.update = function(laser) {
   //TODO: Not called. Unsure if we need it.
-}
+};
 
-UpgradeDamageMultiplier.prototype.onEnemyHit = function(laser, enemy){
+UpgradeDamageMultiplier.prototype.onEnemyHit = function(laser, enemy) {
   laser.nextDamage *= this.multiplier;
-}
+};
diff --git a/src/UpgradeDebuffOnHit.js b/src/UpgradeDebuffOnHit.js
index 4a96789..d5075fa 100644
--- a/src/UpgradeDebuffOnHit.js
+++ b/src/UpgradeDebuffOnHit.js
@@ -1,22 +1,22 @@
-function UpgradeDebuffOnHit(returnNewEffect){
+function UpgradeDebuffOnHit(returnNewEffect) {
   this.generateNewDebuff = returnNewEffect;
-}
+};
 
-UpgradeDebuffOnHit.prototype.onApply = function(laser){
+UpgradeDebuffOnHit.prototype.onApply = function(laser) {
 
-}
+};
 
-UpgradeDebuffOnHit.prototype.render = function(ctx){
+UpgradeDebuffOnHit.prototype.render = function(ctx) {
   //TODO: Not called, unsure how whether we need this and how it should be done.
 
-}
+};
 
-UpgradeDebuffOnHit.prototype.update = function(laser){
+UpgradeDebuffOnHit.prototype.update = function(laser) {
   //TODO: Not called. Unsure if we need it.
-}
+};
 
-UpgradeDebuffOnHit.prototype.onEnemyHit = function(laser, enemy){
+UpgradeDebuffOnHit.prototype.onEnemyHit = function(laser, enemy) {
   //this.function(laser, enemy);
 
   enemy.addEffect(this.generateNewDebuff());
-}
+};
diff --git a/src/Upgrades.js b/src/Upgrades.js
index 4f56623..9b9af7f 100644
--- a/src/Upgrades.js
+++ b/src/Upgrades.js
@@ -14,8 +14,8 @@ function Upgrades(game) {
       name: "Red Laser",
       img: 'red_laser.png',
       description: "Using your lucky prism and some mirrors,"
-              +" you harness the red power of the rainbow to destroy"
-              +" your enemies.",
+        + " you harness the red power of the rainbow to destroy"
+        + " your enemies.",
       init: function() {
         that.game.laserController.addLaser(Colors.RED, 0.5);
       },
@@ -30,8 +30,8 @@ function Upgrades(game) {
       init: function() {
         sm.activeState.goldPerClick = this.level;
         this.level++;
-        this.cost = this.level*(cost_scaling+this.level*cost_square_scaling);
-        this.name = "Gold-digging Shovel "+this.level;
+        this.cost = this.level * (cost_scaling + this.level * cost_square_scaling);
+        this.name = "Gold-digging Shovel " + this.level;
       },
       stock: -1,
       dependencies: ["Red Laser"]
@@ -46,8 +46,8 @@ function Upgrades(game) {
         var laser = that.game.laserController.redLaser;
         laser.addUpgrade(new UpgradeAddBaseDamage(0.1));
         this.level++;
-        this.cost = this.level*(cost_scaling+this.level*cost_square_scaling);
-        this.name = "Mirror Prism Enhancer "+this.level;
+        this.cost = this.level * (cost_scaling + this.level * cost_square_scaling);
+        this.name = "Mirror Prism Enhancer " + this.level;
       },
       stock: -1,
       dependencies: ["Red Laser"]
@@ -59,7 +59,9 @@ function Upgrades(game) {
       description: "Slow your enemies with this delightfully cold beam.",
       init: function() {
         var laser = that.game.laserController.addLaser(Colors.BLUE, 0);
-        laser.addUpgrade(new UpgradeDebuffOnHit(function(){return new SpeedEffect(0.6, 10, 1)}));
+        laser.addUpgrade(new UpgradeDebuffOnHit(function() {
+          return new SpeedEffect(0.6, 10, 1)
+        }));
         that.game.achievements.give('blue_laser');
       },
       stock: 1,
@@ -74,7 +76,7 @@ function Upgrades(game) {
       description: "Tweaking the blue mirrors you improve the beam.",
       init: function() {
         this.level++;
-        this.cost = this.level*(cost_scaling+this.level*cost_square_scaling);
+        this.cost = this.level * (cost_scaling + this.level * cost_square_scaling);
         this.name = "Frost Coating on Mirrors " + this.level;
 
         //Please excuse the uglieness of this, on account of it being late in a hackathon.
@@ -85,14 +87,13 @@ function Upgrades(game) {
         var applicationsToMax = upgradeExample.applicationsToMax;
 
         maxSpeed *= 0.8;
-        applications = Math.max(1,0.8*applications);
-        duration = Math.min(500, duration*1.3);
-        laser.upgrades[0].generateNewDebuff = function(){
+        applications = Math.max(1, 0.8 * applications);
+        duration = Math.min(500, duration * 1.3);
+        laser.upgrades[0].generateNewDebuff = function() {
           return new SpeedEffect(maxSpeed, duration, applicationsToMax);
         }
 
 
-
       },
       stock: 10,
       dependencies: ["Blue Laser"]
@@ -104,7 +105,9 @@ function Upgrades(game) {
       description: "Another color, woohoo! This one seems poisonous.",
       init: function() {
         var laser = that.game.laserController.addLaser(Colors.GREEN, 0);
-        laser.addUpgrade(new UpgradeDebuffOnHit(function(){return new DotEffect(1.0, 250, 75)}));
+        laser.addUpgrade(new UpgradeDebuffOnHit(function() {
+          return new DotEffect(1.0, 250, 75)
+        }));
         that.game.achievements.give('green_laser');
       },
       stock: 1,
@@ -119,7 +122,7 @@ function Upgrades(game) {
       description: "Increases the toxicity of the green light. Increases max dps by 10 dps, and increases duration by 20% ",
       init: function() {
         this.level++;
-        this.cost = this.level*(cost_scaling+this.level*cost_square_scaling);
+        this.cost = this.level * (cost_scaling + this.level * cost_square_scaling);
         this.name = "Green Power " + this.level;
 
         var laser = that.game.laserController.greenLaser;
@@ -129,8 +132,8 @@ function Upgrades(game) {
         var applicationsToMax = upgradeExample.applicationsToMax;
 
         maxDpt += 0.2;
-        duration = duration*1.2;
-        laser.upgrades[0].generateNewDebuff = function(){
+        duration = duration * 1.2;
+        laser.upgrades[0].generateNewDebuff = function() {
           return new DotEffect(maxDpt, duration, applicationsToMax);
         }
       },
@@ -217,7 +220,7 @@ function Upgrades(game) {
       description: "Triggeable ability that slows your enemies.",
       init: function() {
         that.game.specialWeaponController.add(
-          new SpecialWeapon("slomoalizer", this.img, 0.1, 2.5*50, 10)
+          new SpecialWeapon("slomoalizer", this.img, 0.1, 2.5 * 50, 10)
         );
       },
       stock: 1,
@@ -230,7 +233,7 @@ function Upgrades(game) {
       description: "Scare your enemies with this blast! They will run away as fast as they can.",
       init: function() {
         //that.game.activateSpecialWeapon("blast", -1, 0.7*50);
-        that.game.specialWeaponController.add(new SpecialWeapon("blast", this.img, -1.5, 0.7*50, 10));
+        that.game.specialWeaponController.add(new SpecialWeapon("blast", this.img, -1.5, 0.7 * 50, 10));
       },
       stock: 1,
       dependencies: ["Slowmolizer"]
@@ -243,13 +246,13 @@ function Upgrades(game) {
   $('#wrapper').append(this.upgrade_menu);
 
   this.render();
-  $('body').on('click touchstart', '.upgrade-purchase', function(){
+  $('body').on('click touchstart', '.upgrade-purchase', function() {
     var index = $(this).parent('div').data('id');
     that.purchase(index);
   });
-}
+};
 
-Upgrades.prototype.purchase = function(index){
+Upgrades.prototype.purchase = function(index) {
   var upgrade = this.upgrades[index];
 
   if (!this.canPurchase(upgrade)) {
@@ -270,18 +273,18 @@ Upgrades.prototype.purchase = function(index){
   return true;
 };
 
-Upgrades.prototype.render = function(){
+Upgrades.prototype.render = function() {
   var img_upgrade_container = this.upgrade_menu.find('.img-upgrade-container').empty();
   var desc_upgrade_container = this.upgrade_menu.find('.desc-upgrade-container').empty();
   var img_source = $("#upgrade-img-template").html();
   var desc_source = $("#upgrade-desc-template").html();
   var img_template = Handlebars.compile(img_source, {noEscape: true});
   var desc_template = Handlebars.compile(desc_source, {noEscape: true});
-  for (var i=0;i<this.upgrades.length;i++){
+  for (var i = 0; i < this.upgrades.length; i++) {
     var upgrade = this.upgrades[i];
 
     //Do not render the ones that are not available.
-    if(!this.unlocked(upgrade)){
+    if (!this.unlocked(upgrade)) {
       continue;
     }
     upgrade.id = i;
@@ -292,39 +295,39 @@ Upgrades.prototype.render = function(){
     img_upgrade_container.append(img_template(upgrade));
   }
 
-  for (var i=0;i<this.upgrades.length;i++){
+  for (var i = 0; i < this.upgrades.length; i++) {
     var upgrade = this.upgrades[i];
 
     //Do not render the ones that are out of stock.
-    if(upgrade.stock == 0){
+    if (upgrade.stock == 0) {
       continue;
     }
     desc_upgrade_container.append(desc_template(upgrade));
-    img_upgrade_container.find('.tooltip').each(function(i,el){
+    img_upgrade_container.find('.tooltip').each(function(i, el) {
       var id = $(el).attr('data-id');
-      var description = desc_upgrade_container.find('.description[data-id='+id+']');
-      $(el).mouseover(function(){
+      var description = desc_upgrade_container.find('.description[data-id=' + id + ']');
+      $(el).mouseover(function() {
         description.show();
-      }).mouseleave(function(){
-        description.hide();
-      });
+      }).mouseleave(function() {
+          description.hide();
+        });
 
-      $(el).click(function(){
+      $(el).click(function() {
 
       });
     });
   }
 };
 
-Upgrades.prototype.unlocked = function(upgrade){
+Upgrades.prototype.unlocked = function(upgrade) {
   if (upgrade.stock == 0) {
     return false;
   }
   if (upgrade.dependencies) {
-    for (var i=0;i<upgrade.dependencies.length;i++) {
+    for (var i = 0; i < upgrade.dependencies.length; i++) {
       var dependency = upgrade.dependencies[i];
       var name_match = false;
-      for (var j=0;j<this.purchased.length;j++) {
+      for (var j = 0; j < this.purchased.length; j++) {
         if (this.purchased[j] == dependency) {
           name_match = true;
           break;
@@ -338,13 +341,13 @@ Upgrades.prototype.unlocked = function(upgrade){
 
   return true;
 
-}
+};
 
 Upgrades.prototype.canPurchase = function(upgrade) {
-  if (!this.unlocked(upgrade)){
+  if (!this.unlocked(upgrade)) {
     return false;
   }
-  if (!this.game.cash.canSpend(upgrade.cost)){
+  if (!this.game.cash.canSpend(upgrade.cost)) {
     return false;
   }
   return true;
diff --git a/src/Waves.js b/src/Waves.js
index a5e3fea..9e470f1 100644
--- a/src/Waves.js
+++ b/src/Waves.js
@@ -1,44 +1,44 @@
 WAVES = [
-    {
-        monsters: ["dog"]
-      , numberOfMonsters: 5
-      , scaling: 0
-      , duration: 5000
-    }
-  , {
-        monsters: ["bear"]
-      , numberOfMonsters: 10
-      , scaling: 0
-      , duration: 10000
-    }
-  , {
-        monsters: ["elephant"]
-      , numberOfMonsters: 15
-      , scaling: 0
-      , duration: 15000
-    }
-  , {
-        monsters: ["dog", "bear"]
-      , numberOfMonsters: 25
-      , scaling: 0.01
-      , duration: 22000
-    }
-  , {
-        monsters: ["bear", "elephant"]
-      , numberOfMonsters: 25
-      , scaling: 0.02
-      , duration: 20000
-    }
-  , {
-        monsters: ["dog", "elephant"]
-      , numberOfMonsters: 25
-      , scaling: 0.02
-      , duration: 20000
-    }
-  , {
-        monsters: ["dog", "elephant", "bear"]
-      , numberOfMonsters: 30
-      , scaling: 0.02
-      , duration: 20000
-    }
-]
+  {
+    monsters: ["dog"],
+    numberOfMonsters: 5,
+    scaling: 0,
+    duration: 5000
+  },
+  {
+    monsters: ["bear"],
+    numberOfMonsters: 10,
+    scaling: 0,
+    duration: 10000
+  },
+  {
+    monsters: ["elephant"],
+    numberOfMonsters: 15,
+    scaling: 0,
+    duration: 15000
+  },
+  {
+    monsters: ["dog", "bear"],
+    numberOfMonsters: 25,
+    scaling: 0.01,
+    duration: 22000
+  },
+  {
+    monsters: ["bear", "elephant"],
+    numberOfMonsters: 25,
+    scaling: 0.02,
+    duration: 20000
+  },
+  {
+    monsters: ["dog", "elephant"],
+    numberOfMonsters: 25,
+    scaling: 0.02,
+    duration: 20000
+  },
+  {
+    monsters: ["dog", "elephant", "bear"],
+    numberOfMonsters: 30,
+    scaling: 0.02,
+    duration: 20000
+  }
+];
diff --git a/src/bootstrap.js b/src/bootstrap.js
index 4eb9085..d6b4f7e 100644
--- a/src/bootstrap.js
+++ b/src/bootstrap.js
@@ -12,56 +12,57 @@ function smoothstep(a, b, t) {
   var v = t * t * (3 - 2 * t);
   return b * v + a * (1 - v);
 };
-function clamp(low, x, high){
-  return Math.max(low,Math.min(x,high));
-}
+function clamp(low, x, high) {
+  return Math.max(low, Math.min(x, high));
+};
 
-function loadImage(path){
+function loadImage(path) {
   var img = new Image();
   loaded++;
-  img.onload = function(){loaded--};
+  img.onload = function() {
+    loaded--
+  };
   img.src = path;
   return img;
-}
+};
 
-window.requestAnimFrame = (function(){
-  return  window.requestAnimationFrame       || 
-  window.webkitRequestAnimationFrame || 
-  window.mozRequestAnimationFrame    || 
-  window.oRequestAnimationFrame      || 
-  window.msRequestAnimationFrame     || 
-  function( callback ){
-    window.setTimeout(callback, 0);
-  };
+window.requestAnimFrame = (function() {
+  return  window.requestAnimationFrame ||
+    window.webkitRequestAnimationFrame ||
+    window.mozRequestAnimationFrame ||
+    window.oRequestAnimationFrame ||
+    window.msRequestAnimationFrame ||
+    function(callback) {
+      window.setTimeout(callback, 0);
+    };
 })();
 
-function loop(){
-  if(loaded > 0){
+function loop() {
+  if (loaded > 0) {
     canvas.width = canvas.width;
     ctx.fillStyle = "white";
-    ctx.fillRect(0,0,canvas.width,canvas.height);
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
     ctx.fillStyle = "black";
-    ctx.fillText("Loading "+loaded, 8*GU,4.5*GU);
+    ctx.fillText("Loading " + loaded, 8 * GU, 4.5 * GU);
     requestAnimFrame(loop);
     return;
   }
   t = +new Date();
-  dt += (t-old_time);
+  dt += (t - old_time);
   old_time = t;
-  while(dt>20){
+  while (dt > 20) {
     sm.update();
-    dt-= 20;
+    dt -= 20;
   }
   /* clearing canvas */
   canvas.width = canvas.width;
   sm.render(ctx);
 
 
-
   requestAnimFrame(loop);
-}
+};
 
-function bootstrap(){
+function bootstrap() {
 
   loaded = 1;
 
@@ -79,26 +80,27 @@ function bootstrap(){
   AudioButton.prototype.sprite_off = loadImage("res/audio_off.png");
   SpecialWeapon.prototype.sprite_slomoalizer = loadImage("res/slomoalizer.png");
   SpecialWeapon.prototype.sprite_blast = loadImage("res/blast.png");
+  SpeedEffect.prototype.sprite_blue = loadImage("res/effects/blue_effect.png");
+  SpeedEffect.prototype.sprite_orange = loadImage("res/effects/orange_effect.png");
+  DotEffect.prototype.sprite_green = loadImage("res/effects/green_effect.png");
 
   dt = 0;
   t = 0;
   time = +new Date();
   old_time = time;
   KEYS = [];
-  for(var i=0;i<256;i++){
+  for (var i = 0; i < 256; i++) {
     KEYS[i] = false;
   }
 
-  document.addEventListener("keydown",function(e){
+  document.addEventListener("keydown", function(e) {
     KEYS[e.keyCode] = true;
   });
 
-  document.addEventListener("keyup",function(e){
+  document.addEventListener("keyup", function(e) {
     KEYS[e.keyCode] = false;
   });
 
-  document.addEventListener("mousemove", handleEvent);
-
   resize();
 
   /* add game states here */
@@ -116,58 +118,57 @@ function bootstrap(){
 
   loaded--;
   requestAnimFrame(loop);
-}
+};
 
-function resize(e){
-  if(window.innerWidth/window.innerHeight > 16/9){
-    GU = (window.innerHeight/9);
-  }else{
-    GU = (window.innerWidth/16);
+function resize(e) {
+  if (window.innerWidth / window.innerHeight > 16 / 9) {
+    GU = (window.innerHeight / 9);
+  } else {
+    GU = (window.innerWidth / 16);
   }
-  canvas.width = 16*GU;
-  canvas.height = 9*GU;
-  canvas.style.margin = ((window.innerHeight - 9*GU) /2)+"px 0 0 "+((window.innerWidth-16*GU)/2)+"px";
+  canvas.width = 16 * GU;
+  canvas.height = 9 * GU;
+  canvas.style.margin = ((window.innerHeight - 9 * GU) / 2) + "px 0 0 " + ((window.innerWidth - 16 * GU) / 2) + "px";
   var wrapper = document.getElementById('wrapper');
   wrapper.style.margin = canvas.style.margin;
-  wrapper.style.width = 16*GU+'px';
-  wrapper.style.height = 9*GU+'px';
-  wrapper.style.fontSize = 0.15*GU+'px';
-  console.log(wrapper.style.fontSize);
+  wrapper.style.width = 16 * GU + 'px';
+  wrapper.style.height = 9 * GU + 'px';
+  wrapper.style.fontSize = 0.15 * GU + 'px';
   wrapper.style.zIndex = 999999999;
-}
+};
 
 function saveData(data) {
   json_data = JSON.stringify(data);
-  setCookie("game_data", json_data, 10^5);
-}
+  setCookie("game_data", json_data, 10 ^ 5);
+};
 function readData() {
   json_data = getCookie("game_data");
   if (json_data !== undefined) {
     return JSON.parse(json_data);
-  }else{
+  } else {
     /* default game_data object */
-    return {progress:[0,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1]};
+    return {progress: [0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]};
   }
-}
+};
 
-function setCookie(c_name,value,exdays) {
-  var exdate=new Date();
+function setCookie(c_name, value, exdays) {
+  var exdate = new Date();
   exdate.setDate(exdate.getDate() + exdays);
-  var c_value=escape(value) + ((exdays==null) ? "" : "; expires="+exdate.toUTCString());
-  document.cookie=c_name + "=" + c_value;
-}
+  var c_value = escape(value) + ((exdays == null) ? "" : "; expires=" + exdate.toUTCString());
+  document.cookie = c_name + "=" + c_value;
+};
 function getCookie(c_name) {
-  var i,x,y,ARRcookies=document.cookie.split(";");
-  for (i=0;i<ARRcookies.length;i++) {
-    x=ARRcookies[i].substr(0,ARRcookies[i].indexOf("="));
-    y=ARRcookies[i].substr(ARRcookies[i].indexOf("=")+1);
-    x=x.replace(/^\s+|\s+$/g,"");
-    if (x==c_name) {
+  var i, x, y, ARRcookies = document.cookie.split(";");
+  for (i = 0; i < ARRcookies.length; i++) {
+    x = ARRcookies[i].substr(0, ARRcookies[i].indexOf("="));
+    y = ARRcookies[i].substr(ARRcookies[i].indexOf("=") + 1);
+    x = x.replace(/^\s+|\s+$/g, "");
+    if (x == c_name) {
       return unescape(y);
     }
   }
-}
-function relMouseCoords(e){
+};
+function relMouseCoords(e) {
   if (e.type !== "touchstart") {
     e.preventDefault();
   }
@@ -177,29 +178,44 @@ function relMouseCoords(e){
   var canvasY = 0;
   var currentElement = this.canvas;
 
-  do{
+  do {
     totalOffsetX += currentElement.offsetLeft;
     totalOffsetY += currentElement.offsetTop;
   }
-  while(currentElement = currentElement.offsetParent);
+  while (currentElement = currentElement.offsetParent);
 
   var event = e;
-  canvasX = (event.pageX||(event.touches[0]&&event.touches[0].pageX)||(this.cached_coords.x+totalOffsetX)) - totalOffsetX;
-  canvasY = (event.pageY||(event.touches[0]&&event.touches[0].pageY)||(this.cached_coords.y+totalOffsetY)) - totalOffsetY;
-
-  return {x:canvasX/GU, y:canvasY/GU}
-}
+  canvasX = (event.pageX || (event.touches[0] && event.touches[0].pageX) || (this.cached_coords.x + totalOffsetX)) - totalOffsetX;
+  canvasY = (event.pageY || (event.touches[0] && event.touches[0].pageY) || (this.cached_coords.y + totalOffsetY)) - totalOffsetY;
 
-document.addEventListener('click', handleEvent);
-document.addEventListener('touchstart', handleEvent);
-document.addEventListener('touchmove', function(e){e.preventDefault();e.stopPropagation();return false;});
+  return {x: canvasX / GU, y: canvasY / GU}
+};
 
+if (window.navigator.msPointerEnabled) {
+  document.addEventListener("MSPointerDown", handleEvent, false);
+  document.addEventListener("MSPointerMove", function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    handleEvent(e);
+    return false;
+  }, false);
+} else {
+  document.addEventListener('touchstart', handleEvent);
+  document.addEventListener('click', handleEvent);
+  document.addEventListener("mousemove", handleEvent);
+  document.addEventListener('touchmove', function(e) {
+    e.preventDefault();
+    e.stopPropagation();
+    handleEvent(e);
+    return false;
+  });
+}
 
-function handleEvent(e){
+function handleEvent(e) {
   e.preventDefault();
   mouseXY = relMouseCoords(e);
   MOUSE = mouseXY;
-  var eventType = (e.type === "mousemove" || e.type === "touchmove" ? "hover" : "click");
+  var eventType = (e.type === "mousemove" || e.type === "touchmove" || e.type === "pointermove" ? "hover" : "click");
   var clickables;
   if (sm.activeState.gameMenuWindow !== undefined && sm.activeState.gameMenuWindow.visible) {
     clickables = sm.activeState.gameMenuWindow.buttons;
@@ -208,12 +224,12 @@ function handleEvent(e){
   }
   var coordX, coordY, sizeX, sizeY;
   var hoverOverClickable = false;
-  for(var i=0; i<clickables.length;i++){
+  for (var i = 0; i < clickables.length; i++) {
     coordX = clickables[i][1].x;
     coordY = clickables[i][1].y;
     sizeX = clickables[i][1].w;
     sizeY = clickables[i][1].h;
-    if(mouseXY.x >= coordX && mouseXY.x <= coordX+sizeX && mouseXY.y >= coordY && mouseXY.y <= coordY + sizeY){
+    if (mouseXY.x >= coordX && mouseXY.x <= coordX + sizeX && mouseXY.y >= coordY && mouseXY.y <= coordY + sizeY) {
       if (eventType === "click") {
         clickables[i][0](clickables[i].slice(2));
       } else if (eventType === "hover") {
@@ -224,17 +240,17 @@ function handleEvent(e){
   }
   clickables[i] && clickables[i][1].hover && clickables[i][1].hover();
   $("body").css('cursor', hoverOverClickable ? "pointer" : "auto");
-}
+};
 
 window.onresize = resize;
 
 /* global mixin for position/size-objects that do AABB collision with another posititon/size-object */
-function contains(obj){
-  return obj.position.x < this.position.x+this.size.w &&
-    obj.position.x+obj.size.w > this.position.x &&
-    obj.position.y < this.position.y+this.size.h &&
-    obj.position.y+obj.size.h > this.position.y;
-}
+function contains(obj) {
+  return obj.position.x < this.position.x + this.size.w &&
+    obj.position.x + obj.size.w > this.position.x &&
+    obj.position.y < this.position.y + this.size.h &&
+    obj.position.y + obj.size.h > this.position.y;
+};
 
 // Array Remove - By John Resig (MIT Licensed)
 Array.remove = function(array, from, to) {