diff --git a/mods/ENTITIES/mcl_mobs/api/api.lua b/mods/ENTITIES/mcl_mobs/api/api.lua
index fc153a5fe1..96d479b3ff 100644
--- a/mods/ENTITIES/mcl_mobs/api/api.lua
+++ b/mods/ENTITIES/mcl_mobs/api/api.lua
@@ -332,7 +332,7 @@ function mobs:register_mob(name, def)
 		--end j4i stuff
 
 		-- MCL2 extensions
-		teleport = teleport,
+		teleport = mobs.teleport,
 		do_teleport = def.do_teleport,
 		spawn_class = def.spawn_class,
 		ignores_nametag = def.ignores_nametag or false,
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
index e883a36702..f9f886edcd 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/ai.lua
@@ -667,6 +667,17 @@ mobs.mob_step = function(self, dtime)
 		return
 	end
 
+
+	--do custom mob instructions
+	if self.do_custom then
+		print("doing custom instructions")
+		-- when false skip going any further
+		if self.do_custom(self, dtime) == false then
+			--this overrides internal lua collision detection
+			return
+		end
+	end
+
 	local attacking = nil
 
 	--scan for players within eyesight
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/attack_type_instructions.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/attack_type_instructions.lua
index e60c46aab1..ac5561adbf 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/attack_type_instructions.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/attack_type_instructions.lua
@@ -134,6 +134,11 @@ mobs.punch_attack_walk = function(self,dtime)
     end
 
 
+    --auto reset punch_timer
+    if not self.punch_timer then
+        self.punch_timer = 0
+    end
+
     if self.punch_timer > 0 then
         self.punch_timer = self.punch_timer - dtime
     end
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua
index a6d27040e0..528f2b70e9 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/backup_code_api.lua
@@ -309,13 +309,7 @@ local falling = function(self, pos)
 	end
 end
 
-local teleport = function(self, target)
-	if self.do_teleport then
-		if self.do_teleport(self, target) == false then
-			return
-		end
-	end
-end
+
 
 
 -- find someone to runaway from
diff --git a/mods/ENTITIES/mcl_mobs/api/mob_functions/environment.lua b/mods/ENTITIES/mcl_mobs/api/mob_functions/environment.lua
index 41fc4b248e..f81cba6fc9 100644
--- a/mods/ENTITIES/mcl_mobs/api/mob_functions/environment.lua
+++ b/mods/ENTITIES/mcl_mobs/api/mob_functions/environment.lua
@@ -204,4 +204,14 @@ mobs.node_ok = function(pos, fallback)
 	end
 
 	return minetest_registered_nodes[fallback]
+end
+
+
+--a teleport functoin
+mobs.teleport = function(self, target)
+	if self.do_teleport then
+		if self.do_teleport(self, target) == false then
+			return
+		end
+	end
 end
\ No newline at end of file
diff --git a/mods/ENTITIES/mobs_mc/enderman.lua b/mods/ENTITIES/mobs_mc/enderman.lua
index 9c47e98fcc..1d2259816b 100644
--- a/mods/ENTITIES/mobs_mc/enderman.lua
+++ b/mods/ENTITIES/mobs_mc/enderman.lua
@@ -192,18 +192,19 @@ local mobs_griefing = minetest.settings:get_bool("mobs_griefing") ~= false
 mobs:register_mob("mobs_mc:enderman", {
 	type = "monster",
 	spawn_class = "passive",
-	passive = true,
-	pathfinding = 1,
+	neutral = true,
 	hp_min = 40,
 	hp_max = 40,
 	xp_min = 5,
 	xp_max = 5,
+	rotate = 270,
 	collisionbox = {-0.3, -0.01, -0.3, 0.3, 2.89, 0.3},
 	visual = "mesh",
 	mesh = "mobs_mc_enderman.b3d",
 	textures = create_enderman_textures(),
 	visual_size = {x=3, y=3},
 	makes_footstep_sound = true,
+	eye_height = 2.5,
 	sounds = {
 		-- TODO: Custom war cry sound
 		war_cry = "mobs_sandmonster",
@@ -212,8 +213,8 @@ mobs:register_mob("mobs_mc:enderman", {
 		random = {name="mobs_mc_enderman_random", gain=0.5},
 		distance = 16,
 	},
-	walk_velocity = 0.2,
-	run_velocity = 3.4,
+	walk_velocity = 1,
+	run_velocity = 4,
 	damage = 7,
 	reach = 2,
 	drops = {
@@ -281,8 +282,8 @@ mobs:register_mob("mobs_mc:enderman", {
 				--self:teleport(nil)
 				--self.state = ""
 			--else
-				if self.attack then
-					local target = self.attack
+				if self.attacking then
+					local target = self.attacking
 					local pos = target:get_pos()
 					if pos ~= nil then
 						if vector.distance(self.object:get_pos(), target:get_pos()) > 10 then
@@ -359,11 +360,16 @@ mobs:register_mob("mobs_mc:enderman", {
 						--if looking in general head position, turn hostile
 						if minetest.line_of_sight(ender_eye_pos, look_pos_base) and vector.distance(look_pos, ender_eye_pos) <= 0.4 then
 							self.provoked = "staring"
-							self.attack = minetest.get_player_by_name(obj:get_player_name())
+							self.state = "stand"
+							self.hostile = false
 							break
-						else -- I'm not sure what this part does, but I don't want to break anything - jordan4ibanez
+						--begin attacking the player
+						else
 							if self.provoked == "staring" then
 								self.provoked = "broke_contact"
+								self.hostile = true
+								self.state = "attack"
+								self.attacking = obj
 							end						
 						end
 
@@ -556,7 +562,7 @@ mobs:register_mob("mobs_mc:enderman", {
 	water_damage = 8,
 	view_range = 64,
 	fear_height = 4,
-	attack_type = "dogfight",
+	attack_type = "punch",
 })