diff --git a/lsyncd-conf.lua b/lsyncd-conf.lua
index f8dc5ca..f813fa9 100644
--- a/lsyncd-conf.lua
+++ b/lsyncd-conf.lua
@@ -9,7 +9,7 @@ settings = {
 	statusfile = "/tmp/lsyncd.stat",
 }
 
-------
+----
 -- for testing purposes. uses bash command to hold local dirs in sync.
 --
 prefix = "sleep 1 && "
diff --git a/lsyncd.c b/lsyncd.c
index 87758c0..deea96f 100644
--- a/lsyncd.c
+++ b/lsyncd.c
@@ -1093,12 +1093,14 @@ masterloop(lua_State *L)
 		printlogf(L, "Call", "lsycnd_get_alarm()");
 		lua_getglobal(L, "lsyncd_call_error");
 		lua_getglobal(L, "lsyncd_get_alarm");
-		if (lua_pcall(L, 0, 2, -2)) {
+		if (lua_pcall(L, 0, 1, -2)) {
 			exit(-1); // ERRNO
 		}
-		have_alarm = lua_toboolean(L, -2);
-		alarm_time = (clock_t) luaL_checkinteger(L, -1);
-		lua_pop(L, 3);
+		have_alarm = lua_toboolean(L, -1);
+		if (have_alarm) {
+			alarm_time = (clock_t) luaL_checkinteger(L, -1);
+		}
+		lua_pop(L, 2);
 
 		if (have_alarm && time_before_eq(alarm_time, now)) {
 			/* there is a delay that wants to be handled already thus do not 
diff --git a/lsyncd.lua b/lsyncd.lua
index 80d86c6..8cbd91d 100644
--- a/lsyncd.lua
+++ b/lsyncd.lua
@@ -22,6 +22,14 @@ if lsyncd_version then
 end
 lsyncd_version = "2.0beta1"
 
+-----
+-- Hides the core interface from user scripts
+--
+_l = lsyncd
+lsyncd = nil
+local lsyncd = _l
+_l = nil
+
 ----
 -- Shortcuts (which user is supposed to be able to use them as well)
 --
@@ -578,9 +586,8 @@ function lsyncd_collect_process(pid, exitcode)
 	if not delay then
 		return
 	end
-	log("Debug", "collected ", pid, ": ", 
-		delay.ename, " of ", origin.source, delay.pathname,
-		" = ", exitcode)
+	log("Debug", "collected ",pid, ": ",delay.ename," of ",
+		origin.source,delay.pathname," = ",exitcode)
 	origin.processes[pid] = nil
 end
 
@@ -598,7 +605,9 @@ local Inlet, inlet_control = (function()
 	-- event to be passed to the user
 	local event = {}
 
-	-- TODO
+	-----
+	-- Interface for the user to get fields.
+	--
 	local event_fields = {
 		config = function()
 			return origin.config
@@ -891,27 +900,24 @@ end
 ----
 -- Called by core to query soonest alarm.
 --
--- @return two variables.
---         boolean false   ... no alarm, core can in untimed sleep
---                 true    ... alarm time specified.
---         times           ... the alarm time (only read if number is 1)
+-- @return false ... no alarm, core can in untimed sleep, or
+--         times ... the alarm time (only read if number is 1)
+--
 function lsyncd_get_alarm()
-	local have_alarm = false
-	local alarm = 0
+	local alarm = false
 	for _, o in Origins.iwalk() do
 		-- TODO better handling of stati.
 		if o.delays[1] and 
 		   o.processes:size() < o.config.max_processes then
-			if have_alarm then
+			if alarm then
 				alarm = lsyncd.earlier(alarm, o.delays[1].alarm)
 			else
 				alarm = o.delays[1].alarm
-				have_alarm = true
 			end
 		end
 	end
-	log("Debug", "lysncd_get_alarm returns: ",have_alarm,", ",alarm)
-	return have_alarm, alarm
+	log("Debug", "lysncd_get_alarm returns: ",alarm)
+	return alarm
 end
 
 lsyncd_inotify_event = Inotifies.event