diff --git a/LICENSE b/LICENSE
old mode 100755
new mode 100644
diff --git a/core/element.lua b/core/element.lua
old mode 100755
new mode 100644
index 8af6127..d00b3f2
--- a/core/element.lua
+++ b/core/element.lua
@@ -218,8 +218,8 @@ function element:setup()
 			__newindex = function(t, index, val)
 				if self.baseState[index] ~= val then
 					self.baseState[index] = val
-					if self.element.baseState.onUpdate then
-						self.element.baseState.onUpdate()
+					if self.baseState.onUpdate then
+						self.baseState.onUpdate()
 					end
 					self.context:bubbleUpdate()
 				end
@@ -340,8 +340,8 @@ function element:draw(x, y)
 	end
 
 	if self.settings.firstDraw then
-		if self.element.baseState.onFirstDraw then
-			self.element.baseState.onFirstDraw()
+		if self.baseState.onFirstDraw then
+			self.baseState.onFirstDraw()
 		end
 		self.settings.firstDraw = false
 	end
@@ -360,8 +360,8 @@ function element:draw(x, y)
 end
 
 function element:undraw()
-	if self.element.baseState.onDestroy then
-		self.element.baseState.onDestroy()
+	if self.baseState.onDestroy then
+		self.baseState.onDestroy()
 	end
 	self.settings.remove  = true
 	self.settings.firstDraw = true
diff --git a/core/input.lua b/core/input.lua
old mode 100755
new mode 100644
index 1f8f763..ba70283
--- a/core/input.lua
+++ b/core/input.lua
@@ -474,7 +474,7 @@ function input.eventHandlers.mousemoved(x, y, dx, dy)
 			local succ = sub:checkInside(x, y)
 
 			if sub.active and not sub.currentEvent and succ then
-				sub.cleanUp      = sub:emit(x, y) or dummyfunc
+				sub.cleanUp      = sub:emit(x, y, dx, dy) or dummyfunc
 				sub.currentEvent = true
 				captured         = true
 			elseif sub.currentEvent and not succ then
diff --git a/dummy.lua b/dummy.lua
old mode 100755
new mode 100644
diff --git a/init.lua b/init.lua
old mode 100755
new mode 100644
diff --git a/utils.lua b/utils.lua
old mode 100755
new mode 100644