Added Lua; some more header adjustments