diff --git a/eastern flames/eastern flames.yyp b/eastern flames/eastern flames.yyp
index 354e2c5..e7ece53 100644
--- a/eastern flames/eastern flames.yyp	
+++ b/eastern flames/eastern flames.yyp	
@@ -51,6 +51,7 @@
     {"id":{"name":"song","path":"scripts/song/song.yy",},"order":1,},
     {"id":{"name":"cpp","path":"scripts/cpp/cpp.yy",},"order":1,},
     {"id":{"name":"log","path":"scripts/log/log.yy",},"order":10,},
+    {"id":{"name":"c_fulleval","path":"scripts/c_fulleval/c_fulleval.yy",},"order":18,},
     {"id":{"name":"keyboard_check_advanced","path":"scripts/keyboard_check_advanced/keyboard_check_advanced.yy",},"order":8,},
     {"id":{"name":"collision_line_width","path":"scripts/collision_line_width/collision_line_width.yy",},"order":9,},
     {"id":{"name":"draw_rectangle_width","path":"scripts/draw_rectangle_width/draw_rectangle_width.yy",},"order":7,},
diff --git a/eastern flames/objects/ARTICULATOR/Create_0.gml b/eastern flames/objects/ARTICULATOR/Create_0.gml
index 1252166..6353d5c 100644
--- a/eastern flames/objects/ARTICULATOR/Create_0.gml	
+++ b/eastern flames/objects/ARTICULATOR/Create_0.gml	
@@ -4,9 +4,11 @@ var i;
 	c_inheritunit(2+i, 2, un.chara);
 }*/
 var chara = c_inheritunit(8, 5, un.chara);
-c_addweapon(chara, wp.knife, false);
-c_addweapon(chara, wp[$"iron sword"], true);
-c_inheritunit(10, 5, un.kris);
+c_addweapon(chara, wp.knife, true);
+c_addweapon(chara, wp[$"iron sword"]);
+var kris = c_inheritunit(10, 5, un.kris);
+c_addweapon(kris, wp[$"iron sword"], true);
 selectedunit = noone;
+hoveredunit = noone;
 global.gw = 640;
 global.gh = 360;
\ No newline at end of file
diff --git a/eastern flames/objects/ARTICULATOR/Draw_64.gml b/eastern flames/objects/ARTICULATOR/Draw_64.gml
index 68c37d0..c6498b9 100644
--- a/eastern flames/objects/ARTICULATOR/Draw_64.gml	
+++ b/eastern flames/objects/ARTICULATOR/Draw_64.gml	
@@ -1,15 +1,15 @@
-if selectedunit != noone {
+if hoveredunit != noone {
 	draw_set_color(c_black);
-	draw_rectangle(global.gw, global.gh, global.gw-100, global.gh-(array_length(selectedunit.inventory)-1)*32-16, false);
+	draw_rectangle(global.gw, global.gh, global.gw-100, global.gh-(array_length(hoveredunit.inventory)-1)*32-16, false);
 	draw_set_color(c_white);
 	var i;
 	draw_set_halign(fa_right);
-	for (i=1; i<array_length(selectedunit.inventory); i++) {
-		draw_text(global.gw-10, global.gh-10-i*20, (selectedunit.equippedweapon == i ? "X " : "  ") + selectedunit.inventory[i].name);
+	for (i=1; i<array_length(hoveredunit.inventory); i++) {
+		draw_text(global.gw-10, global.gh-10-i*20, (hoveredunit.equippedweapon == i ? "X " : "  ") + hoveredunit.inventory[i].name);
 	}
 	draw_set_halign(fa_left);
 	
-	var dudes = c_getstats(selectedunit);
+	var dudes = c_getstats(hoveredunit);
 	draw_set_color(c_black);
 	draw_rectangle(0, 0, 100, (array_length(dudes)-1)*32+16, false);
 	draw_set_color(c_white);
diff --git a/eastern flames/objects/ARTICULATOR/Step_0.gml b/eastern flames/objects/ARTICULATOR/Step_0.gml
index 8e57ab4..7560b25 100644
--- a/eastern flames/objects/ARTICULATOR/Step_0.gml	
+++ b/eastern flames/objects/ARTICULATOR/Step_0.gml	
@@ -25,4 +25,19 @@ if select && selectedunit == noone {
 		}
 		//draw_text(global.gw-10, global.gh-10-i*20;
 	}
+}
+
+var mousex = floor(mouse_x/global.tilesize.x);
+var mousey = floor(mouse_y/global.tilesize.y);
+//log(mousex, mousey);
+hoveredunit = selectedunit;
+if mousex < array_length(global.map) {
+	if mousey < array_length(global.map[mousex]) {
+		var i;
+		for (i=0; i<array_length(global.map[mousex][mousey].contents); i++) {
+			if global.map[mousex][mousey].contents[i].object_index == o_unit {
+				hoveredunit = (global.map[mousex][mousey].contents[i]);
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/eastern flames/scripts/c_fulleval/c_fulleval.gml b/eastern flames/scripts/c_fulleval/c_fulleval.gml
new file mode 100644
index 0000000..00a8bdc
--- /dev/null
+++ b/eastern flames/scripts/c_fulleval/c_fulleval.gml	
@@ -0,0 +1,5 @@
+function c_fulleval(target) {
+	c_modifierreset(target);
+	c_modeval(target, target.inventory[target.equippedweapon]);
+	c_modeval(target, c_gettile(target.pos.x, target.pos.y));
+}
\ No newline at end of file
diff --git a/eastern flames/scripts/c_fulleval/c_fulleval.yy b/eastern flames/scripts/c_fulleval/c_fulleval.yy
new file mode 100644
index 0000000..1c21618
--- /dev/null
+++ b/eastern flames/scripts/c_fulleval/c_fulleval.yy	
@@ -0,0 +1,12 @@
+{
+  "isDnD": false,
+  "isCompatibility": false,
+  "parent": {
+    "name": "Scripts",
+    "path": "folders/Scripts.yy",
+  },
+  "resourceVersion": "1.0",
+  "name": "c_fulleval",
+  "tags": [],
+  "resourceType": "GMScript",
+}
\ No newline at end of file
diff --git a/eastern flames/scripts/c_moveunit/c_moveunit.gml b/eastern flames/scripts/c_moveunit/c_moveunit.gml
index 3547b8b..b83b600 100644
--- a/eastern flames/scripts/c_moveunit/c_moveunit.gml	
+++ b/eastern flames/scripts/c_moveunit/c_moveunit.gml	
@@ -3,4 +3,5 @@ function c_moveunit(targetunit, destination) {
 	array_push(destination.contents, targetunit);
 	targetunit.pos.x = destination.x;
 	targetunit.pos.y = destination.y;
+	
 }
\ No newline at end of file
diff --git a/eastern flames/scripts/c_selectunit/c_selectunit.gml b/eastern flames/scripts/c_selectunit/c_selectunit.gml
index 7fa162a..b51c9f3 100644
--- a/eastern flames/scripts/c_selectunit/c_selectunit.gml	
+++ b/eastern flames/scripts/c_selectunit/c_selectunit.gml	
@@ -13,6 +13,7 @@ function c_selectunit(unitobject) {
 		}
 	}
 	ARTICULATOR.selectedunit = unitobject;
+	c_fulleval(unitobject);
 	return unitobject;
 }
 
@@ -25,6 +26,7 @@ function c_deselectunit(unitobject) {
 	c_decolor_all(c_red);
 	c_decolor_all(c_green);
 	ARTICULATOR.selectedunit = noone;
+	c_fulleval(unitobject);
 	return true;
 }
 
diff --git a/eastern flames/scripts/weapon/weapon.gml b/eastern flames/scripts/weapon/weapon.gml
index dfaf727..f175f60 100644
--- a/eastern flames/scripts/weapon/weapon.gml	
+++ b/eastern flames/scripts/weapon/weapon.gml	
@@ -29,11 +29,7 @@ function c_addweapon(target, weapon_, equip=false) {
 }
 
 function c_equipweapon(target, weapon_) {
-	log(target.data.str.val);
-	c_modifierreset(target);
-	log(target.data.str.val);
-	c_wpeval(target, weapon_);
-	log(target.data.str.val);
+	c_fulleval(target);
 }
 nu weapon("nothing", "it's literally nothing", WPTYPE.NULL);
 nu weapon("knife", "bleed, bleed", WPTYPE.SWORD, [new statmod(st.str, 20, add), new statmod(st.hit, 100, add)]);
@@ -53,7 +49,7 @@ function c_modifierreset(target) {
 	}
 }
 
-function c_wpeval(target, weapon_) {
+function c_modeval(target, weapon_) {
 	var lads = variable_struct_get_names(target.data);
 	var dudes = variable_struct_get_names(weapon_.modifiers);
 	var i;