many little changes preparing lua wrap