diff --git a/src/shattered_sword/GameSystems/BattleManager.ts b/src/shattered_sword/GameSystems/BattleManager.ts
index a2b27ce..5157a17 100644
--- a/src/shattered_sword/GameSystems/BattleManager.ts
+++ b/src/shattered_sword/GameSystems/BattleManager.ts
@@ -22,11 +22,9 @@ export default class BattleManager {
                         enemy.damage(Math.round(weapon.type.damage * (<PlayerController>this.players[0]).CURRENT_ATK/100));
                         //console.log("enemy took dmg");
                         
-                        //TODO - test shield, 
                         //add checking for each onhit buff here
                         let player = (<PlayerController>this.players[0]);
-
-                        player.addShield(1);
+                        
                         //DOTS
                         if(player.hasBleed){
                             (<EnemyAI>enemy).bleedCounter +=3;
@@ -52,7 +50,9 @@ export default class BattleManager {
             for (let player of this.players) {
                 if (weapon.hits(player.owner)) {
                     (<PlayerController>player).damage(weapon.type.damage, user);
-
+                    if((<PlayerController>player).hasShield){
+                        (<PlayerController>player).addShield(weapon.type.damage * .5);  //half of dmg taken is converted to shield
+                    }
                 }
             }
         }
diff --git a/src/shattered_sword/Player/PlayerController.ts b/src/shattered_sword/Player/PlayerController.ts
index 29466ce..36d029e 100644
--- a/src/shattered_sword/Player/PlayerController.ts
+++ b/src/shattered_sword/Player/PlayerController.ts
@@ -300,7 +300,10 @@ export default class PlayerController extends StateMachineAI implements BattlerA
      * @param health health to give player
      */
     addHealth(health : number){
-        this.CURRENT_HP = (this.CURRENT_HP + health) %this.MAX_HP + this.CURRENT_BUFFS.hp;
+        this.CURRENT_HP += health;
+        if(this.CURRENT_HP > this.MAX_HP + this.CURRENT_BUFFS.hp){
+            this.CURRENT_HP = this.MAX_HP + this.CURRENT_BUFFS.hp;
+        }
     }
 
     /**