diff --git a/functions.lua b/functions.lua
index 7b96c92..69b044e 100644
--- a/functions.lua
+++ b/functions.lua
@@ -162,8 +162,9 @@ function thirsty.on_use_empty()
         if pointed_thing and pointed_thing.type == 'node' then
             node = minetest.get_node(pointed_thing.under)
         end
+		
 
-		if thirsty.config.node_drinkable[node.name] then 
+		if node and thirsty.config.node_drinkable[node.name] then 
 			local new_stack = {name = itemstack:get_name().."_full", count=1, wear=1, metadata=""}		
 			player:get_inventory():add_item("main", new_stack)
 			itemstack:take_item()
diff --git a/hud.lua b/hud.lua
index 0f21cd7..00e75f3 100644
--- a/hud.lua
+++ b/hud.lua
@@ -57,7 +57,7 @@ else
         local name = player:get_player_name()
 		local pmeta = player:get_meta()
 		
-        thirsty_hud = player:hud_add({
+		thirsty_hud = player:hud_add({
             hud_elem_type = "statbar",
             position = { x=0.5, y=1 },
             text = "thirsty_drop_100_24_cc0.png",
diff --git a/init.lua b/init.lua
index f22d8b6..03f5598 100644
--- a/init.lua
+++ b/init.lua
@@ -66,28 +66,28 @@ thirsty.config = {
 			  -- configuration in Settings>>Mods>>Thirsty
 			  -- Best to not change defaults here
 			  -- [General]
-			  tick_time = minetest.setting_get("thirsty_tick_time") or 0.5, 
-			  start = minetest.setting_get("thirsty_starting_value") or 20,
-			  thirst_per_second = minetest.setting_get("thirst_per_second") or 1.0 / 30,
-			  damage_per_second = minetest.setting_get("damage_per_second") or 1.0 / 10.0,
-			  stand_still_for_drink = minetest.setting_get("stand_still_for_drink") or 1.0,
-			  stand_still_for_afk = minetest.setting_get("stand_still_for_afk") or 120.0,
+			  tick_time = minetest.settings:get("thirsty_tick_time") or 0.5, 
+			  start = minetest.settings:get("thirsty_starting_value") or 20,
+			  thirst_per_second = minetest.settings:get("thirst_per_second") or 1.0 / 30,
+			  damage_per_second = minetest.settings:get("damage_per_second") or 1.0 / 10.0,
+			  stand_still_for_drink = minetest.settings:get("stand_still_for_drink") or 1.0,
+			  stand_still_for_afk = minetest.settings:get("stand_still_for_afk") or 120.0,
 			  
 			  -- [Water Fountain]
-			  regen_from_fountain = minetest.setting_get("regen_from_fountain") or 0.5,
-			  fountain_height = minetest.setting_get("fountain_height") or 4,
-			  fountain_max_level = minetest.setting_get("fountain_max_level") or 20,
-			  fountain_distance_per_level = minetest.setting_get("fountain_distance_per_level") or 5,
+			  regen_from_fountain = minetest.settings:get("regen_from_fountain") or 0.5,
+			  fountain_height = minetest.settings:get("fountain_height") or 4,
+			  fountain_max_level = minetest.settings:get("fountain_max_level") or 20,
+			  fountain_distance_per_level = minetest.settings:get("fountain_distance_per_level") or 5,
 			  
 			  -- [Thirsty Mod Items]
-			  register_bowl      = thirsty.tobool(minetest.setting_get("register_bowl")) or true,
-			  register_canteens  = thirsty.tobool(minetest.setting_get("register_canteens")) or true,
-			  register_drinking_fountain = thirsty.tobool(minetest.setting_get("register_drinking")) or true,
-			  register_fountains = thirsty.tobool(minetest.setting_get("register_fountains")) or true,
-			  register_amulets   = thirsty.tobool(minetest.setting_get("register_amulets")) or true,
+			  register_bowl      = thirsty.tobool(minetest.settings:get("register_bowl")) or true,
+			  register_canteens  = thirsty.tobool(minetest.settings:get("register_canteens")) or true,
+			  register_drinking_fountain = thirsty.tobool(minetest.settings:get("register_drinking")) or true,
+			  register_fountains = thirsty.tobool(minetest.settings:get("register_fountains")) or true,
+			  register_amulets   = thirsty.tobool(minetest.settings:get("register_amulets")) or true,
 			  
 			  -- [Other Mods]
-			  register_vessels = thirsty.tobool(minetest.setting_get("register_vessels")) or true,
+			  register_vessels = thirsty.tobool(minetest.settings:get("register_vessels")) or true,
 			  
 			  -- [Node/Item Tables] Do not change names without code updates. 
 			  -- Use API functions to register to these tables
diff --git a/interop_dungeon_loot.lua b/interop_dungeon_loot.lua
index 38183f2..7149abc 100644
--- a/interop_dungeon_loot.lua
+++ b/interop_dungeon_loot.lua
@@ -9,7 +9,9 @@
 ------------------------------------------------------------
 --            Settings to support Dungeon Loot            --
 ------------------------------------------------------------
-if register_amulets == true then
+
+
+if thirsty.config.register_amulets == true then
 
 	dungeon_loot.register({name = "thirsty:lesser_amulet_thirst", chance = 0.1, count = {1,1}})
 	dungeon_loot.register({name = "thirsty:amulet_thirst", chance = 0.05, count = {1,1}, y = {-100, 32768}})
diff --git a/interop_ethereal.lua b/interop_ethereal.lua
index ef24602..9f2ad0b 100644
--- a/interop_ethereal.lua
+++ b/interop_ethereal.lua
@@ -15,6 +15,6 @@ local E = thirsty.ext_nodes_items
 -- Hydrate and Food Items --
 ----------------------------
 thirsty.register_food_drink("ethereal:firethorn_jelly" ,1,0,1,20,E.glass_bottle)
-thirsty.register_food_drink("ethereal:mushroom_soup"   ,2.5,0,2,20,ethereal:bowl)
-thirsty.register_food_drink("ethereal:hearty_stew"     ,7.0,0,1,20,ethereal:bowl)
+thirsty.register_food_drink("ethereal:mushroom_soup"   ,2.5,0,2,20,"ethereal:bowl")
+thirsty.register_food_drink("ethereal:hearty_stew"     ,7.0,0,1,20,"ethereal:bowl")
 thirsty.register_food_drink("ethereal:golden_apple"    ,10,10,10,30,nil)
\ No newline at end of file