diff --git a/source/ManualBindings.cpp b/source/ManualBindings.cpp
index f9ff44382..7e3417ceb 100644
--- a/source/ManualBindings.cpp
+++ b/source/ManualBindings.cpp
@@ -169,7 +169,7 @@ cPlugin_NewLua * GetLuaPlugin(lua_State * L)
 
 
 
-	
+
 template<
 	class Ty1,
 	class Ty2,
@@ -177,87 +177,177 @@ template<
 	>
 static int tolua_DoWith(lua_State* tolua_S)
 {
-	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */ 
-	if ((NumArgs != 2) && (NumArgs != 3)) 
+	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */
+	if ((NumArgs != 2) && (NumArgs != 3))
 	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Requires 2 or 3 arguments, got %i", NumArgs);
-	} 
+	}
 
-	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0); 
+	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0);
 
-	const char * ItemName = tolua_tocppstring(tolua_S, 2, ""); 
-	if ((ItemName == NULL) || (ItemName[0] == 0)) 
-	{ 
-		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a non-empty string for parameter #1", NumArgs);
-	} 
-	if (!lua_isfunction( tolua_S, 3)) 
-	{ 
-		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #2", NumArgs);
-	} 
-
-	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */ 
-	int TableRef = LUA_REFNIL; 
-	if (NumArgs == 3) 
-	{ 
-		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-		if (TableRef == LUA_REFNIL) 
-		{ 
-			return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get value reference of parameter #3", NumArgs);
-		} 
-	} 
-
-	/* table value is popped, and now function is on top of the stack */ 
-	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-	if (FuncRef == LUA_REFNIL) 
-	{ 
-		return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get function reference of parameter #2", NumArgs);
-	} 
-
-	class cLuaCallback : public cItemCallback<Ty2> 
+	const char * ItemName = tolua_tocppstring(tolua_S, 2, "");
+	if ((ItemName == NULL) || (ItemName[0] == 0))
 	{
-	public: 
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef) 
-			: LuaState( a_LuaState ) 
-			, FuncRef( a_FuncRef ) 
-			, TableRef( a_TableRef ) 
-		{} 
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a non-empty string for parameter #1", NumArgs);
+	}
+	if (!lua_isfunction( tolua_S, 3))
+	{
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #2", NumArgs);
+	}
 
-	private: 
-		virtual bool Item(Ty2 * a_Item) override 
-		{ 
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */ 
+	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */
+	int TableRef = LUA_REFNIL;
+	if (NumArgs == 3)
+	{
+		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+		if (TableRef == LUA_REFNIL)
+		{
+			return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get value reference of parameter #3", NumArgs);
+		}
+	}
+
+	/* table value is popped, and now function is on top of the stack */
+	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+	if (FuncRef == LUA_REFNIL)
+	{
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get function reference of parameter #2", NumArgs);
+	}
+
+	class cLuaCallback : public cItemCallback<Ty2>
+	{
+	public:
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
+			: LuaState( a_LuaState )
+			, FuncRef( a_FuncRef )
+			, TableRef( a_TableRef )
+		{}
+
+	private:
+		virtual bool Item(Ty2 * a_Item) override
+		{
+			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
 			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
-			if (TableRef != LUA_REFNIL) 
-			{ 
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */ 
-			} 
+			if (TableRef != LUA_REFNIL)
+			{
+				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+			}
 
-			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0); 
+			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
 			if (report_errors(LuaState, s))
 			{
 				return true;  // Abort enumeration
 			}
-			if (lua_isboolean(LuaState, -1)) 
-			{ 
-				return (tolua_toboolean(LuaState, -1, 0) > 0); 
-			} 
-			return false;  /* Continue enumeration */ 
-		} 
-		lua_State * LuaState; 
-		int FuncRef; 
-		int TableRef; 
-	} Callback(tolua_S, FuncRef, TableRef); 
+			if (lua_isboolean(LuaState, -1))
+			{
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
+			}
+			return false;  /* Continue enumeration */
+		}
+		lua_State * LuaState;
+		int FuncRef;
+		int TableRef;
+	} Callback(tolua_S, FuncRef, TableRef);
 
 	
 	bool bRetVal = (self->*Func1)(ItemName, Callback);
 
-	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */ 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef); 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef); 
+	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef);
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef);
 
-	/* Push return value on stack */ 
-	tolua_pushboolean(tolua_S, bRetVal ); 
-	return 1; 
+	/* Push return value on stack */
+	tolua_pushboolean(tolua_S, bRetVal );
+	return 1;
+}
+
+
+
+
+
+template<
+	class Ty1,
+	class Ty2,
+	bool (Ty1::*Func1)(int, cItemCallback<Ty2> &)
+>
+static int tolua_DoWithID(lua_State* tolua_S)
+{
+	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */
+	if ((NumArgs != 2) && (NumArgs != 3))
+	{
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Requires 2 or 3 arguments, got %i", NumArgs);
+	}
+
+	Ty1 * self = (Ty1 *)tolua_tousertype(tolua_S, 1, 0);
+
+	int ItemID = (int)tolua_tonumber(tolua_S, 2, 0);
+	if (!lua_isfunction(tolua_S, 3))
+	{
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #2", NumArgs);
+	}
+
+	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */
+	int TableRef = LUA_REFNIL;
+	if (NumArgs == 3)
+	{
+		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+		if (TableRef == LUA_REFNIL)
+		{
+			return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get value reference of parameter #3", NumArgs);
+		}
+	}
+
+	/* table value is popped, and now function is on top of the stack */
+	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+	if (FuncRef == LUA_REFNIL)
+	{
+		return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get function reference of parameter #2", NumArgs);
+	}
+
+	class cLuaCallback : public cItemCallback<Ty2>
+	{
+	public:
+		cLuaCallback(lua_State * a_LuaState, int a_FuncRef, int a_TableRef) :
+			LuaState(a_LuaState),
+			FuncRef(a_FuncRef),
+			TableRef(a_TableRef)
+		{}
+
+	private:
+		virtual bool Item(Ty2 * a_Item) override
+		{
+			lua_rawgeti(LuaState, LUA_REGISTRYINDEX, FuncRef);            // Push function to call
+			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());  // Push the item
+			if (TableRef != LUA_REFNIL)
+			{
+				lua_rawgeti(LuaState, LUA_REGISTRYINDEX, TableRef);         // Push the optional callbackdata param
+			}
+
+			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
+			if (report_errors(LuaState, s))
+			{
+				return true;  // Abort enumeration
+			}
+			if (lua_isboolean(LuaState, -1))
+			{
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
+			}
+			return false;  /* Continue enumeration */
+		}
+		lua_State * LuaState;
+		int FuncRef;
+		int TableRef;
+	} Callback(tolua_S, FuncRef, TableRef);
+
+	
+	bool bRetVal = (self->*Func1)(ItemID, Callback);
+
+	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef);
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef);
+
+	/* Push return value on stack */
+	tolua_pushboolean(tolua_S, bRetVal );
+	return 1;
 }
 
 
@@ -269,89 +359,89 @@ template< class Ty1,
           bool (Ty1::*Func1)(int, int, int, cItemCallback<Ty2> &) >
 static int tolua_DoWithXYZ(lua_State* tolua_S)
 {
-	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */ 
-	if ((NumArgs != 4) && (NumArgs != 5)) 
-	{ 
+	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */
+	if ((NumArgs != 4) && (NumArgs != 5))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Requires 4 or 5 arguments, got %i", NumArgs);
-	} 
+	}
 
-	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0); 
-	if (!lua_isnumber(tolua_S, 2) || !lua_isnumber(tolua_S, 3) || !lua_isnumber(tolua_S, 4)) 
-	{ 
+	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0);
+	if (!lua_isnumber(tolua_S, 2) || !lua_isnumber(tolua_S, 3) || !lua_isnumber(tolua_S, 4))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a number for parameters #1, #2 and #3");
-	} 
+	}
 
-	int ItemX = ((int)tolua_tonumber(tolua_S, 2, 0)); 
-	int ItemY = ((int)tolua_tonumber(tolua_S, 3, 0)); 
-	int ItemZ = ((int)tolua_tonumber(tolua_S, 4, 0)); 
-	LOG("x %i y %i z %i", ItemX, ItemY, ItemZ ); 
-	if (!lua_isfunction( tolua_S, 5)) 
-	{ 
+	int ItemX = ((int)tolua_tonumber(tolua_S, 2, 0));
+	int ItemY = ((int)tolua_tonumber(tolua_S, 3, 0));
+	int ItemZ = ((int)tolua_tonumber(tolua_S, 4, 0));
+	LOG("x %i y %i z %i", ItemX, ItemY, ItemZ );
+	if (!lua_isfunction( tolua_S, 5))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #4");
-	} 
+	}
 
-	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */ 
-	int TableRef = LUA_REFNIL; 
-	if (NumArgs == 5) 
-	{ 
-		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-		if (TableRef == LUA_REFNIL) 
-		{ 
+	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */
+	int TableRef = LUA_REFNIL;
+	if (NumArgs == 5)
+	{
+		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+		if (TableRef == LUA_REFNIL)
+		{
 			return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get value reference of parameter #5");
-		} 
-	} 
+		}
+	}
 
-	/* table value is popped, and now function is on top of the stack */ 
-	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-	if (FuncRef == LUA_REFNIL) 
-	{ 
+	/* table value is popped, and now function is on top of the stack */
+	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+	if (FuncRef == LUA_REFNIL)
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get function reference of parameter #4");
-	} 
+	}
 
-	class cLuaCallback : public cItemCallback<Ty2> 
-	{ 
-	public: 
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef) 
-			: LuaState( a_LuaState ) 
-			, FuncRef( a_FuncRef ) 
-			, TableRef( a_TableRef ) 
-		{} 
+	class cLuaCallback : public cItemCallback<Ty2>
+	{
+	public:
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
+			: LuaState( a_LuaState )
+			, FuncRef( a_FuncRef )
+			, TableRef( a_TableRef )
+		{}
 
-	private: 
-		virtual bool Item(Ty2 * a_Item) override 
-		{ 
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */ 
-			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic()); 
-			if (TableRef != LUA_REFNIL) 
-			{ 
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */ 
-			} 
+	private:
+		virtual bool Item(Ty2 * a_Item) override
+		{
+			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
+			if (TableRef != LUA_REFNIL)
+			{
+				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+			}
 
-			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0); 
+			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
 			if (report_errors(LuaState, s))
 			{
 				return true;  // Abort enumeration
 			}
-			if (lua_isboolean(LuaState, -1)) 
-			{ 
-				return (tolua_toboolean(LuaState, -1, 0) > 0); 
-			} 
-			return false;  /* Continue enumeration */ 
-		} 
-		lua_State * LuaState; 
-		int FuncRef; 
-		int TableRef; 
-	} Callback(tolua_S, FuncRef, TableRef); 
+			if (lua_isboolean(LuaState, -1))
+			{
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
+			}
+			return false;  /* Continue enumeration */
+		}
+		lua_State * LuaState;
+		int FuncRef;
+		int TableRef;
+	} Callback(tolua_S, FuncRef, TableRef);
 
 	bool bRetVal = (self->*Func1)(ItemX, ItemY, ItemZ, Callback);
 
-	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */ 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef); 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef); 
+	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef);
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef);
 
-	/* Push return value on stack */ 
-	tolua_pushboolean(tolua_S, bRetVal ); 
-	return 1; 
+	/* Push return value on stack */
+	tolua_pushboolean(tolua_S, bRetVal );
+	return 1;
 }
 
 
@@ -363,89 +453,89 @@ template< class Ty1,
           bool (Ty1::*Func1)(int, int, cItemCallback<Ty2> &) >
 static int tolua_ForEachInChunk(lua_State* tolua_S)
 {
-	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */ 
-	if ((NumArgs != 3) && (NumArgs != 4)) 
-	{ 
+	int NumArgs = lua_gettop(tolua_S) - 1;  /* This includes 'self' */
+	if ((NumArgs != 3) && (NumArgs != 4))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Requires 3 or 4 arguments, got %i", NumArgs);
-	} 
+	}
 
-	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0); 
-	if (!lua_isnumber(tolua_S, 2) || !lua_isnumber(tolua_S, 3)) 
-	{ 
+	Ty1 * self = (Ty1 *)  tolua_tousertype(tolua_S, 1, 0);
+	if (!lua_isnumber(tolua_S, 2) || !lua_isnumber(tolua_S, 3))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a number for parameters #1 and #2");
-	} 
+	}
 
-	int ChunkX = ((int)tolua_tonumber(tolua_S, 2, 0)); 
-	int ChunkZ = ((int)tolua_tonumber(tolua_S, 3, 0)); 
+	int ChunkX = ((int)tolua_tonumber(tolua_S, 2, 0));
+	int ChunkZ = ((int)tolua_tonumber(tolua_S, 3, 0));
 
-	if (!lua_isfunction( tolua_S, 4)) 
-	{ 
+	if (!lua_isfunction( tolua_S, 4))
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Expected a function for parameter #3");
-	} 
+	}
 
-	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */ 
-	int TableRef = LUA_REFNIL; 
-	if (NumArgs == 4) 
-	{ 
-		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-		if (TableRef == LUA_REFNIL) 
-		{ 
+	/* luaL_ref gets reference to value on top of the stack, the table is the last argument and therefore on the top */
+	int TableRef = LUA_REFNIL;
+	if (NumArgs == 4)
+	{
+		TableRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+		if (TableRef == LUA_REFNIL)
+		{
 			return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get value reference of parameter #4");
-		} 
-	} 
+		}
+	}
 
-	/* table value is popped, and now function is on top of the stack */ 
-	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX); 
-	if (FuncRef == LUA_REFNIL) 
-	{ 
+	/* table value is popped, and now function is on top of the stack */
+	int FuncRef = luaL_ref(tolua_S, LUA_REGISTRYINDEX);
+	if (FuncRef == LUA_REFNIL)
+	{
 		return lua_do_error(tolua_S, "Error in function call '#funcname#': Could not get function reference of parameter #3");
-	} 
+	}
 
-	class cLuaCallback : public cItemCallback<Ty2> 
-	{ 
-	public: 
-		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef) 
-			: LuaState( a_LuaState ) 
-			, FuncRef( a_FuncRef ) 
-			, TableRef( a_TableRef ) 
-		{} 
+	class cLuaCallback : public cItemCallback<Ty2>
+	{
+	public:
+		cLuaCallback(lua_State* a_LuaState, int a_FuncRef, int a_TableRef)
+			: LuaState( a_LuaState )
+			, FuncRef( a_FuncRef )
+			, TableRef( a_TableRef )
+		{}
 
-	private: 
-		virtual bool Item(Ty2 * a_Item) override 
-		{ 
-			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */ 
-			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic()); 
-			if (TableRef != LUA_REFNIL) 
-			{ 
-				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */ 
-			} 
+	private:
+		virtual bool Item(Ty2 * a_Item) override
+		{
+			lua_rawgeti( LuaState, LUA_REGISTRYINDEX, FuncRef);  /* Push function reference */
+			tolua_pushusertype(LuaState, a_Item, Ty2::GetClassStatic());
+			if (TableRef != LUA_REFNIL)
+			{
+				lua_rawgeti( LuaState, LUA_REGISTRYINDEX, TableRef);  /* Push table reference */
+			}
 
-			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0); 
-			if (report_errors(LuaState, s)) 
-			{ 
-				return true;  /* Abort enumeration */ 
-			} 
+			int s = lua_pcall(LuaState, (TableRef == LUA_REFNIL ? 1 : 2), 1, 0);
+			if (report_errors(LuaState, s))
+			{
+				return true;  /* Abort enumeration */
+			}
 
-			if (lua_isboolean(LuaState, -1)) 
-			{ 
-				return (tolua_toboolean(LuaState, -1, 0) > 0); 
-			} 
-			return false;  /* Continue enumeration */ 
-		} 
-		lua_State * LuaState; 
-		int FuncRef; 
-		int TableRef; 
-	} Callback(tolua_S, FuncRef, TableRef); 
+			if (lua_isboolean(LuaState, -1))
+			{
+				return (tolua_toboolean(LuaState, -1, 0) > 0);
+			}
+			return false;  /* Continue enumeration */
+		}
+		lua_State * LuaState;
+		int FuncRef;
+		int TableRef;
+	} Callback(tolua_S, FuncRef, TableRef);
 
 	bool bRetVal = (self->*Func1)(ChunkX, ChunkZ, Callback);
 
-	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */ 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef); 
-	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef); 
+	/* Unreference the values again, so the LUA_REGISTRYINDEX can make place for other references */
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, TableRef);
+	luaL_unref(tolua_S, LUA_REGISTRYINDEX, FuncRef);
 
-	/* Push return value on stack */ 
-	tolua_pushboolean(tolua_S, bRetVal ); 
-	return 1; 
+	/* Push return value on stack */
+	tolua_pushboolean(tolua_S, bRetVal );
+	return 1;
 }
 
 
@@ -453,7 +543,7 @@ static int tolua_ForEachInChunk(lua_State* tolua_S)
 
 
 template< class Ty1,
-          class Ty2, 
+          class Ty2,
           bool (Ty1::*Func1)(cItemCallback<Ty2> &) >
 static int tolua_ForEach(lua_State * tolua_S)
 {
@@ -1382,14 +1472,15 @@ void ManualBindings::Bind(lua_State * tolua_S)
 			tolua_function(tolua_S, "DoWithDispenserAt",     tolua_DoWithXYZ<cWorld, cDispenserEntity,   &cWorld::DoWithDispenserAt>);
 			tolua_function(tolua_S, "DoWithDropSpenserAt",   tolua_DoWithXYZ<cWorld, cDropSpenserEntity, &cWorld::DoWithDropSpenserAt>);
 			tolua_function(tolua_S, "DoWithDropperAt",       tolua_DoWithXYZ<cWorld, cDropperEntity,     &cWorld::DoWithDropperAt>);
+			tolua_function(tolua_S, "DoWithEntityByID",      tolua_DoWithID< cWorld, cEntity,            &cWorld::DoWithEntityByID>);
 			tolua_function(tolua_S, "DoWithFurnaceAt",       tolua_DoWithXYZ<cWorld, cFurnaceEntity,     &cWorld::DoWithFurnaceAt>);
-			tolua_function(tolua_S, "DoWithPlayer",          tolua_DoWith<cWorld, cPlayer, &cWorld::DoWithPlayer>);
-			tolua_function(tolua_S, "FindAndDoWithPlayer",   tolua_DoWith<cWorld, cPlayer, &cWorld::FindAndDoWithPlayer>);
+			tolua_function(tolua_S, "DoWithPlayer",          tolua_DoWith<   cWorld, cPlayer,            &cWorld::DoWithPlayer>);
+			tolua_function(tolua_S, "FindAndDoWithPlayer",   tolua_DoWith<   cWorld, cPlayer,            &cWorld::FindAndDoWithPlayer>);
 			tolua_function(tolua_S, "ForEachChestInChunk",   tolua_ForEachInChunk<cWorld, cChestEntity,   &cWorld::ForEachChestInChunk>);
-			tolua_function(tolua_S, "ForEachEntity",         tolua_ForEach<cWorld, cEntity, &cWorld::ForEachEntity>);
+			tolua_function(tolua_S, "ForEachEntity",         tolua_ForEach<       cWorld, cEntity,        &cWorld::ForEachEntity>);
 			tolua_function(tolua_S, "ForEachEntityInChunk",  tolua_ForEachInChunk<cWorld, cEntity,        &cWorld::ForEachEntityInChunk>);
 			tolua_function(tolua_S, "ForEachFurnaceInChunk", tolua_ForEachInChunk<cWorld, cFurnaceEntity, &cWorld::ForEachFurnaceInChunk>);
-			tolua_function(tolua_S, "ForEachPlayer",         tolua_ForEach<cWorld, cPlayer, &cWorld::ForEachPlayer>);
+			tolua_function(tolua_S, "ForEachPlayer",         tolua_ForEach<       cWorld, cPlayer,        &cWorld::ForEachPlayer>);
 			tolua_function(tolua_S, "SetSignLines",          tolua_cWorld_SetSignLines);
 			tolua_function(tolua_S, "UpdateSign",            tolua_cWorld_SetSignLines);
 		tolua_endmodule(tolua_S);
diff --git a/source/World.h b/source/World.h
index 9de00ceec..695b15f50 100644
--- a/source/World.h
+++ b/source/World.h
@@ -245,7 +245,7 @@ public:
 	bool ForEachEntityInChunk(int a_ChunkX, int a_ChunkZ, cEntityCallback & a_Callback);  // Exported in ManualBindings.cpp
 
 	/// Calls the callback if the entity with the specified ID is found, with the entity object as the callback param. Returns true if entity found and callback returned false.
-	bool DoWithEntityByID(int a_UniqueID, cEntityCallback & a_Callback);  // TODO: Exported in ManualBindings.cpp
+	bool DoWithEntityByID(int a_UniqueID, cEntityCallback & a_Callback);  // Exported in ManualBindings.cpp
 
 	/// Compares clients of two chunks, calls the callback accordingly
 	void CompareChunkClients(int a_ChunkX1, int a_ChunkZ1, int a_ChunkX2, int a_ChunkZ2, cClientDiffCallback & a_Callback);