diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..d9c069a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+## Generic ignorable patterns and files
+*~
+.*.swp
+debug.txt
diff --git a/dropbox.lua b/dropbox.lua
index e2b6479..af99e9c 100644
--- a/dropbox.lua
+++ b/dropbox.lua
@@ -14,13 +14,13 @@ minetest.register_node("more_chests:dropbox", {
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
 	after_place_node = function(pos, placer)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		meta:set_string("owner", placer:get_player_name() or "")
 		meta:set_string("infotext", "Dropbox (owned by "..
 				meta:get_string("owner")..")")
 	end,
 	on_construct = function(pos)
-		local meta = minetest.env:get_meta(pos)
+		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec",
 				"size[8,9]"..
 				"list[current_name;main;0,0;8,4;]"..
@@ -30,12 +30,12 @@ minetest.register_node("more_chests:dropbox", {
 		inv:set_size("main", 8*4)
 	end,
 	can_dig = function(pos,player)
-		local meta = minetest.env:get_meta(pos);
+		local meta = minetest.get_meta(pos);
 		local inv = meta:get_inventory()
 		return inv:is_empty("main")
 	end,
-    allow_metadata_inventory_take = function(pos, listname, index, stack, player)
-		local meta = minetest.env:get_meta(pos)
+	allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
 		if not has_locked_chest_privilege(meta, player) then
 			minetest.log("action", player:get_player_name()..
 					" tried to access a dropbox belonging to "..
@@ -45,15 +45,32 @@ minetest.register_node("more_chests:dropbox", {
 		end
 		return stack:get_count()
 	end,
+	allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+		local meta = minetest.get_meta(pos)
+		if has_locked_chest_privilege(meta, player) then
+			return stack:get_count()
+		end
+		local target = meta:get_inventory():get_list(listname)[index]
+		local target_name = target:get_name()
+		local stack_count = stack:get_count()
+		if target_name == stack:get_name()
+		and target:get_count() < stack_count then
+			return stack_count
+		end
+		if target_name ~= "" then
+			return 0
+		end
+		return stack_count
+	end,
 	on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
 		minetest.log("action", player:get_player_name()..
 				" moves stuff in dropbox at "..minetest.pos_to_string(pos))
 	end,
-    on_metadata_inventory_put = function(pos, listname, index, stack, player)
+	on_metadata_inventory_put = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name()..
 				" moves stuff to dropbox at "..minetest.pos_to_string(pos))
 	end,
-    on_metadata_inventory_take = function(pos, listname, index, stack, player)
+	on_metadata_inventory_take = function(pos, listname, index, stack, player)
 		minetest.log("action", player:get_player_name()..
 				" takes stuff from dropbox at "..minetest.pos_to_string(pos))
 	end,