Add lua, modify some