diff --git a/mods/ENTITIES/mobs_mc/villager.lua b/mods/ENTITIES/mobs_mc/villager.lua
index a5c7e0a6d..fbc7bc521 100644
--- a/mods/ENTITIES/mobs_mc/villager.lua
+++ b/mods/ENTITIES/mobs_mc/villager.lua
@@ -10,6 +10,14 @@
 
 -- TODO: Particles
 -- TODO: 4s Regeneration I after trade unlock
+-- TODO: Breeding
+-- TODO: Baby villagers
+-- TODO: Spawning in villages
+-- TODO: Behaviour:
+--     TODO: Walk around village, but do not leave it intentionally
+--     TODO: Run into house on rain or danger, open doors
+--     TODO: Internal inventory, pick up items, trade with other villagers
+--     TODO: Farm stuff
 
 -- intllib
 local MP = minetest.get_modpath(minetest.get_current_modname())
diff --git a/mods/ENTITIES/mobs_mc/villager_zombie.lua b/mods/ENTITIES/mobs_mc/villager_zombie.lua
index 22e082c7f..4abb6b6e8 100644
--- a/mods/ENTITIES/mobs_mc/villager_zombie.lua
+++ b/mods/ENTITIES/mobs_mc/villager_zombie.lua
@@ -7,7 +7,7 @@
 local MP = minetest.get_modpath(minetest.get_current_modname())
 local S, NS = dofile(MP.."/intllib.lua")
 
---dofile(minetest.get_modpath("mobs").."/api.lua")
+-- TODO: Turn villagers to zombie villager
 
 --###################
 --################### ZOMBIE VILLAGER
diff --git a/mods/ENVIRONMENT/lightning/init.lua b/mods/ENVIRONMENT/lightning/init.lua
index 0f3061e43..625934fb1 100644
--- a/mods/ENVIRONMENT/lightning/init.lua
+++ b/mods/ENVIRONMENT/lightning/init.lua
@@ -191,10 +191,14 @@ lightning.strike = function(pos)
 							obj:set_yaw(rot)
 						-- villager → witch
 						elseif lua.name == "mobs_mc:villager" then
+						-- Witches are incomplete, this code is unused
+						-- TODO: Enable this code when witches are working.
+						--[[
 							local rot = obj:get_yaw()
 							obj:remove()
 							obj = minetest.add_entity(pos2, "mobs_mc:witch")
 							obj:set_yaw(rot)
+						]]
 						-- TODO: creeper → charged creeper
 						elseif lua.name == "mobs_mc:creeper" then