diff --git a/_TODO b/_TODO
index 7dd33a8..da528a1 100644
--- a/_TODO
+++ b/_TODO
@@ -1,32 +1,11 @@
-- Boosts funcionais (implementado o boost central)
-    Pode trazer alguns porblemas por causa do movimento atual da personagem
-    
+   
 - Melhorar o movimento da personagem.
     Provavelmente algo com um contador onde é simulada aceleração
 
-- BulletPool
-    Reutilizar as balas em vez de estar sempre a criar e a destruir
-
-- EnemyPool
-    Same
 
 - Octree Raycasting
     Ver se melhora o desempenho do Raycasting
 
-- Dividir o mapa em 3
-    Uma parte de chao para ser usado com o raycast para baixo
-    Outra parte de paredes para usar com raycast lateral
-    Outra parte só estética (tecto) para não empatar
-
-- Adicionar um trail à bala
-    Provavelmente ver as particulas se fica mais rapido / dá para fazer 
-    Se não, acrescentar um mesh atras da bala
-
-- Escolher e implementar o modo de jogo
-    Survival, onde inimigos aparecem sempre, cada vez mais, e tens um highscore de quantos mataste
-    TimeAttack, onde tens X segundos para matar os inimigos, e é por rondas (meh)
-    ...
-
 - Movimentos e ações dos inimigos
     Previsão da nossa posição para disparar contra nos
     Espécie de Pathfinding
@@ -40,5 +19,3 @@
 
 - THREE.BufferGeometry para mapa   
     supostamente mais rapido para objetos que nao se mexem
-
-- Recoil da arma
\ No newline at end of file
diff --git a/_TopicosRelatorio b/_TopicosRelatorio
index a0c3ef1..d2b611a 100644
--- a/_TopicosRelatorio
+++ b/_TopicosRelatorio
@@ -17,7 +17,12 @@
     Foi feita uma ilusao de sombra usando dois materias diferentes
 
 - O mapa criado tinha 3 mil faces e depois de uma otimização passou para 1,5 mil
+    Posteriormente foi dividido em 3 para melhorar o desempenho
 
 - MD2Character não dava para copiar para varios inimigos. As animações não eram grande coisa
     Passou-se a usar MD2CharacterComplex
 
+- Bullet & Enemy Pool
+    O porque de se usar, falar do garbage collector e criação de modelos
+
+- firefox vs chrome
diff --git a/boost.js b/boost.js
index 98a1b1f..cdbf69d 100644
--- a/boost.js
+++ b/boost.js
@@ -7,7 +7,6 @@ function Boost(postion,actionFunction) {
     var self = this;
 
     this.update = function(posObject){
-        //console.log("threshold " + this.thresholdDistance);
         if (posObject.distanceTo(postion)<this.thresholdDistance){//conta o valor de Y por isso deve ser descontada a altura dos objetos
             this.actionFunction();// aplicação de forças para o jump!
         }
diff --git a/bullet.js b/bullet.js
index 8acad53..ad8c860 100644
--- a/bullet.js
+++ b/bullet.js
@@ -44,13 +44,11 @@ function Bullet(damage) {
 
     this.update = function (delta, objectIndex) {
         //this.box.position.copy(new THREE.Vector3().addVectors(this.mesh.position,this.direction.normalize()));
-        //console.log(this.mesh.position);
         this.raycaster.ray.origin.copy(this.mesh.position);
         this.raycaster.ray.direction.copy(this.direction);
 
         var intersections = this.raycaster.intersectObjects(this.objectStatic,true);
         if (intersections.length>0){
-            console.log("Colisão bala");
             this.destroy(objectIndex);
             return;
         }
@@ -61,7 +59,6 @@ function Bullet(damage) {
                 intersections = this.raycaster.intersectObject(game.enemies[i].mesh,true);
                 if (intersections.length>0){
                     game.enemies[i].damage(this.damage,i);
-                    console.log("Enemy hit");
                     this.destroy(objectIndex);
                     return;
                 }
@@ -70,7 +67,6 @@ function Bullet(damage) {
         
         if (!this.shotByPlayer && game.player.playerBB.containsPoint(this.mesh.position)){
             game.player.takeDamage(this.damage);
-            console.log("Player hit");
             this.destroy(objectIndex);
             return;
         }
diff --git a/enemy.js b/enemy.js
index b083241..fe47f67 100644
--- a/enemy.js
+++ b/enemy.js
@@ -78,7 +78,6 @@ function Enemy() {
         direction.y=0;
 
         var bullet = bPool.allocate();
-        console.log("shoot");
         bullet.activate(this.enemyDamage, pointBulletVec, direction, this.bulletSpeed, false);
     };
 
@@ -137,7 +136,6 @@ function Enemy() {
             this.boosts[i].update(new THREE.Vector3().subVectors(this.mesh.position,new THREE.Vector3(0,this.enemyHeight,0)))//ver se é preciso passar o delta
         }
 
-       // console.log(this.mesh.position)
         //update fisica
         this.updatePhysics(delta);
 
@@ -175,7 +173,6 @@ function Enemy() {
                 });//quando terminar de olhar para o player resta timeLook para 5
         }
 
-        //console.log("move " , this.timeLook)
 
         //this.mesh.rotateY(0.3*delta * superHotConstant);
         //this.mesh.translateZ(-this.speed*delta * superHotConstant);
@@ -195,11 +192,14 @@ function Enemy() {
 
         if (this.health <= 0){
             this.destroy(index);
+            game.score += 1;
+            scoreDiv.innerHTML = game.score;
         }
     };
 
     this.activate = function (position) {
         this.active = true;
+        this.health = 100;
         game.enemies.push(this);
         this.setPosition(position);
 
diff --git a/game.js b/game.js
index 2dbb081..45188d7 100644
--- a/game.js
+++ b/game.js
@@ -19,32 +19,26 @@ function Game() {
 
     this.prevTime;
     this.stats1;
-    this.stats2;
 
     //gestao das fisicas
     this.gravity = 2;
 
-    this.enemySpawnTimer = 5;
+    this.enemySpawnTimer = 2;
     this.enemySpawnTimerCurrent = 1;
+    this.score = 0;
 
     this.init = function() {
-
         // SCENE
-
         this.scene = new THREE.Scene();
 
         // CAMERA
-
         this.camera = new THREE.PerspectiveCamera( 60, window.innerWidth/window.innerHeight, 0.1, 1000 );
         // Mover a camara com o rato (FirstPerson)
         this.controls = new THREE.PointerLockControls( this.camera );
         this.scene.add( this.controls.getObject() ); // adiciona camera
         
 
-
         // LIGHTS
-        
-        //this.camera.add(new THREE.PointLight(0xffffff, 1, 30, 2))
         this.scene.add( new THREE.AmbientLight( 0x202020 ) );
         
         var mesh = new THREE.Mesh(
@@ -55,10 +49,7 @@ function Game() {
         mesh.position.set(0, 29, 0);
         this.scene.add(mesh);
 
-
-
         // RENDERER
-
         this.renderer = new THREE.WebGLRenderer({antialias: true});  // TODO ver o antialias 
         //this.renderer.shadowMapEnabled = true;
         //this.renderer.shadowMapType = THREE.PCFSoftShadowMap;
@@ -68,10 +59,7 @@ function Game() {
         this.renderer.setSize( window.innerWidth, window.innerHeight );
         container.appendChild( this.renderer.domElement );
         
-        
-
         // GAME MAP
-        
         this.scene.add(loader.map);
         this.scene.add(loader.floors);
         this.floors = loader.floors;
@@ -81,7 +69,6 @@ function Game() {
         this.walls.name="walls";
         
         //RAYCAST DEBUG
-
         var gem = new THREE.BoxGeometry(0.1,0.5,0.1);
         var lineMaterial = new THREE.MeshBasicMaterial({ color: 0xff0000 });
         this.rayInter = new THREE.Mesh(gem, lineMaterial);
@@ -101,78 +88,33 @@ function Game() {
         } , false);
 
         // POINTERLOCK
-
-        var havePointerLock = 'pointerLockElement' in document 
-            || 'mozPointerLockElement' in document 
-            || 'webkitPointerLockElement' in document;
-
-        //verificar se o browser suporta pointerLock
-        if ( havePointerLock ) {
-            var element = document.body;
-
-            function pointerlockchange( event ) {
-                if ( document.pointerLockElement === element 
-                        || document.mozPointerLockElement === element 
-                        || document.webkitPointerLockElement === element ) {
-                    game.controlsEnabled = true;
-                    game.controls.enabled = true;
-                    blocker.style.display = 'none';
-                } else {
-                    game.controlsEnabled = false;
-                    game.controls.enabled = false;
-                    blocker.style.display = 'block';
-                    instructions.style.display = '';
-                }
-            };
-
-            // Hook pointer lock state change events
-            document.addEventListener( 'pointerlockchange', pointerlockchange, false );
-            document.addEventListener( 'mozpointerlockchange', pointerlockchange, false );
-            document.addEventListener( 'webkitpointerlockchange', pointerlockchange, false );
-
-            instructions.addEventListener( 'click', function ( event ) {
-                instructions.style.display  = "none" ;
-                
-                // Ask the browser to lock the pointer
-                element.requestPointerLock = element.requestPointerLock || element.mozRequestPointerLock || element.webkitRequestPointerLock;
-                element.requestPointerLock();
-            }, false );
-        } else {
-            container.innerHTML = 'Your browser doesn\'t seem to support Pointer Lock API';
-        }
-
-        //CRIAR OBJETOS
+        this.verifyPointerLock();
         
+        //CRIAR OBJETOS
         this.player = new Player();
         this.player.addWeapon(new Pistol(loader.gun1, Bullet, 20, 1,  new THREE.Vector3(0, 0.15, -1)));
         this.player.addWeapon(new Automatic(loader.gun2, Bullet, 30, 10, new THREE.Vector3(0, 0.1, -0.4)));
 
-        
-
         // STATS
 
         this.stats1 = new Stats();
         this.stats1.showPanel(0); // Panel 0 = fps
         this.stats1.domElement.style.cssText = 'position:absolute;top:0px;left:0px;';
         document.body.appendChild(this.stats1.domElement);
-
-        this.stats2 = new Stats();
-        this.stats2.showPanel(1); // Panel 1 = ms
-        this.stats2.domElement.style.cssText = 'position:absolute;top:0px;left:80px;';
-        document.body.appendChild(this.stats2.domElement);
     }
 
     this.animate = function() {
-        var delta = clock.getDelta();
-
-        resetPlayer();
+        if (game.gameOver) return;
 
-        if ( game.controlsEnabled ) {
+        var delta = clock.getDelta();
+        if (game.controlsEnabled) {
+            resetPlayer();
+            
             // Update das balas
             for (var i = 0 ; i < game.bullets.length ; i++){
                 game.bullets[i].update(delta,i);
             }
-
+    
             // Update do player
             game.player.update(delta);
             
@@ -182,21 +124,21 @@ function Game() {
                 var enemy = enemyPool.allocate();
                 enemy.activate(getRandomEnemySpawn());
                 game.enemySpawnTimerCurrent = game.enemySpawnTimer;
+                game.enemySpawnTimer *= 1 - 0.5 * delta * game.currentTimeSpeed;
             }
-
+    
             // Update dos inimigos
             for (var i=0; i<game.enemies.length; i++) {
                 // game.enemies[i].setPlaybackRate( game.currentTimeSpeed );
                 game.enemies[i].update(delta * game.currentTimeSpeed);
             }
-
         }
         
+        
         requestAnimationFrame( game.animate );
         game.renderer.render( game.scene, game.camera );
 
         game.stats1.update();
-        game.stats2.update();
 
         bulletPoolInfo.innerHTML = bPool.totalUsed + " / " + bPool.totalPooled;
         enemyPoolInfo.innerHTML = enemyPool.totalUsed + " / " + enemyPool.totalPooled;
@@ -210,6 +152,97 @@ function Game() {
         game.camera.aspect = width / height;
         game.camera.updateProjectionMatrix();
     }
+
+
+    this.endGame = function(){
+        document.exitPointerLock = document.exitPointerLock    ||
+        document.mozExitPointerLock;
+        // Attempt to unlock
+        document.exitPointerLock();
+
+        endgameDiv.style.display = "block";
+        finalScore.innerHTML = this.score;
+        this.gameOver = true;
+        retryButton.onclick = function(){
+            game.restartGame();
+        };
+    }
+
+    this.restartGame = function() {
+        clock.getDelta();
+
+        endgameDiv.style.display = "none";
+        this.gameOver = false;
+
+        // reset player health
+        this.player.health = 100;
+        updateMapColor(100);
+
+        // reset enemies and bulelts
+        var i = game.bullets.length;
+        while (i-- ) // esta assim porque remove se do array enquanto se esta a iterar
+            game.bullets[i].destroy(i);
+
+        var j = game.enemies.length;
+        while (j-- ) // esta assim porque remove se do array enquanto se esta a iterar
+            game.enemies[j].destroy(j);
+
+        this.controls.getObject().position.set( 0, 20, 0 );
+        this.player.velocityVertical = 0;
+        
+        this.enemySpawnTimer = 2;
+        this.enemySpawnTimerCurrent = 1;
+        this.score = 0;
+        scoreDiv.innerHTML = "";
+
+        document.body.requestPointerLock = document.body.requestPointerLock || document.body.mozRequestPointerLock || document.body.webkitRequestPointerLock;
+        document.body.requestPointerLock();
+        this.animate();
+    }
+
+    this.verifyPointerLock = function(){
+        var havePointerLock = 'pointerLockElement' in document 
+        || 'mozPointerLockElement' in document 
+        || 'webkitPointerLockElement' in document;
+
+        //verificar se o browser suporta pointerLock
+        if ( havePointerLock ) {
+            var element = document.body;
+
+            function pointerlockchange( event ) {
+                if (game.gameOver) return;
+
+                if ( document.pointerLockElement === element 
+                        || document.mozPointerLockElement === element 
+                        || document.webkitPointerLockElement === element ) {
+                    game.controlsEnabled = true;
+                    game.controls.enabled = true;
+                    blocker.style.display = 'none';
+                } else {
+                    game.controlsEnabled = false;
+                    game.controls.enabled = false;
+                    blocker.style.display = 'block';
+                    instructions.style.display = '';
+                }
+            };
+
+            // Hook pointer lock state change events
+            document.addEventListener( 'pointerlockchange', pointerlockchange, false );
+            document.addEventListener( 'mozpointerlockchange', pointerlockchange, false );
+            document.addEventListener( 'webkitpointerlockchange', pointerlockchange, false );
+
+            instructions.addEventListener( 'click', function ( event ) {
+                instructions.style.display  = "none" ;
+                
+                // Ask the browser to lock the pointer
+                element.requestPointerLock = element.requestPointerLock || element.mozRequestPointerLock || element.webkitRequestPointerLock;
+                element.requestPointerLock();
+            }, false );
+        } else {
+            container.innerHTML = 'Your browser doesn\'t seem to support Pointer Lock API';
+        }
+
+    }
 }
 
 
diff --git a/loader.js b/loader.js
index 69a4c3c..9005d87 100644
--- a/loader.js
+++ b/loader.js
@@ -146,7 +146,6 @@ function Loader(){
             // baseCharacter.setWeapon( 0 );
             //baseCharacter.setSkin( 0 );
             loader.enemy = baseCharacter;
-            console.log(loader.enemy);
         };
         baseCharacter.loadParts( configOgro );
 
diff --git a/player.js b/player.js
index 7fe6e8d..24cb0b0 100644
--- a/player.js
+++ b/player.js
@@ -80,6 +80,8 @@ function Player() {
     // Muda a arma para a que esta no index passado
     // é necessário parar as outras armas, se estavam a recarregar e não acabaram depois tem que se recommeçar
     this.switchWeapon = function(weaponId) {
+        this.takeDamage(20);
+
         if (this.currentWeapon == weaponId)
             return;
         for (i=0; i<this.weapons.length; i++){
@@ -92,8 +94,6 @@ function Player() {
         var cw = this.weapons[weaponId];
         cw.mesh.visible = true;
         cw.changeState(cw.previousState);
-
-        console.log(game.controls.getObject().position);
     };
 
     this.mousedown = function () {
@@ -194,13 +194,8 @@ function Player() {
 
 
     this.updateBB = function () {
-
         this.playerBB.min.set(game.controls.getObject().position.x-this.bbSizeX,game.controls.getObject().position.y-this.playerheight,game.controls.getObject().position.z-1);
         this.playerBB.max.set(game.controls.getObject().position.x+this.bbSizeX,game.controls.getObject().position.y+1,game.controls.getObject().position.z+1);
-        //this.playerBB.min.applyQuaternion(game.controls.getObject().getWorldQuaternion());
-        //this.playerBB.max.applyQuaternion(game.controls.getObject().getWorldQuaternion());
-        //console.log("My pos " + strVector(game.controls.getObject().position));
-        //console.log("BB " + strVector(this.playerBB.min) + " " + strVector(this.playerBB.max))
     };
 
     //FUNCAO CHAMADA EM TODOS OS FRAMES
@@ -226,8 +221,6 @@ function Player() {
         //TODO otimizar as variaveis e tirar o bloco de debug
         var dirCopy = new THREE.Vector3().copy(this.directitionRay);
         var vectorDir = dirCopy.applyMatrix4(new THREE.Matrix4().extractRotation(game.controls.getObject().matrix)).normalize();
-        //console.log("Vector dir " + strVector(vectorDir));
-        //console.log("Vector directitionRay " + strVector(this.directitionRay));
         this.rayWallDebug.position.copy(new THREE.Vector3().addVectors(game.controls.getObject().position,vectorDir.multiplyScalar(this.wallDistance)));
         this.raycasterWalls.ray.origin.copy(game.controls.getObject().position);
         this.raycasterWalls.ray.direction.copy(vectorDir);
@@ -245,8 +238,6 @@ function Player() {
         }
 
 
-        //console.log("Vector dir " + strVector(this.directitionRay));
-
         this.raycaster.ray.origin.copy(game.controls.getObject().position);
         //raycaster.ray.origin.y -= 10;
 
@@ -267,9 +258,6 @@ function Player() {
 
         game.controls.getObject().translateY(this.velocityVertical * delta);
 
-        //console.log("velocidade y " + this.velocityVertical);
-        //console.log("isJumping " + isJumping);
-        //console.log("player position x " + game.controls.getObject().position.x + " y "+  game.controls.getObject().position.y +" z "+  game.controls.getObject().position.z);
         
         // update da velocidade do tempo
         var acceleratingTimeStep = 5;
@@ -289,15 +277,13 @@ function Player() {
             var tempTimeSpeed = game.currentTimeSpeed - stoppingTimeStep * delta ;
             game.currentTimeSpeed = Math.max(tempTimeSpeed, game.minTimeSpeed);
         }
-
-        //console.log("-y speed " + this.velocityVertical);
     };
 
     this.takeDamage = function(damage) {
         this.health -= damage;
 
         if (this.health <= 0) {
-            console.log("game over");
+            game.endGame();
         }
         updateMapColor(this.health);
     }
diff --git a/simple_scene.html b/simple_scene.html
index 42ed5fe..e1b109b 100644
--- a/simple_scene.html
+++ b/simple_scene.html
@@ -27,6 +27,9 @@
     <div id="bulletPoolDiv" class="noselect"></div>
     <div id="enemyPoolDiv" class="noselect"></div>
 
+    <div id="scoreDiv" class="noselect"></div>
+    
+
     <div id="weaponui" class="weapon" >
         <img id="weaponicon" class="noselect transpGUI" src="icons/pistol.png"/>
         <div id="reload" class="noselect progressBarBG">
@@ -48,8 +51,18 @@
         </div>
     </div>
 
+    <div id="endgameDiv">
+       <div id="finalScoreDiv">
+        <span style="font-size:20px">YOUR FINAL SCORE</span>
+        <br>
+        <span id="finalScore" style="font-size:80px">80</span>
+        <br>
+        <button id="retryButton">PLAY AGAIN</button>        
+    </div>
+    </div>
+
 
-    <!-- SCRIPTS -->
+    <!-- THREEJS SCRIPTS -->
     <script src="threejs/three.js"></script>
     <script src="threejs/stats.min.js"></script>
     <script src="threejs/PointerLockControls.js"></script>
@@ -62,6 +75,7 @@
     <script src="threejs/TGALoader.js"></script>
     <script src="threejs/MD2Loader.js"></script>
 
+    <!-- CREATED SCRIPTS -->
     <script src="utils.js"></script>
     <script src="bullet.js"></script>
     <script src="weapon.js"></script>
@@ -70,8 +84,6 @@
     <script src="boost.js"></script>
     <script src="loader.js"></script>
     <script src="game.js"></script>
-    
-
 
     <script>
         var loader;
@@ -86,6 +98,11 @@
         var instructions = document.getElementById( 'instructions' );
         var bulletPoolInfo = document.getElementById( 'bulletPoolDiv' );
         var enemyPoolInfo = document.getElementById( 'enemyPoolDiv' );
+
+        var endgameDiv = document.getElementById( 'endgameDiv' );
+        var finalScore = document.getElementById( 'finalScore' );
+        var retryButton = document.getElementById( 'retryButton' );
+
         var crosshair = document.getElementById("crosshaircircle").style;
 
         // carregamento dos modelos 3d
diff --git a/styles.css b/styles.css
index eb0dcd1..ecbada3 100644
--- a/styles.css
+++ b/styles.css
@@ -159,4 +159,52 @@ canvas {display: block}
     bottom: 40px;
     left: 10px;
     color: white;
+}
+
+#scoreDiv {
+    position: absolute;
+    top: 20%;
+    left: 50%;
+    color: white;
+    font-size: 30px;
+}
+
+#endgameDiv {
+    display: none;
+    position: absolute;
+    top: 0px;
+    left: 0px;
+    width: 100%;
+    height: 100%;
+    background-color: black;
+}
+
+#finalScoreDiv {
+    width: 100%;
+    height: 100%;
+    display: -webkit-box;
+    display: -moz-box;
+    display: box;
+    -webkit-box-orient: horizontal;
+    -moz-box-orient: horizontal;
+    box-orient: horizontal;
+    -webkit-box-pack: center;
+    -moz-box-pack: center;
+    box-pack: center;
+    -webkit-box-align: center;
+    -moz-box-align: center;
+    box-align: center;
+    color: #ffffff;
+    text-align: center;
+}
+
+#finalScore {
+    margin: 20px;
+    padding: 20px;
+}
+#retryButton {
+    width: 150px;
+    height: 50px;
+    font-size: 20px;
+    font-weight: bold;
 }
\ No newline at end of file
diff --git a/utils.js b/utils.js
index d50bf25..224ba99 100644
--- a/utils.js
+++ b/utils.js
@@ -20,9 +20,9 @@ var min_box = new THREE.Vector3(-30,-5,-30);
 var max_box = new THREE.Vector3(30,40,30);
 
 function resetPlayer() {
-    if( game.controls.getObject().position.y < -10 ) {
+    if( game.controls.getObject().position.y < -1 ) {
 
-        game.controls.getObject().position.set( 1, 20, 1 );
+        game.controls.getObject().position.set( 0, 20, 0 );
         game.player.velocityVertical = 0;
 
         game.player.jumpDirection = [false,false,false,false];
diff --git a/weapon.js b/weapon.js
index e6d9f41..6dddc3e 100644
--- a/weapon.js
+++ b/weapon.js
@@ -85,7 +85,6 @@ class Gun {
 
     changeState(state){
         this.previousState = state;
-        //console.log(this.constructor.name,"Changing state to",state);
         switch(state){
             case 0:
             case 2: