Minor tweaks in luna.lua