Added Lua-based Merchants option, various fixes.