diff --git a/ActionRPG-HeartBeast/Camera2D.gd b/ActionRPG-HeartBeast/Camera2D.gd
new file mode 100644
index 0000000..187c0eb
--- /dev/null
+++ b/ActionRPG-HeartBeast/Camera2D.gd
@@ -0,0 +1,10 @@
+extends Camera2D
+
+onready var topLeft = $Limits/TopLeft
+onready var bottomRight = $Limits/BottomRight
+
+func _ready():
+	limit_top = topLeft.position.y
+	limit_left = topLeft.position.x
+	limit_bottom = bottomRight.position.y
+	limit_right = bottomRight.position.x
diff --git a/ActionRPG-HeartBeast/Camera2D.tscn b/ActionRPG-HeartBeast/Camera2D.tscn
new file mode 100644
index 0000000..f941259
--- /dev/null
+++ b/ActionRPG-HeartBeast/Camera2D.tscn
@@ -0,0 +1,19 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://Camera2D.gd" type="Script" id=1]
+
+[node name="Camera2D" type="Camera2D"]
+position = Vector2( 160, 90 )
+current = true
+smoothing_enabled = true
+script = ExtResource( 1 )
+
+[node name="Limits" type="Node" parent="."]
+
+[node name="TopLeft" type="Position2D" parent="Limits"]
+__meta__ = {
+"_gizmo_extents_": 10.2
+}
+
+[node name="BottomRight" type="Position2D" parent="Limits"]
+position = Vector2( 320, 180 )
diff --git a/ActionRPG-HeartBeast/Overlap/Hurtbox.gd b/ActionRPG-HeartBeast/Overlap/Hurtbox.gd
index 35c74df..da32e3d 100644
--- a/ActionRPG-HeartBeast/Overlap/Hurtbox.gd
+++ b/ActionRPG-HeartBeast/Overlap/Hurtbox.gd
@@ -5,7 +5,7 @@ const HitEffect = preload("res://Effects/HitEffect.tscn")
 var invincible = false setget set_invincible
 
 onready var timer = $Timer
-
+onready var collisionShape = $CollisionShape2D
 signal invincibility_started
 signal invincibility_ended
 
@@ -30,7 +30,7 @@ func _on_Timer_timeout():
 	self.invincible = false
 
 func _on_Hurtbox_invincibility_ended():
-	monitorable = true
+	collisionShape.disabled = false
 
 func _on_Hurtbox_invincibility_started():
-	set_deferred("monitorable", false)
+	collisionShape.set_deferred("disabled", true)
diff --git a/ActionRPG-HeartBeast/World.tscn b/ActionRPG-HeartBeast/World.tscn
index d801b76..6ee77a9 100644
--- a/ActionRPG-HeartBeast/World.tscn
+++ b/ActionRPG-HeartBeast/World.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=64 format=2]
+[gd_scene load_steps=65 format=2]
 
 [ext_resource path="res://World/Bush.tscn" type="PackedScene" id=1]
 [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=2]
@@ -10,6 +10,7 @@
 [ext_resource path="res://Enemies/Bat.tscn" type="PackedScene" id=8]
 [ext_resource path="res://UI/HealthUI.tscn" type="PackedScene" id=9]
 [ext_resource path="res://World/Tree.tscn" type="PackedScene" id=10]
+[ext_resource path="res://Camera2D.tscn" type="PackedScene" id=11]
 
 [sub_resource type="TileSet" id=1]
 0/name = "DirtTileset.png 0"
@@ -540,12 +541,16 @@ tile_set = SubResource( 2 )
 cell_size = Vector2( 32, 32 )
 collision_mask = 0
 format = 1
-tile_data = PoolIntArray( -655377, 0, 4, -655376, 0, 196609, -655375, 0, 196609, -655374, 0, 196609, -655373, 0, 196609, -655372, 0, 196609, -655371, 0, 196609, -655370, 0, 196609, -655369, 0, 196609, -655368, 0, 196609, -655367, 0, 196609, -655366, 0, 196609, -655365, 0, 196609, -655364, 0, 196609, -655363, 0, 196609, -655362, 0, 196609, -655361, 0, 196609, -720896, 0, 196609, -720895, 0, 196609, -720894, 0, 196609, -720893, 0, 196609, -720892, 0, 196609, -720891, 0, 196609, -720890, 0, 196609, -720889, 0, 196609, -720888, 0, 196609, -720887, 0, 196609, -720886, 0, 196609, -720885, 0, 196609, -720884, 0, 196609, -720883, 0, 196609, -720882, 0, 196609, -720881, 0, 196609, -720880, 0, 196609, -720879, 0, 196609, -720878, 0, 196609, -720877, 0, 196609, -720876, 0, 196609, -720875, 0, 196609, -720874, 0, 196609, -720873, 0, 196609, -720872, 0, 196609, -720871, 0, 196609, -720870, 0, 7, -589841, 0, 65539, -655334, 0, 65539, -524305, 0, 65539, -589798, 0, 65539, -458769, 0, 65539, -524262, 0, 65539, -393233, 0, 65539, -458726, 0, 65539, -327697, 0, 65539, -393190, 0, 65539, -262161, 0, 65539, -327654, 0, 65539, -196625, 0, 65539, -262135, 0, 0, -262134, 0, 1, -262133, 0, 1, -262132, 0, 1, -262131, 0, 2, -262118, 0, 65539, -131089, 0, 65539, -196600, 0, 196608, -196599, 0, 196614, -196598, 0, 131073, -196597, 0, 65544, -196596, 0, 131073, -196595, 0, 131074, -196582, 0, 65539, -65553, 0, 65539, -131061, 0, 65539, -131047, 0, 0, -131046, 0, 131079, -17, 0, 65539, -65526, 0, 4, -65525, 0, 196615, -65513, 0, 0, -65512, 0, 1, -65511, 0, 131078, -65510, 0, 65538, 65519, 0, 65539, 0, 0, 4, 1, 0, 196609, 2, 0, 196609, 3, 0, 196610, 7, 0, 196608, 8, 0, 196609, 9, 0, 8, 10, 0, 196615, 22, 0, 0, 23, 0, 131078, 24, 0, 65537, 25, 0, 65537, 26, 0, 65538, 131055, 0, 65539, 65536, 0, 131075, 65545, 0, 131075, 65558, 0, 65536, 65559, 0, 65537, 65560, 0, 65537, 65561, 0, 65537, 65562, 0, 65538, 196591, 0, 65539, 131094, 0, 131072, 131095, 0, 65542, 131096, 0, 65537, 131097, 0, 65537, 131098, 0, 65538, 262127, 0, 65539, 196611, 0, 3, 196617, 0, 3, 196631, 0, 65536, 196632, 0, 65537, 196633, 0, 65537, 196634, 0, 65538, 327663, 0, 65539, 262144, 0, 0, 262145, 0, 1, 262146, 0, 1, 262147, 0, 131079, 262152, 0, 196608, 262153, 0, 131081, 262154, 0, 1, 262155, 0, 1, 262156, 0, 2, 262167, 0, 131072, 262168, 0, 65542, 262169, 0, 65537, 262170, 0, 65538, 393199, 0, 65539, 327680, 0, 131072, 327681, 0, 131073, 327682, 0, 131073, 327683, 0, 131074, 327689, 0, 131072, 327690, 0, 65542, 327691, 0, 65541, 327692, 0, 131074, 327704, 0, 131072, 327705, 0, 131073, 327706, 0, 65543, 458735, 0, 65539, 393226, 0, 65540, 393227, 0, 131074, 393242, 0, 65539, 524271, 0, 65539, 458762, 0, 131075, 458778, 0, 65539, 589807, 0, 65539, 524290, 0, 0, 524291, 0, 2, 524311, 0, 4, 524312, 0, 196609, 524313, 0, 196609, 524314, 0, 262151, 655343, 0, 65539, 589826, 0, 131072, 589827, 0, 131074, 589847, 0, 65539, 589850, 0, 65539, 720879, 0, 65539, 655366, 0, 3, 655380, 0, 4, 655381, 0, 196610, 655383, 0, 131075, 655386, 0, 65539, 786415, 0, 65539, 720902, 0, 262148, 720903, 0, 196610, 720915, 0, 4, 720916, 0, 196615, 720921, 0, 0, 720922, 0, 131079, 851951, 0, 65539, 786438, 0, 65539, 786450, 0, 4, 786451, 0, 196615, 786454, 0, 196608, 786455, 0, 196609, 786456, 0, 196609, 786457, 0, 196614, 786458, 0, 65543, 917487, 0, 65539, 851972, 0, 4, 851973, 0, 196609, 851974, 0, 196616, 851975, 0, 7, 851985, 0, 4, 851986, 0, 196615, 851989, 0, 196611, 851994, 0, 65539, 983023, 0, 65539, 917507, 0, 0, 917508, 0, 131079, 917511, 0, 196612, 917512, 0, 196609, 917513, 0, 7, 917520, 0, 4, 917521, 0, 196615, 917526, 0, 196608, 917527, 0, 196610, 917530, 0, 65539, 1048559, 0, 65539, 983042, 0, 0, 983043, 0, 131078, 983044, 0, 65538, 983049, 0, 131076, 983050, 0, 2, 983055, 0, 0, 983056, 0, 131079, 983066, 0, 65539, 1114095, 0, 196612, 1114096, 0, 196609, 1114097, 0, 196609, 1114098, 0, 196609, 1114099, 0, 196609, 1114100, 0, 196609, 1114101, 0, 196609, 1114102, 0, 196609, 1114103, 0, 196609, 1114104, 0, 196609, 1114105, 0, 196609, 1114106, 0, 196609, 1114107, 0, 196609, 1114108, 0, 196609, 1114109, 0, 196609, 1114110, 0, 196609, 1114111, 0, 196609, 1048576, 0, 196609, 1048577, 0, 196609, 1048578, 0, 196614, 1048579, 0, 131073, 1048580, 0, 196613, 1048581, 0, 196609, 1048582, 0, 196609, 1048583, 0, 196609, 1048584, 0, 196609, 1048585, 0, 196614, 1048586, 0, 196613, 1048587, 0, 196609, 1048588, 0, 196609, 1048589, 0, 196609, 1048590, 0, 196609, 1048591, 0, 196614, 1048592, 0, 196613, 1048593, 0, 196609, 1048594, 0, 196609, 1048595, 0, 196609, 1048596, 0, 196609, 1048597, 0, 196609, 1048598, 0, 196609, 1048599, 0, 196609, 1048600, 0, 196609, 1048601, 0, 196609, 1048602, 0, 196615 )
+tile_data = PoolIntArray( -655377, 0, 4, -655376, 0, 196609, -655375, 0, 196609, -655374, 0, 196609, -655373, 0, 196609, -655372, 0, 196609, -655371, 0, 196609, -655370, 0, 196609, -655369, 0, 196609, -655368, 0, 196609, -655367, 0, 196609, -655366, 0, 196609, -655365, 0, 196609, -655364, 0, 196609, -655363, 0, 196609, -655362, 0, 196609, -655361, 0, 8, -720896, 0, 196609, -720895, 0, 196609, -720894, 0, 196609, -720893, 0, 196609, -720892, 0, 196609, -720891, 0, 196609, -720890, 0, 6, -720889, 0, 1, -720888, 0, 1, -720887, 0, 5, -720886, 0, 196609, -720885, 0, 196609, -720884, 0, 196609, -720883, 0, 196609, -720882, 0, 196609, -720881, 0, 196609, -720880, 0, 196609, -720879, 0, 196609, -720878, 0, 196609, -720877, 0, 196609, -720876, 0, 196609, -720875, 0, 196609, -720874, 0, 196609, -720873, 0, 196609, -720872, 0, 196609, -720871, 0, 196609, -720870, 0, 7, -589841, 0, 65539, -589825, 0, 65539, -655354, 0, 131072, -655353, 0, 65542, -655352, 0, 65537, -655351, 0, 65538, -655334, 0, 65539, -524305, 0, 65539, -524289, 0, 65539, -589820, 0, 3, -589817, 0, 131072, -589816, 0, 131073, -589815, 0, 131074, -589807, 0, 196608, -589806, 0, 6, -589805, 0, 2, -589798, 0, 65539, -458769, 0, 65539, -458753, 0, 65539, -524285, 0, 0, -524284, 0, 131079, -524270, 0, 65540, -524269, 0, 131074, -524262, 0, 65539, -393233, 0, 65539, -393217, 0, 65539, -458749, 0, 65540, -458748, 0, 131074, -458734, 0, 131075, -458726, 0, 65539, -327697, 0, 65539, -327681, 0, 65539, -393213, 0, 131075, -393190, 0, 65539, -262161, 0, 65539, -262145, 0, 65539, -327658, 0, 0, -327657, 0, 1, -327656, 0, 1, -327655, 0, 1, -327654, 0, 131079, -196625, 0, 65539, -196609, 0, 65539, -262135, 0, 0, -262134, 0, 1, -262133, 0, 1, -262132, 0, 1, -262131, 0, 2, -262123, 0, 0, -262122, 0, 65545, -262121, 0, 131073, -262120, 0, 131073, -262119, 0, 131073, -262118, 0, 65543, -131089, 0, 65539, -131073, 0, 65539, -196600, 0, 196608, -196599, 0, 196614, -196598, 0, 131073, -196597, 0, 65544, -196596, 0, 131073, -196595, 0, 131074, -196588, 0, 196608, -196587, 0, 196614, -196586, 0, 131074, -196582, 0, 65539, -65553, 0, 65539, -65537, 0, 65539, -131061, 0, 65539, -131047, 0, 0, -131046, 0, 131079, -17, 0, 65539, -1, 0, 65539, -65526, 0, 4, -65525, 0, 196615, -65513, 0, 0, -65512, 0, 1, -65511, 0, 131078, -65510, 0, 65538, 65519, 0, 65539, 65535, 0, 131076, 0, 0, 5, 1, 0, 196609, 2, 0, 196609, 3, 0, 196610, 7, 0, 196608, 8, 0, 196609, 9, 0, 8, 10, 0, 196615, 22, 0, 0, 23, 0, 131078, 24, 0, 65537, 25, 0, 65537, 26, 0, 65538, 131055, 0, 65539, 131071, 0, 65540, 65536, 0, 131074, 65545, 0, 131075, 65558, 0, 65536, 65559, 0, 65537, 65560, 0, 65537, 65561, 0, 65537, 65562, 0, 65538, 196591, 0, 65539, 196607, 0, 65539, 131094, 0, 131072, 131095, 0, 65542, 131096, 0, 65537, 131097, 0, 65537, 131098, 0, 65538, 262127, 0, 65539, 262143, 0, 65539, 196611, 0, 3, 196617, 0, 3, 196631, 0, 65536, 196632, 0, 65537, 196633, 0, 65537, 196634, 0, 65538, 327663, 0, 65539, 327679, 0, 131076, 262144, 0, 1, 262145, 0, 1, 262146, 0, 1, 262147, 0, 131079, 262152, 0, 196608, 262153, 0, 131081, 262154, 0, 1, 262155, 0, 1, 262156, 0, 2, 262167, 0, 131072, 262168, 0, 65542, 262169, 0, 65537, 262170, 0, 65538, 393199, 0, 65539, 393215, 0, 65540, 327680, 0, 131073, 327681, 0, 131073, 327682, 0, 131073, 327683, 0, 131074, 327689, 0, 131072, 327690, 0, 65542, 327691, 0, 65541, 327692, 0, 131074, 327704, 0, 131072, 327705, 0, 131073, 327706, 0, 65543, 458735, 0, 65539, 458751, 0, 65539, 393226, 0, 65540, 393227, 0, 131074, 393242, 0, 65539, 524271, 0, 65539, 524287, 0, 65539, 458762, 0, 131075, 458778, 0, 65539, 589807, 0, 65539, 589823, 0, 65539, 524290, 0, 0, 524291, 0, 2, 524311, 0, 4, 524312, 0, 196609, 524313, 0, 196609, 524314, 0, 262151, 655343, 0, 65539, 655359, 0, 65539, 589826, 0, 131072, 589827, 0, 131074, 589839, 0, 0, 589840, 0, 2, 589847, 0, 65539, 589850, 0, 65539, 720879, 0, 65539, 720895, 0, 65539, 655366, 0, 3, 655374, 0, 196608, 655375, 0, 196617, 655376, 0, 131074, 655380, 0, 4, 655381, 0, 196610, 655383, 0, 131075, 655386, 0, 65539, 786415, 0, 65539, 786431, 0, 65539, 720902, 0, 262148, 720903, 0, 196610, 720911, 0, 65539, 720915, 0, 4, 720916, 0, 196615, 720921, 0, 0, 720922, 0, 131079, 851951, 0, 65539, 851967, 0, 65539, 786438, 0, 65539, 786447, 0, 131075, 786450, 0, 4, 786451, 0, 196615, 786454, 0, 196608, 786455, 0, 196609, 786456, 0, 196609, 786457, 0, 196614, 786458, 0, 65543, 917487, 0, 65539, 917503, 0, 65539, 851972, 0, 4, 851973, 0, 196609, 851974, 0, 196616, 851975, 0, 7, 851985, 0, 4, 851986, 0, 196615, 851989, 0, 196611, 851994, 0, 65539, 983023, 0, 65539, 983039, 0, 65539, 917507, 0, 0, 917508, 0, 131079, 917511, 0, 196612, 917512, 0, 196609, 917513, 0, 7, 917520, 0, 4, 917521, 0, 196615, 917526, 0, 196608, 917527, 0, 196610, 917530, 0, 65539, 1048559, 0, 65539, 1048575, 0, 65539, 983042, 0, 0, 983043, 0, 131078, 983044, 0, 65538, 983049, 0, 131076, 983050, 0, 2, 983055, 0, 0, 983056, 0, 131079, 983066, 0, 65539, 1114095, 0, 196612, 1114096, 0, 196609, 1114097, 0, 196609, 1114098, 0, 196609, 1114099, 0, 196609, 1114100, 0, 196609, 1114101, 0, 196609, 1114102, 0, 196609, 1114103, 0, 196609, 1114104, 0, 196609, 1114105, 0, 196609, 1114106, 0, 196609, 1114107, 0, 196609, 1114108, 0, 196609, 1114109, 0, 196609, 1114110, 0, 196609, 1114111, 0, 196616, 1048576, 0, 196609, 1048577, 0, 196609, 1048578, 0, 196614, 1048579, 0, 131073, 1048580, 0, 196613, 1048581, 0, 196609, 1048582, 0, 196609, 1048583, 0, 196609, 1048584, 0, 196609, 1048585, 0, 196614, 1048586, 0, 196613, 1048587, 0, 196609, 1048588, 0, 196609, 1048589, 0, 196609, 1048590, 0, 196609, 1048591, 0, 196614, 1048592, 0, 196613, 1048593, 0, 196609, 1048594, 0, 196609, 1048595, 0, 196609, 1048596, 0, 196609, 1048597, 0, 196609, 1048598, 0, 196609, 1048599, 0, 196609, 1048600, 0, 196609, 1048601, 0, 196609, 1048602, 0, 196615 )
 
-[node name="Camera2D" type="Camera2D" parent="."]
+[node name="Camera2D" parent="." instance=ExtResource( 11 )]
 position = Vector2( 167, 111 )
-current = true
-smoothing_enabled = true
+
+[node name="TopLeft" parent="Camera2D/Limits" index="0"]
+position = Vector2( -32, -352 )
+
+[node name="BottomRight" parent="Camera2D/Limits" index="1"]
+position = Vector2( 872, 544 )
 
 [node name="YSort" type="YSort" parent="."]
 
@@ -678,6 +683,21 @@ position = Vector2( 274, 89 )
 [node name="Bat3" parent="YSort" instance=ExtResource( 8 )]
 position = Vector2( 37, 90 )
 
+[node name="Bat4" parent="YSort" instance=ExtResource( 8 )]
+position = Vector2( 182, 3 )
+
+[node name="Bat5" parent="YSort" instance=ExtResource( 8 )]
+position = Vector2( 448, 124 )
+
+[node name="Bat6" parent="YSort" instance=ExtResource( 8 )]
+position = Vector2( 377, 327 )
+
+[node name="Bat7" parent="YSort" instance=ExtResource( 8 )]
+position = Vector2( 549, -102 )
+
+[node name="Bat8" parent="YSort" instance=ExtResource( 8 )]
+position = Vector2( 211, -134 )
+
 [node name="Control" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
@@ -687,3 +707,5 @@ margin_bottom = 40.0
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
 
 [node name="HealthUI" parent="CanvasLayer" instance=ExtResource( 9 )]
+
+[editable path="Camera2D"]
diff --git a/ActionRPG-HeartBeast/build/.DS_Store b/ActionRPG-HeartBeast/build/.DS_Store
index 88857a6..ca7ea91 100644
Binary files a/ActionRPG-HeartBeast/build/.DS_Store and b/ActionRPG-HeartBeast/build/.DS_Store differ
diff --git a/ActionRPG-HeartBeast/build/web/.DS_Store b/ActionRPG-HeartBeast/build/web/.DS_Store
index fdade54..6f48151 100644
Binary files a/ActionRPG-HeartBeast/build/web/.DS_Store and b/ActionRPG-HeartBeast/build/web/.DS_Store differ
diff --git a/ActionRPG-HeartBeast/build/web/ActionRPG-web.zip b/ActionRPG-HeartBeast/build/web/ActionRPG.zip
similarity index 76%
rename from ActionRPG-HeartBeast/build/web/ActionRPG-web.zip
rename to ActionRPG-HeartBeast/build/web/ActionRPG.zip
index 2a30c3c..73dcdbe 100644
Binary files a/ActionRPG-HeartBeast/build/web/ActionRPG-web.zip and b/ActionRPG-HeartBeast/build/web/ActionRPG.zip differ
diff --git a/ActionRPG-HeartBeast/build/web/index.html b/ActionRPG-HeartBeast/build/web/index.html
index c0d59f7..17d4974 100644
--- a/ActionRPG-HeartBeast/build/web/index.html
+++ b/ActionRPG-HeartBeast/build/web/index.html
@@ -139,7 +139,7 @@
 	<script type='text/javascript' src='index.js'></script>
 	<script type='text/javascript'>//<![CDATA[
 
-		const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":2313264,"index.wasm":13790961},"focusCanvas":true,"gdnativeLibs":[]};
+		const GODOT_CONFIG = {"args":[],"canvasResizePolicy":2,"executable":"index","experimentalVK":false,"fileSizes":{"index.pck":2316416,"index.wasm":13790961},"focusCanvas":true,"gdnativeLibs":[]};
 		var engine = new Engine(GODOT_CONFIG);
 
 		(function() {
diff --git a/ActionRPG-HeartBeast/build/web/index.pck b/ActionRPG-HeartBeast/build/web/index.pck
index c55b574..e0d9234 100644
Binary files a/ActionRPG-HeartBeast/build/web/index.pck and b/ActionRPG-HeartBeast/build/web/index.pck differ
diff --git a/ActionRPG-HeartBeast/project.godot b/ActionRPG-HeartBeast/project.godot
index 13790fa..0e7e860 100644
--- a/ActionRPG-HeartBeast/project.godot
+++ b/ActionRPG-HeartBeast/project.godot
@@ -22,9 +22,11 @@ PlayerStats="*res://Player/PlayerStats.tscn"
 
 window/size/width=320
 window/size/height=180
-window/size/test_width=1280
-window/size/test_height=720
+window/size/test_width=1920
+window/size/test_height=1080
+window/dpi/allow_hidpi=true
 window/stretch/mode="2d"
+window/stretch/aspect="keep"
 
 [gui]