80 files changed, 3114 insertions, 1314 deletions
diff --git a/CHANGES b/CHANGES
index ccfa923..17a79f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,12 @@
 CHANGES:
-CHANGE 2: BGe 27-Nov-24
+CHANGE 2: BGe 05-Jun-25
    * Internal changes
        - Lanes is implemented in C++20: thread, condition_variable, mutex, string_view, variant, lambdas, templates, and more!
        - Almost all platform-specific code is gone (only a small bit for thread priority and affinity remains).
        - Decoda support inactive by default.
        - Deep userdata interface fully revamped to C++20 too.
+        - Supports Lua 5.5
    * Lanes API changes
        - Version is now 4.0.0
        - Lanes module:
@@ -16,6 +17,7 @@ CHANGE 2: BGe 27-Nov-24
            - new function lanes.finally(). Installs a function that gets called at Lanes shutdown after attempting to terminate all lanes.
              If some lanes still run after the finalizer, Universe::__gc with raise an error or freeze, depending on its return value.
            - new function lanes.collectgarbage(), to force a full GC cycle in the keeper states.
+            - new function lanes.thread_priority_range(), to query the valid range of priorities.
            - Configuration settings:
                - Boolean parameters only accept boolean values.
                - allocator provider function is called with a string hint to distinguish internal allocations, lane and keeper states.
@@ -26,6 +28,8 @@ CHANGE 2: BGe 27-Nov-24
                - verbose_errors removed. Use lane error_trace_level instead.
                - with_timers is false by default.
            - Non-deep full userdata are processed during module registration just like ordinary module C functions, making them valid transferable (up)values (for example: io.stdin).
+            - thread API errors cause a Lua error instead of aborting the program.
+            - thread priorities can now be set using the native range of values, if desired.
        - Lanes:
            - Can no longer be "killed" by hard-stopping their thread without any resource cleanup (see lane:cancel()).
            - lanes.gen() settings:
@@ -34,10 +38,9 @@ CHANGE 2: BGe 27-Nov-24
                - name added. Can be used to set the name early (before the lane body calls lane_threadname()).
            - New generator lanes.coro() to start a lane as a coroutine.
            - New __close metamethod that calls join().
-            - lane:join()
+            - lane:join() returns nil, error in case of problem, else returns true followed by the lane body return values.
-                - Returns nil, error in case of problem.
-                - Forces lane function body must return a non-nil first value on success because of the above.
            - lane:get_debug_threadname() renamed get_threadname().
+            - cancel_test() returns "soft"/"hard" instead of true when a cancellation request is active.
        - Lindas:
            - lanes.linda()
                - Arguments can be provided in any order.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be6a2f2..2c5c66f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,10 @@
 # Redistribution and use of this file is allowed according to the terms of the MIT license.
 # For details see the COPYRIGHT file distributed with LuaDist.
 # Please note that the package source code is licensed under its own license.
+CMAKE_MINIMUM_REQUIRED(VERSION 3.18)
+PROJECT(lanes CXX)
+set (CMAKE_CXX_STANDARD 20)
-PROJECT(lanes C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 FIND_PACKAGE(Lua51 REQUIRED)
diff --git a/Lanes.sln b/Lanes.sln
index b5c1d89..bc88a79 100644
--- a/Lanes.sln
+++ b/Lanes.sln
@@ -30,6 +30,9 @@ Global
                Debug 5.4|Prospero = Debug 5.4|Prospero
                Debug 5.4|x64 = Debug 5.4|x64
                Debug 5.4|x86 = Debug 5.4|x86
+                Debug 5.5|Prospero = Debug 5.5|Prospero
+                Debug 5.5|x64 = Debug 5.5|x64
+                Debug 5.5|x86 = Debug 5.5|x86
                Release 5.1|Prospero = Release 5.1|Prospero
                Release 5.1|x64 = Release 5.1|x64
                Release 5.1|x86 = Release 5.1|x86
@@ -42,6 +45,9 @@ Global
                Release 5.4|Prospero = Release 5.4|Prospero
                Release 5.4|x64 = Release 5.4|x64
                Release 5.4|x86 = Release 5.4|x86
+                Release 5.5|Prospero = Release 5.5|Prospero
+                Release 5.5|x64 = Release 5.5|x64
+                Release 5.5|x86 = Release 5.5|x86
                Release LuaJIT|Prospero = Release LuaJIT|Prospero
                Release LuaJIT|x64 = Release LuaJIT|x64
                Release LuaJIT|x86 = Release LuaJIT|x86
@@ -74,6 +80,12 @@ Global
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x64.Build.0 = Debug 5.4|x64
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|Prospero.ActiveCfg = Debug 5.5|Prospero
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|Prospero.Build.0 = Debug 5.5|Prospero
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|x64.ActiveCfg = Debug 5.5|x64
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|x64.Build.0 = Debug 5.5|x64
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|x86.ActiveCfg = Debug 5.5|Win32
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Debug 5.5|x86.Build.0 = Debug 5.5|Win32
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.1|x64.ActiveCfg = Release 5.1|x64
@@ -98,6 +110,12 @@ Global
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x64.Build.0 = Release 5.4|x64
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.4|x86.Build.0 = Release 5.4|Win32
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|Prospero.ActiveCfg = Release 5.5|Prospero
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|Prospero.Build.0 = Release 5.5|Prospero
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|x64.ActiveCfg = Release 5.5|x64
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|x64.Build.0 = Release 5.5|x64
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|x86.ActiveCfg = Release 5.5|Win32
+                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release 5.5|x86.Build.0 = Release 5.5|Win32
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero
                {1DB7D861-EEFD-49DC-A8E2-3FC2BD6AD49D}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64
@@ -134,6 +152,12 @@ Global
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x64.Build.0 = Debug 5.4|x64
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|Prospero.ActiveCfg = Debug 5.5|Prospero
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|Prospero.Build.0 = Debug 5.5|Prospero
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|x64.ActiveCfg = Debug 5.5|x64
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|x64.Build.0 = Debug 5.5|x64
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|x86.ActiveCfg = Debug 5.5|Win32
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Debug 5.5|x86.Build.0 = Debug 5.5|Win32
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.1|x64.ActiveCfg = Release 5.1|x64
@@ -158,6 +182,12 @@ Global
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x64.Build.0 = Release 5.4|x64
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.4|x86.Build.0 = Release 5.4|Win32
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|Prospero.ActiveCfg = Release 5.5|Prospero
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|Prospero.Build.0 = Release 5.5|Prospero
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|x64.ActiveCfg = Release 5.5|x64
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|x64.Build.0 = Release 5.5|x64
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|x86.ActiveCfg = Release 5.5|Win32
+                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release 5.5|x86.Build.0 = Release 5.5|Win32
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero
                {AED7F42F-139A-46BA-80FE-16E062EA1345}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64
@@ -194,6 +224,12 @@ Global
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x64.Build.0 = Debug 5.4|x64
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x86.ActiveCfg = Debug 5.4|Win32
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.4|x86.Build.0 = Debug 5.4|Win32
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|Prospero.ActiveCfg = Debug 5.5|Prospero
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|Prospero.Build.0 = Debug 5.5|Prospero
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|x64.ActiveCfg = Debug 5.5|x64
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|x64.Build.0 = Debug 5.5|x64
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|x86.ActiveCfg = Debug 5.5|Win32
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Debug 5.5|x86.Build.0 = Debug 5.5|Win32
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|Prospero.ActiveCfg = Release 5.1|Prospero
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|Prospero.Build.0 = Release 5.1|Prospero
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.1|x64.ActiveCfg = Release 5.1|x64
@@ -218,6 +254,12 @@ Global
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x64.Build.0 = Release 5.4|x64
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x86.ActiveCfg = Release 5.4|Win32
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.4|x86.Build.0 = Release 5.4|Win32
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|Prospero.ActiveCfg = Release 5.5|Prospero
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|Prospero.Build.0 = Release 5.5|Prospero
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|x64.ActiveCfg = Release 5.5|x64
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|x64.Build.0 = Release 5.5|x64
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|x86.ActiveCfg = Release 5.5|Win32
+                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release 5.5|x86.Build.0 = Release 5.5|Win32
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|Prospero.ActiveCfg = Release LuaJIT|Prospero
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|Prospero.Build.0 = Release LuaJIT|Prospero
                {4C40BD18-3BAB-46D7-8F14-602A6FBE5910}.Release LuaJIT|x64.ActiveCfg = Release LuaJIT|x64
diff --git a/Lanes.vcxproj b/Lanes.vcxproj
index 89a1652..3d49d9e 100644
--- a/Lanes.vcxproj
+++ b/Lanes.vcxproj
@@ -49,6 +49,30 @@
      <Configuration>Debug 5.4</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Prospero">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Win32">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|x64">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Prospero">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Win32">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|x64">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release LuaJIT|Prospero">
      <Configuration>Release LuaJIT</Configuration>
      <Platform>Prospero</Platform>
@@ -183,6 +207,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>NotSet</CharacterSet>
@@ -201,6 +231,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>NotSet</CharacterSet>
@@ -225,6 +261,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>NotSet</CharacterSet>
@@ -243,6 +285,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <CharacterSet>NotSet</CharacterSet>
@@ -275,6 +323,10 @@
    <PlatformToolset>Clang</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'" Label="Configuration">
+    <PlatformToolset>Clang</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -291,6 +343,10 @@
    <PlatformToolset>Clang</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'" Label="Configuration">
+    <PlatformToolset>Clang</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
    <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -322,6 +378,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -331,6 +390,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -343,6 +405,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -352,6 +417,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -365,37 +433,46 @@
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">false</LinkIncremental>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">false</LinkIncremental>
    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">false</LinkIncremental>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -410,16 +487,20 @@
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">lanes_core</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">lanes_core</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">lanes_core</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">lanes_core</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">lanes_core</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">lanes_core</TargetName>
@@ -447,6 +528,10 @@
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
@@ -459,6 +544,10 @@
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
@@ -479,6 +568,10 @@
    <LinkIncremental>false</LinkIncremental>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
@@ -502,6 +595,9 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <EnableClangTidyCodeAnalysis>true</EnableClangTidyCodeAnalysis>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
@@ -522,6 +618,11 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <TargetName>lanes_core</TargetName>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <TargetName>lanes_core</TargetName>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
@@ -552,6 +653,11 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <TargetName>lanes_core</TargetName>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <TargetName>lanes_core</TargetName>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">
    <PreBuildEvent>
      <Command>
@@ -560,7 +666,7 @@
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -598,7 +704,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>
      </BasicRuntimeChecks>
@@ -639,7 +745,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -677,7 +783,45 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -715,7 +859,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>
      </BasicRuntimeChecks>
@@ -754,7 +898,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -797,7 +941,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -832,6 +976,49 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <OmitFramePointers>true</OmitFramePointers>
+      <BasicRuntimeChecks>
+      </BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>lua54.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <TargetMachine>MachineX86</TargetMachine>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">
    <PreBuildEvent>
      <Command>
@@ -840,7 +1027,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -876,7 +1063,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>
      </BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -914,7 +1101,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -950,7 +1137,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -978,6 +1165,42 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <OmitFramePointers>false</OmitFramePointers>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>lua55.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
    <PreBuildEvent>
      <Command>
@@ -986,7 +1209,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>
      </BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1024,7 +1247,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1064,7 +1287,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1097,6 +1320,47 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <PreBuildEvent>
+      <Command>
+      </Command>
+    </PreBuildEvent>
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <WarningLevel>Level4</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <OmitFramePointers>true</OmitFramePointers>
+      <BasicRuntimeChecks>
+      </BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>lua55.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)$(TargetName).dll</OutputFile>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <DataExecutionPrevention>
+      </DataExecutionPrevention>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"
+</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">
    <PreBuildEvent>
      <Command>
@@ -1105,7 +1369,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <MinimalRebuild>false</MinimalRebuild>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -1143,7 +1407,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    <ClCompile>
      <Optimization>Disabled</Optimization>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
@@ -1178,7 +1442,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1220,7 +1484,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1260,7 +1524,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1302,7 +1566,7 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
    </PreBuildEvent>
    <ClCompile>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level4</WarningLevel>
@@ -1367,6 +1631,14 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      <ExtraWarnings>true</ExtraWarnings>
    </ClCompile>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">
+    <ClCompile>
+      <CppLanguageStd>Cpp20</CppLanguageStd>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ExtraWarnings>true</ExtraWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">
    <ClCompile>
      <CppLanguageStd>Cpp20</CppLanguageStd>
@@ -1413,38 +1685,52 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      <ExtraWarnings>true</ExtraWarnings>
    </ClCompile>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">
+    <ClCompile>
+      <CppLanguageStd>Cpp20</CppLanguageStd>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include</AdditionalIncludeDirectories>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <ExtraWarnings>true</ExtraWarnings>
+    </ClCompile>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="src\allocator.cpp" />
    <ClCompile Include="src\_pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">Create</PrecompiledHeader>
    </ClCompile>
    <ClCompile Include="src\cancel.cpp" />
@@ -1504,12 +1790,16 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
      </Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
      </Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">
@@ -1518,12 +1808,16 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
      </Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
      </Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">
      </Message>
      <Message Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">
@@ -1532,32 +1826,40 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      <Command Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Command Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">xcopy /F /I /R /Y  %(FullPath) "$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)"</Command>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/lua/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <Message Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">
@@ -1578,14 +1880,20 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">$(SolutionDir)_LuaVersions/$(PlatformName)/$(ConfigurationName)/%(Filename)%(Extension)</Outputs>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
      </BuildInParallel>
+      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+      </BuildInParallel>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
      </BuildInParallel>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
      </MaxProcesses>
+      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+      </MaxProcesses>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
      </MaxProcesses>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
      </MaxItemsInBatch>
+      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+      </MaxItemsInBatch>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">
@@ -1620,14 +1928,20 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
      </BuildInParallel>
+      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+      </BuildInParallel>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
      </BuildInParallel>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
      </MaxProcesses>
+      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+      </MaxProcesses>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
      </MaxProcesses>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
      </MaxItemsInBatch>
+      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+      </MaxItemsInBatch>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">
@@ -1674,10 +1988,16 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
      </BuildInParallel>
+      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+      </BuildInParallel>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
      </MaxProcesses>
+      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+      </MaxProcesses>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">
      </MaxItemsInBatch>
+      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
      </BuildInParallel>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
@@ -1692,10 +2012,16 @@ xcopy /F /I /R /Y "$(OutputPath)$(TargetName).pdb" "$(SolutionDir)_LuaVersions/$
      </MaxItemsInBatch>
      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
      </BuildInParallel>
+      <BuildInParallel Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+      </BuildInParallel>
      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
      </MaxProcesses>
+      <MaxProcesses Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+      </MaxProcesses>
      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">
      </MaxItemsInBatch>
+      <MaxItemsInBatch Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+      </MaxItemsInBatch>
    </CustomBuild>
    <None Include="CMakeLists.txt" />
    <None Include="docs\comparison.html" />
diff --git a/Makefile b/Makefile
index 98fa1ac..ea4f1d3 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ build_DUE:
 run_unit_tests: build_lanes build_unit_tests build_DUE
        @echo =========================================================================================
        $(_PREFIX) $(_UNITTEST_TARGET) --list-tests
-        $(_PREFIX) $(_UNITTEST_TARGET) --rng-seed 0 -s scripted_tests.lane.tasking_cancelling
+        $(_PREFIX) $(_UNITTEST_TARGET) --rng-seed 0
 debug_unit_tests: build_lanes build_unit_tests build_DUE
        @echo =========================================================================================
diff --git a/Shared.makefile b/Shared.makefile
index d1a96fb..3809538 100644
--- a/Shared.makefile
+++ b/Shared.makefile
@@ -30,7 +30,7 @@ ifeq "$(LUAROCKS)" ""
      $(warning LUA_DEV not defined - try i.e. 'make LUA_DEV=/c/Program\ Files/Lua/5.1')
      # this assumes Lua was built and installed from source and everything is located in default folders (/usr/local/include and /usr/local/bin)
      LUA_FLAGS := -I "/usr/local/include"
-      LUA_LIBS := $(word 1,$(shell which lua54.$(_SO) 2>/dev/null) $(shell which lua53.$(_SO) 2>/dev/null) $(shell which lua52.$(_SO) 2>/dev/null) $(shell which lua51$(_SO) 2>/dev/null))
+      LUA_LIBS := $(word 1,$(shell which lua55.$(_SO) 2>/dev/null) $(shell which lua54.$(_SO) 2>/dev/null) $(shell which lua53.$(_SO) 2>/dev/null) $(shell which lua52.$(_SO) 2>/dev/null) $(shell which lua51$(_SO) 2>/dev/null))
      $(info detected LUA_LIBS as $(LUA_LIBS))
    else
      LUA_FLAGS := -I "$(LUA_DEV)/include"
diff --git a/deep_userdata_example/deep_userdata_example.cpp b/deep_userdata_example/deep_userdata_example.cpp
index 075cfbe..6845ff1 100644
--- a/deep_userdata_example/deep_userdata_example.cpp
+++ b/deep_userdata_example/deep_userdata_example.cpp
@@ -25,7 +25,7 @@ class MyDeepFactory final : public DeepFactory
 // #################################################################################################
-// a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code.
+// a lanes-deep userdata. needs DeepPrelude and luaW_newdeepuserdata from Lanes code.
 struct MyDeepUserdata : public DeepPrelude // Deep userdata MUST start with a DeepPrelude
 {
    std::atomic<int> inUse{};
@@ -82,7 +82,7 @@ static int deep_tostring(lua_State* const L_)
 {
    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L_, StackIndex{ 1 })) };
    _self->inUse.fetch_add(1, std::memory_order_seq_cst);
-    luaG_pushstring(L_, "%p:deep(%d)", _self, _self->val);
+    luaW_pushstring(L_, "%p:deep(%d)", _self, _self->val);
    _self->inUse.fetch_sub(1, std::memory_order_seq_cst);
    return 1;
 }
@@ -241,7 +241,7 @@ static int clonable_getuv(lua_State* const L_)
 static int clonable_tostring(lua_State* const L_)
 {
    MyClonableUserdata* _self = static_cast<MyClonableUserdata*>(lua_touserdata(L_, 1));
-    luaG_pushstring(L_, "%p:clonable(%d)", lua_topointer(L_, 1), _self->val);
+    luaW_pushstring(L_, "%p:clonable(%d)", lua_topointer(L_, 1), _self->val);
    return 1;
 }
@@ -299,7 +299,7 @@ int luaD_new_clonable(lua_State* L)
 {
    UserValueCount const _nuv{ static_cast<int>(luaL_optinteger(L, 1, 1)) };
    lua_newuserdatauv(L, sizeof(MyClonableUserdata), _nuv);
-    luaG_setmetatable(L, "clonable");
+    luaW_setmetatable(L, "clonable");
    return 1;
 }
@@ -307,7 +307,7 @@ int luaD_new_clonable(lua_State* L)
 // #################################################################################################
 static luaL_Reg const deep_module[] = {
-    { "get_deep_count", luaD_get_deep_count }, 
+    { "get_deep_count", luaD_get_deep_count },
    { "new_deep", luaD_new_deep },
    { "new_clonable", luaD_new_clonable },
    { nullptr, nullptr }
@@ -317,12 +317,12 @@ static luaL_Reg const deep_module[] = {
 LANES_API int luaopen_deep_userdata_example(lua_State* L)
 {
-    luaG_newlib<std::size(deep_module)>(L, deep_module);                                           // M
+    luaW_newlib<std::size(deep_module)>(L, deep_module);                                           // M
    // preregister the metatables for the types we can instantiate so that Lanes can know about them
    if (luaL_newmetatable(L, "clonable"))                                                          // M mt
    {
-        luaG_registerlibfuncs(L, clonable_mt);
+        luaW_registerlibfuncs(L, clonable_mt);
        lua_pushvalue(L, -1);                                                                      // M mt mt
        lua_setfield(L, -2, "__index");                                                            // M mt
    }
@@ -330,7 +330,7 @@ LANES_API int luaopen_deep_userdata_example(lua_State* L)
    if (luaL_newmetatable(L, "deep"))                                                              // mt
    {
-        luaG_registerlibfuncs(L, deep_mt);
+        luaW_registerlibfuncs(L, deep_mt);
        lua_pushvalue(L, -1);                                                                      // mt mt
        lua_setfield(L, -2, "__index");                                                            // mt
    }
diff --git a/deep_userdata_example/deep_userdata_example.vcxproj b/deep_userdata_example/deep_userdata_example.vcxproj
index 54db35a..bea5edd 100644
--- a/deep_userdata_example/deep_userdata_example.vcxproj
+++ b/deep_userdata_example/deep_userdata_example.vcxproj
@@ -45,6 +45,30 @@
      <Configuration>Debug 5.4</Configuration>
      <Platform>x64</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Prospero">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Win32">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|x64">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Prospero">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Win32">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|x64">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release LuaJIT|Prospero">
      <Configuration>Release LuaJIT</Configuration>
      <Platform>Prospero</Platform>
@@ -173,6 +197,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -193,6 +223,13 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -237,6 +274,12 @@
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
@@ -257,6 +300,13 @@
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
@@ -266,6 +316,9 @@
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'" Label="Configuration">
+    <PlatformToolset>Clang</PlatformToolset>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
@@ -284,6 +337,9 @@
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'" Label="Configuration">
+    <PlatformToolset>Clang</PlatformToolset>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'" Label="Configuration">
    <PlatformToolset>Clang</PlatformToolset>
  </PropertyGroup>
@@ -313,6 +369,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -322,6 +381,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -343,6 +405,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
@@ -352,6 +417,9 @@
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'" Label="PropertySheets">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
    <TargetExt>.dll</TargetExt>
@@ -395,6 +463,12 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
    <TargetExt>.dll</TargetExt>
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -443,6 +517,12 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <TargetExt>.dll</TargetExt>
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">
    <TargetExt>.dll</TargetExt>
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
@@ -459,6 +539,11 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
@@ -469,6 +554,11 @@
    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)_Output\$(ProjectName)\$(PlatformName)\$(Configuration)\</OutDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -476,7 +566,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <OmitFramePointers>true</OmitFramePointers>
      <BasicRuntimeChecks />
@@ -501,7 +591,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <BasicRuntimeChecks />
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -518,6 +608,31 @@
      </Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <BasicRuntimeChecks>
+      </BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>lua55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -528,6 +643,7 @@
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -550,6 +666,7 @@
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -574,6 +691,7 @@
      <Optimization>MaxSpeed</Optimization>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <BasicRuntimeChecks />
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -597,6 +715,7 @@
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -621,6 +740,7 @@
      <OmitFramePointers>true</OmitFramePointers>
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
      <BasicRuntimeChecks />
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -642,7 +762,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <BasicRuntimeChecks />
@@ -670,6 +790,29 @@
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+    <Link>
+      <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -693,7 +836,7 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <BasicRuntimeChecks />
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <PreprocessorDefinitions>_WINDLL;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <PostBuildEvent>
      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
@@ -714,7 +857,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -736,7 +879,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -758,7 +901,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>true</OmitFramePointers>
@@ -785,7 +928,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -807,7 +950,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>true</OmitFramePointers>
@@ -834,7 +977,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -860,7 +1003,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;_DEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -875,6 +1018,28 @@
      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <OmitFramePointers>false</OmitFramePointers>
+    </ClCompile>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+    <Link>
+      <AdditionalDependencies>lua55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|x64'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@@ -882,7 +1047,7 @@
      <ConformanceMode>true</ConformanceMode>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <PreprocessorDefinitions>_WINDLL;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <OmitFramePointers>false</OmitFramePointers>
@@ -912,6 +1077,7 @@
      <OmitFramePointers>true</OmitFramePointers>
      <BasicRuntimeChecks />
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -938,6 +1104,7 @@
      <LanguageStandard>stdcpp20</LanguageStandard>
      <BasicRuntimeChecks />
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -954,6 +1121,36 @@
      </Message>
    </PostBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <BasicRuntimeChecks>
+      </BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <PreprocessorDefinitions>LANES_DEBUG;_WINDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>lua54.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <ImageHasSafeExceptionHandlers>
+      </ImageHasSafeExceptionHandlers>
+    </Link>
+    <PostBuildEvent>
+      <Command>xcopy /F /I /R /Y "$(TargetPath)" "$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)"</Command>
+    </PostBuildEvent>
+    <PostBuildEvent>
+      <Message>
+      </Message>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="..\src\compat.cpp" />
    <ClCompile Include="..\src\deep.cpp" />
diff --git a/deep_userdata_example/deeptest.lua b/deep_userdata_example/deeptest.lua
index 37136cd..7e6ffd3 100644
--- a/deep_userdata_example/deeptest.lua
+++ b/deep_userdata_example/deeptest.lua
@@ -1,5 +1,5 @@
 local lanes = require("lanes").configure{ with_timers = false}
-local l = lanes.linda "my linda"
+local l = lanes.linda{name = "my linda"}
 local table_unpack = table.unpack or unpack -- Lua 5.1 support
diff --git a/docs/index.html b/docs/index.html
index 116fc0a..2e74495 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -38,6 +38,7 @@
                        <a href="#description">Description</a> &middot;
                        <a href="#systems">Supported systems</a> &middot;
                        <a href="#installing">Building and Installing</a> &middot;
+                        <a href="#apicheatsheet">API Cheat sheet</a>
                        <a href="#embedding">Embedding</a>
                </p>
@@ -66,11 +67,11 @@
                                <br />
                                <i>Copyright &copy; 2007-25 Asko Kauppi, Benoit Germain. All rights reserved.</i>
                                <br />
-                                Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, 5.3 and 5.4.
+                                Lua Lanes is published under the same <a href="http://en.wikipedia.org/wiki/MIT_License">MIT license</a> as Lua 5.1, 5.2, 5.3, 5.4 and 5.5.
                        </p>
                        <p>
-                                This document was revised on 18-Apr-25, and applies to version <tt>4.0.0</tt>.
+                                This document was revised on 03-Jul-25, and applies to version <tt>4.0.0</tt>.
                        </p>
                </font>
        </center>
@@ -88,7 +89,7 @@
        Lanes is included into your software by the regular <tt>require "lanes"</tt> method. No C side programming is needed; all APIs are Lua side, and most existing extension modules should work seamlessly together with the multiple lanes.
 </p>
 <p>
-        Lanes should build and run identically with either Lua 5.1 to Lua 5.4, as well as LuaJIT.
+        Lanes should build and run identically with either Lua 5.1 to Lua 5.5, as well as LuaJIT.
 </p>
 <p>
        See <A HREF="comparison.html">comparison</A> of Lua Lanes with other Lua multithreading solutions.
@@ -105,7 +106,7 @@
                <li>Threads can be given priorities.</li>
                <li>Lanes are cancellable, with proper cleanup.</li>
                <li>No Lua-side application level locking - ever!</li>
-                <li>Several totally independant Lanes universes may coexist in an application, one per "master" Lua state.</li>
+                <li>Several totally independent Lanes universes may coexist in an application, one per "master" Lua state.</li>
        </ul>
@@ -116,7 +117,7 @@
                <li>Sharing full userdata between states needs special C side preparations (-&gt; <A HREF="#deep_userdata">deep userdata</A> and -&gt; <A HREF="#clonable_userdata">clonable userdata</A>).</li>
                <li>Network level parallelism not included.</li>
                <li>Multi-CPU is done with OS threads, not processes. A lane is a Lua full userdata, therefore it will exist only as long as the Lua state that created it still exists. Therefore, a lane won't continue execution after the main program's termination.</li>
-                <li>Just like independant Lua states, Lanes universes cannot communicate together.</li>
+                <li>Just like independent Lua states, Lanes universes cannot communicate together.</li>
        </ul>
 </p>
@@ -169,6 +170,84 @@
 </pre>
+<!-- API reference +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
+ <hr/>
+ <h2 id="apicheatsheet">API Cheat sheet</h2>
+ <ul>
+        <li>
+                <tt>require "lanes"</tt>: to require Lanes
+        </li>
+        <li>
+                The <tt>lanes</tt> module
+                <ul>
+                        <li><tt>lanes.cancel_error</tt>: a special error value returned from cancelled lanes</li>
+                        <li><tt>lanes.collectgarbage()</tt>: trigger a GC cycle in all Keeper states</li>
+                        <li><tt>lanes.configure()</tt>: configure Lanes</li>
+                        <li><tt>lanes.coro()</tt>: start a coroutine-like lane</li>
+                        <li><tt>lanes.finally()</tt>: install a function called on Lanes shutdown</li>
+                        <li><tt>lanes.gen()</tt>: start a lane as a regular function</li>
+                        <li><tt>lanes.genactomic()</tt>: obtain an atomic counter</li>
+                        <li><tt>lanes.genlock()</tt>: obtain an atomic-like data stack</li>
+                        <li><tt>lanes.linda()</tt>: create a Linda</li>
+                        <li><tt>lanes.nameof()</tt>: find where a value exists</li>
+                        <li><tt>lanes.thread_priority_range()</tt>: obtain the valid range of thread priorities</li>
+                        <li><tt>lanes.now_secs()</tt>: obtain the current clock value</li>
+                        <li><tt>lanes.register()</tt>: scan modules so that functions using them can be transferred</li>
+                        <li><tt>lanes.set_thread_priority()</tt>: change thread priority</li>
+                        <li><tt>lanes.set_thread_affinity()</tt>: change thread affinity</li>
+                        <li><tt>lanes.threads()</tt>: obtain a list of all lanes</li>
+                        <li><tt>lanes.sleep()</tt>: sleep for a given duration</li>
+                        <li><tt>lanes.timer()</tt>: start a timer</li>
+                        <li><tt>lanes.timers()</tt>: list active timers</li>
+                </ul>
+        </li>
+        <li>
+                Given some lane handle <tt>lane_h</tt>
+                <ul>
+                        <li><tt>lane_h[]</tt>: wait for, and read the values returned by the lane</li>
+                        <li><tt>lane_h:cancel()</tt>: request the lane to stop running</li>
+                        <li><tt>lane_h.error_trace_level</tt>: current setting of error logging level</li>
+                        <li><tt>lane_h:get_threadname()</tt>: read the thread name</li>
+                        <li><tt>lane_h:join()</tt>: wait for the lane to close, reading the returned values</li>
+                        <li><tt>lane_h:resume()</tt>: resume a coroutine Lane</li>
+                        <li><tt>lane_h.status</tt>: current status of the lane</li>
+                </ul>
+        </li>
+        <li>
+                Inside the lane
+                <ul>
+                        <li><tt>cancel_test()</tt>: check for cancellation requests</li>
+                        <li><tt>lane_threadname()</tt>: read or change the name of the thread</li>
+                        <li><tt>set_finalizer()</tt>: install a function called when the lane exits</li>
+                </ul>
+        </li>
+        <li>
+                Given some Linda <tt>l</tt>
+                <ul>
+                        <li><tt>l:cancel()</tt>: mark a Linda for cancellation</li>
+                        <li><tt>l:collectgarbage()</tt>: trigger a GC cycle in the Linda's Keeper state</li>
+                        <li><tt>l:deep()</tt>: obtain a light userdata uniquely representing the Linda</li>
+                        <li><tt>l:dump()</tt>: have information about slot contents</li>
+                        <li><tt>l:count()</tt>: obtain a count of data items in slots</li>
+                        <li><tt>l:get()</tt>: read data without consuming it</li>
+                        <li><tt>l:limit()</tt>: cap the amount of transiting data</li>
+                        <li><tt>l:receive()</tt>: read one item of data from multiple slots</li>
+                        <li><tt>l:receive_batched()</tt>: read several item of data from a single slot</li>
+                        <li><tt>l:restrict()</tt>: place a restraint on the operations that can be done on a slot</li>
+                        <li><tt>l:send()</tt>: append data</li>
+                        <li><tt>l:set()</tt>: replace the data</li>
+                        <li><tt>l:wake()</tt>: manually wake blocking calls</li>
+                </ul>
+        </li>
+        <li>
+                embedding
+                <ul>
+                        <li><tt>luaopen_lanes_embedded</tt>: manually initialize Lanes</li>
+                </ul>
+        </li>
+ </ul>
 <!-- embedding +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 <hr/>
 <h2 id="embedding">Embedding</h2>
@@ -785,12 +864,13 @@
                </tr>
                <tr valign=top>
                        <td>
-                                <code>.priority</code>
+                                <code>.priority</code><br />
+                                <code>.native_priority</code>
                        </td>
                        <td>integer</td>
                        <td>
-                                The priority of lanes generated in the range -3..+3 (default is 0).
+                                <tt>priority</tt>: The priority of lanes in the range <tt>[-3,+3]</tt> (default is 0). These values are a mapping over the actual priority range of the underlying implementation.<br />
-                                These values are a mapping over the actual priority range of the underlying implementation.<br />
+                                <tt>native_priority</tt>: The priority of lanes in a platform-dependent range. Use <a href="#priority"><tt>lanes.thread_priority_range()</tt></a> to query said range.
                                Implementation and dependability of priorities varies by platform. Especially Linux kernel 2.6 is not supporting priorities in user mode.<br />
                                A lane can also change its own thread priority dynamically with <a href="#priority"><tt>lanes.set_thread_priority()</tt></a>.
                        </td>
@@ -813,7 +893,7 @@
        The name is stored inside the Lua state registry so that it is available for error reporting. Changing <tt>decoda_name</tt> doesn't affect this hidden name or the OS thread name reported by MSVC.<br />
        When Lanes is initialized by the first <a href="#initialization"><tt>lanes.configure()</tt></a> call, <tt>"main"</tt> is stored in the registry in the same fashion (but <tt>decoda_name</tt> and the OS thread name are left unchanged).<br />
        The lane also has a method <tt>lane:get_threadname()</tt> that gives access to that name from the caller side (returns <tt>"&lt;unnamed&gt;"</tt> if unset).<br />
-        With Lua 5.4, Lanes have a <tt>__close</tt> metamethod, meaning they can be declared to-be-closed. <tt>__close</tt> calls <tt>lane:join(nil)</tt>.
+        With Lua 5.4+, Lanes have a <tt>__close</tt> metamethod, meaning they can be declared to-be-closed. <tt>__close</tt> calls <tt>lane:join(nil)</tt>.
 </p>
 <p>
@@ -842,8 +922,9 @@
                </tr>
        </table>
-        Coroutine lanes function mostly like regular coroutines. They can use <tt>coroutine.yield()</tt> normally, in which case the yielded values can be obtained with regular lane indexing (see <a href="#results">Results and errors</a>).<br />
+        Coroutine lanes function mostly like regular coroutines. They can use <tt>coroutine.yield()</tt> normally.<br />
-        A yielded coroutine lane has a <tt>"suspended"</tt> status. It can be resumed with <tt>lane_h:resume(values...)</tt>.
+        A yielded coroutine lane has a <tt>"suspended"</tt> status. It can be resumed with <tt>lane_h:resume(values...), which returns the yielded values</tt>.
+        The latter can also be the returned values of <tt>lane_h:join()</tt> or accessed by regular lane indexing (see <a href="#results">Results and errors</a>).<br />
        <table border="1" bgcolor="#FFFFE0" cellpadding="10" style="width:50%">
                <tr>
                        <td>
@@ -852,8 +933,8 @@
                </tr>
        </table>
-        The reply values are returned to the lane body at the <tt>coroutine.yield()</tt> point.<br />
+        Just like regulare coroutines, the reply values passed to <tt>h:resume()</tt> are returned to the lane body at the <tt>coroutine.yield()</tt> point.<br />
-        If the yielded values were previously obtained by lane indexing, <tt>resume()</tt> returns <tt>nil</tt>.
+        If a coroutine lane is suspended when it is joined either by indexing or <tt>lane_h:join()</tt>, active to-be-closed variables are closed at that point, and the Lane can no longer be resumed.
 </p>
 <h3>Free running lanes</h3>
@@ -879,14 +960,17 @@
        <table border="1" bgcolor="#E0E0FF" cellpadding="10" style="width:50%">
                <tr>
                        <td>
-                                <pre>   lanes.set_thread_priority(prio)</pre>
+                                <pre>   prio_min, prio_max = lanes.thread_priority_range(prio [,"native"])</pre>
+                                <pre>   lanes.set_thread_priority(prio [,"native"])</pre>
                        </td>
                </tr>
        </table>
 <p>
        Besides setting a default priority in the generator <a href="#generator_settings">settings</a>, each thread can change its own priority at will. This is also true for the main Lua state.
        <br />
-        The priority must be in the range <tt>[-3,+3]</tt>.
+        <tt>lanes.thread_priority_range()</tt> returns the range of acceptable mapped values. If nothing is specified, should be <tt>[-3,3]</tt> or <tt>[0,3]</tt>, depending on the threading implementation.
+        <br />
+        <tt>lanes.thread_priority_range('native')</tt> returns the range of acceptable native values. The actual values are threading implementation dependent. And some implementations can only accept some values inside that range. YMMV.
 </p>
@@ -1073,7 +1157,7 @@
 </p>
 <table border="1" bgcolor="#E0E0FF" cellpadding="10" style="width:50%"><tr><td><pre>
-        [...]|[nil,err,stack_tbl]= lane_h:join([timeout])
+        [true, ...]|[nil,err,stack_tbl]= lane_h:join([timeout])
 </pre></td></tr></table>
 <p>
@@ -1091,9 +1175,9 @@
                        </ul>
                </li>
                <li><tt>nil, "killed"</tt> if forcefully killed.</li>
-                <li>The return values of the lane function. If the first return value is <tt>nil</tt> (or there is no return value), an error is raised, to make sure you can tell timeout and error cases apart from successful return.</li>
+                <li><tt>true [, returned-values]</tt>: The return values of the lane function.</li>
        </ul>
-        If the lane handle obtained from <tt>lanes.gen()</tt> is to-be-closed, closing the value will cause a call to <tt>join()</tt>. Since it is implicit, the lane body isn't forced to return non-<tt>nil</tt> in that case.
+        If the lane handle obtained from <tt>lanes.gen()</tt> is to-be-closed, closing the value will cause a call to <tt>join()</tt>.
 </p>
 <table border=1 bgcolor="#FFFFE0" cellpadding="10" style="width:50%"><tr><td><pre>
@@ -1137,38 +1221,49 @@
 </pre></td></tr></table>
 <p>
-        <tt>timeout</tt> is an optional number &gt= 0. Defaults to infinite if left unspecified or <tt>nil</tt>.
-        <br />
        <tt>cancel()</tt> sends a cancellation request to the lane.
-        <br />
+        <p>
-        First argument is a <tt>mode</tt> can be one of:
+                Returns <tt>true, lane_h.status</tt> if lane was already done (in <tt>"done"</tt>, <tt>"error"</tt> or <tt>"cancelled"</tt> status), or the cancellation was fruitful within <tt>timeout_secs</tt> timeout period.<br />
+                Returns <tt>false, "timeout"</tt> otherwise.
+        </p>
+        First argument is a <tt>mode</tt>. It can be one of:
        <ul>
                <li>
-                        <tt>"soft"</tt>: Cancellation will only cause <tt>cancel_test()</tt> to return <tt>true</tt>, so that the lane can cleanup manually.
+                        <tt>"soft"</tt>: Cancellation will only cause <tt>cancel_test()</tt> to return <tt>"soft"</tt>, so that the lane can cleanup manually.
+                        <br />
+                        Lindas will also check for cancellation inside blocking calls to early out based on their <tt>wake_period</tt>.
                </li>
                <li>
-                        <tt>"hard"</tt>: waits for the request to be processed, or a timeout to occur. <a href="#lindas">linda</a> operations detecting the cancellation request will raise a special cancellation error (meaning they won't return in that case).<br />
+                        <tt>"hard"</tt>: waits for the request to be processed, or a timeout to occur. <a href="#lindas">linda</a> operations detecting the cancellation request will raise a special cancellation error (meaning they won't return in that case).
+                        <br />
+                        If the lane isn't actually waiting on a Linda when the request is issued, a lane calling <tt>cancel_test()</tt> will see it return <tt>"hard"</tt>.
+                        <br />
                        <tt>wake_lane</tt> defaults to <tt>true</tt>, and <tt>timeout</tt> defaults to 0 if not specified.
                </li>
                <li>
                        <tt>"call"</tt>, <tt>"ret"</tt>, <tt>"line"</tt>, <tt>"count"</tt>: Asynchronously install the corresponding hook, then behave as <tt>"hard"</tt>.
+                        <br />
+                        If the lane has the opportunity to call <tt>cancel_test()</tt> before the hook is invoked, calling <tt>cancel_test()</tt> will see it return <tt>"hard"</tt>.
                </li>
                <li>
                        <tt>"all"</tt>: Installs all hooks in one shot, just to be sure.
                </li>
        </ul>
-        If <tt>mode</tt> is not specified, it defaults to <tt>"hard"</tt>.
+        <p>
+                If <tt>mode</tt> is not specified, it defaults to <tt>"hard"</tt>.
+        </p>
+</p>
+<p>
        If <tt>wake_lane</tt> is <tt>true</tt>, the lane is also signalled so that execution returns from any pending <a href="#lindas">linda</a> operation. <a href="#lindas">linda</a> operations detecting the cancellation request return <tt>lanes.cancel_error</tt>.
 </p>
 <p>
-        Returns <tt>true, lane_h.status</tt> if lane was already done (in <tt>"done"</tt>, <tt>"error"</tt> or <tt>"cancelled"</tt> status), or the cancellation was fruitful within <tt>timeout_secs</tt> timeout period.<br />
+        <tt>timeout</tt> is an optional number &gt= 0. Defaults to infinite if left unspecified or <tt>nil</tt>.
-        Returns <tt>false, "timeout"</tt> otherwise.
 </p>
 <p>
        If the lane is still running after the timeout expired, there is a chance lanes will freeze forever at shutdown when failing to terminate all free-running lanes within the specified timeout.
 </p>
 <p>
-        Cancellation is tested <u>before</u> going to sleep in <tt>receive()</tt> or <tt>send()</tt> calls and after executing <tt>cancelstep</tt> Lua statements. A pending <tt>receive()</tt>or <tt>send()</tt> call is awakened.
+        Cancellation is tested <u>before</u> going to sleep in <tt>receive()</tt>, <tt>receive_batched()</tt> or <tt>send()</tt> calls and after executing <tt>cancelstep</tt> Lua statements. A pending <tt>receive()</tt>or <tt>send()</tt> call is awakened.
        <br />
        This means the execution of the lane will resume although the operation has not completed, to give the lane a chance to detect cancellation (even in the case the code waits on a <a href="#lindas">linda</a> with infinite timeout).
        <br />
diff --git a/lanes-4.0.0-0.rockspec b/lanes-4.0.0-0.rockspec
index 77e0f6a..f4de050 100644
--- a/lanes-4.0.0-0.rockspec
+++ b/lanes-4.0.0-0.rockspec
@@ -36,7 +36,7 @@ supported_platforms= { "win32",
 }
 dependencies= {
-        "lua >= 5.1", -- builds with either 5.1/LuaJIT, 5.2, 5.3 and 5.4
+        "lua >= 5.1", -- builds with either 5.1/LuaJIT, 5.2, 5.3, 5.4 and 5.5
 }
 build = {
@@ -56,7 +56,7 @@ build = {
        },
        modules =
        {
-                ["lanes.core"] =
+                ["lanes_core"] =
                {
                        sources =
                        {
diff --git a/src/allocator.cpp b/src/allocator.cpp
index 84acde5..243583b 100644
--- a/src/allocator.cpp
+++ b/src/allocator.cpp
@@ -35,7 +35,7 @@ namespace lanes
 {
    AllocatorDefinition& AllocatorDefinition::Validated(lua_State* const L_, StackIndex const idx_)
    {
-        lanes::AllocatorDefinition* const _def{ luaG_tofulluserdata<lanes::AllocatorDefinition>(L_, idx_) };
+        lanes::AllocatorDefinition* const _def{ luaW_tofulluserdata<lanes::AllocatorDefinition>(L_, idx_) };
        // raise an error and don't return if the full userdata at the specified index is not a valid AllocatorDefinition
        if (!_def) {
            raise_luaL_error(L_, "Bad config.allocator function, provided value is not a userdata");
diff --git a/src/allocator.hpp b/src/allocator.hpp
index c073391..b578f12 100644
--- a/src/allocator.hpp
+++ b/src/allocator.hpp
@@ -33,6 +33,8 @@ namespace lanes {
        // can't actually delete the operator because the compiler generates stack unwinding code that could call it in case of exception
        static void operator delete([[maybe_unused]] void* const p_, [[maybe_unused]] lua_State* const L_) {}
+        ~AllocatorDefinition() = default;
        AllocatorDefinition(lua_Alloc const allocF_, void* const allocUD_) noexcept
        : allocF{ allocF_ }
        , allocUD{ allocUD_ }
@@ -64,7 +66,7 @@ namespace lanes {
        [[nodiscard]]
        lua_State* newState() const
        {
-            return lua_newstate(allocF, allocUD);
+            return luaW_newstate(allocF, allocUD, luaL_makeseed(nullptr));
        }
        [[nodiscard]]
diff --git a/src/cancel.cpp b/src/cancel.cpp
index 5bba9fc..6812b0d 100644
--- a/src/cancel.cpp
+++ b/src/cancel.cpp
@@ -38,6 +38,53 @@ THE SOFTWARE.
 #include "debugspew.hpp"
 #include "lane.hpp"
+namespace {
+    namespace local {
+        // #########################################################################################
+        // #########################################################################################
+        [[nodiscard]]
+        static std::optional<CancelOp> WhichCancelOp(std::string_view const& opString_)
+        {
+            if (opString_ == "soft") {
+                return std::make_optional<CancelOp>(CancelRequest::Soft, LuaHookMask::None);
+            } else if (opString_ == "hard") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::None);
+            } else if (opString_ == "call") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Call);
+            } else if (opString_ == "ret") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Ret);
+            } else if (opString_ == "line") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Line);
+            } else if (opString_ == "count") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Count);
+            } else if (opString_ == "all") {
+                return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::All);
+            }
+            return std::nullopt;
+        }
+        // #########################################################################################
+        [[nodiscard]]
+        static CancelOp WhichCancelOp(lua_State* const L_, StackIndex const idx_)
+        {
+            if (luaW_type(L_, idx_) == LuaType::STRING) {
+                std::string_view const _str{ luaW_tostring(L_, idx_) };
+                auto const _op{ WhichCancelOp(_str) };
+                lua_remove(L_, idx_); // argument is processed, remove it
+                if (!_op.has_value()) {
+                    raise_luaL_error(L_, "Invalid cancel operation '%s'", _str.data());
+                }
+                return _op.value();
+            }
+            return CancelOp{ CancelRequest::Hard, LuaHookMask::None };
+        }
+    } // namespace local
+} // namespace
 // #################################################################################################
 // #################################################################################################
@@ -60,66 +107,6 @@ CancelRequest CheckCancelRequest(lua_State* const L_)
 // #################################################################################################
 // #################################################################################################
-//---
-// = lane_cancel( lane_ud [,timeout_secs=0.0] [,wake_lindas_bool=false] )
-//
-// The originator thread asking us specifically to cancel the other thread.
-//
-// 'timeout': <0: wait forever, until the lane is finished
-//            0.0: just signal it to cancel, no time waited
-//            >0: time to wait for the lane to detect cancellation
-//
-// 'wake_lindas_bool': if true, signal any linda the thread is waiting on
-//                     instead of waiting for its timeout (if any)
-//
-// Returns: true if the lane was already finished (Done/Error/Cancelled) or if we
-//          managed to cancel it.
-//          false if the cancellation timed out, or a kill was needed.
-//
-// #################################################################################################
-// #################################################################################################
-static std::optional<CancelOp> WhichCancelOp(std::string_view const& opString_)
-{
-    if (opString_ == "soft") {
-        return std::make_optional<CancelOp>(CancelRequest::Soft, LuaHookMask::None);
-    } else if (opString_ == "hard") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::None);
-    } else if (opString_== "call") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Call);
-    } else if (opString_ == "ret") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Ret);
-    } else if (opString_ == "line") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Line);
-    } else if (opString_ == "count") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::Count);
-    } else if (opString_ == "all") {
-        return std::make_optional<CancelOp>(CancelRequest::Hard, LuaHookMask::All);
-    }
-    return std::nullopt;
-}
-// #################################################################################################
-[[nodiscard]]
-static CancelOp WhichCancelOp(lua_State* const L_, StackIndex const idx_)
-{
-    if (luaG_type(L_, idx_) == LuaType::STRING) {
-        std::string_view const _str{ luaG_tostring(L_, idx_) };
-        auto const _op{ WhichCancelOp(_str) };
-        lua_remove(L_, idx_); // argument is processed, remove it
-        if (!_op.has_value()) {
-            raise_luaL_error(L_, "Invalid cancel operation '%s'", _str.data());
-        }
-        return _op.value();
-    }
-    return CancelOp{ CancelRequest::Hard, LuaHookMask::None };
-}
-// #################################################################################################
-// #################################################################################################
 // ######################################### Lua API ###############################################
 // #################################################################################################
 // #################################################################################################
@@ -133,24 +120,45 @@ static CancelOp WhichCancelOp(lua_State* const L_, StackIndex const idx_)
 LUAG_FUNC(cancel_test)
 {
    CancelRequest const _test{ CheckCancelRequest(L_) };
-    lua_pushboolean(L_, _test != CancelRequest::None);
+    if (_test == CancelRequest::None) {
+        lua_pushboolean(L_, 0);
+    } else {
+        luaW_pushstring(L_, (_test == CancelRequest::Soft) ? "soft" : "hard");
+    }
    return 1;
 }
 // #################################################################################################
+//---
+// = lane_cancel( lane_ud [,timeout_secs=0.0] [,wake_lindas_bool=false] )
+//
+// The originator thread asking us specifically to cancel the other thread.
+//
+// 'timeout': <0: wait forever, until the lane is finished
+//            0.0: just signal it to cancel, no time waited
+//            >0: time to wait for the lane to detect cancellation
+//
+// 'wake_lindas_bool': if true, signal any linda the thread is waiting on
+//                     instead of waiting for its timeout (if any)
+//
+// Returns: true if the lane was already finished (Done/Error/Cancelled) or if we
+//          managed to cancel it.
+//          false if the cancellation timed out, or a kill was needed.
+//
 // bool[,reason] = lane_h:cancel( [cancel_op, hookcount] [, timeout] [, wake_lane])
 LUAG_FUNC(lane_cancel)
 {
    Lane* const _lane{ ToLane(L_, StackIndex{ 1 }) };                                              // L_: lane [cancel_op, hookcount] [, timeout] [, wake_lane]
-    CancelOp const _op{ WhichCancelOp(L_, StackIndex{ 2 }) };                                      // L_: lane [hookcount] [, timeout] [, wake_lane]
+    CancelOp const _op{ local::WhichCancelOp(L_, StackIndex{ 2 }) };                               // L_: lane [hookcount] [, timeout] [, wake_lane]
    int const _hook_count{ std::invoke([_op, L_]() {
        if (_op.hookMask == LuaHookMask::None) {
            // the caller shouldn't have provided a hook count in that case
            return 0;
        }
-        if (luaG_type(L_, StackIndex{ 2 }) != LuaType::NUMBER) {
+        if (luaW_type(L_, StackIndex{ 2 }) != LuaType::NUMBER) {
            raise_luaL_error(L_, "Hook count expected");
        }
        auto const _hook_count{ static_cast<int>(lua_tointeger(L_, 2)) };
@@ -162,7 +170,7 @@ LUAG_FUNC(lane_cancel)
    }) };
    std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-    if (luaG_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
+    if (luaW_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
        lua_Duration const duration{ lua_tonumber(L_, 2) };
        if (duration.count() >= 0.0) {
            _until = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(duration);
@@ -178,7 +186,7 @@ LUAG_FUNC(lane_cancel)
    WakeLane _wake_lane{ (_op.mode == CancelRequest::Hard) ? WakeLane::Yes : WakeLane::No };
    if (lua_gettop(L_) >= 2) {
        if (!lua_isboolean(L_, 2)) {
-            raise_luaL_error(L_, "Boolean expected for wake_lane argument, got %s", luaG_typename(L_, StackIndex{ 2 }).data());
+            raise_luaL_error(L_, "Boolean expected for wake_lane argument, got %s", luaW_typename(L_, StackIndex{ 2 }).data());
        }
        _wake_lane = lua_toboolean(L_, 2) ? WakeLane::Yes : WakeLane::No;
        lua_remove(L_, 2); // argument is processed, remove it                                     // L_: lane
@@ -198,7 +206,7 @@ LUAG_FUNC(lane_cancel)
    case CancelResult::Timeout:
        lua_pushboolean(L_, 0);                                                                    // L_: false
-        luaG_pushstring(L_, "timeout");                                                            // L_: false "timeout"
+        luaW_pushstring(L_, "timeout");                                                            // L_: false "timeout"
        break;
    case CancelResult::Cancelled:
diff --git a/src/compat.cpp b/src/compat.cpp
index 7e90142..c833480 100644
--- a/src/compat.cpp
+++ b/src/compat.cpp
@@ -5,10 +5,10 @@
 // #################################################################################################
-UserValueCount luaG_getalluservalues(lua_State* const L_, StackIndex const idx_)
+UserValueCount luaW_getalluservalues(lua_State* const L_, StackIndex const idx_)
 {
    STACK_CHECK_START_REL(L_, 0);
-    StackIndex const _idx{ luaG_absindex(L_, idx_) };
+    StackIndex const _idx{ luaW_absindex(L_, idx_) };
    UserValueIndex _nuv{ 0 };
    do {
        // we don't know how many uservalues we are going to extract, there might be a lot...
@@ -24,15 +24,15 @@ UserValueCount luaG_getalluservalues(lua_State* const L_, StackIndex const idx_)
 // #################################################################################################
 // a small helper to obtain a module's table from the registry instead of relying on the presence of _G["<name>"]
-LuaType luaG_getmodule(lua_State* const L_, std::string_view const& name_)
+LuaType luaW_getmodule(lua_State* const L_, std::string_view const& name_)
 {
    STACK_CHECK_START_REL(L_, 0);
-    LuaType _type{ luaG_getfield(L_, kIdxRegistry, LUA_LOADED_TABLE) };                            // L_: _R._LOADED|nil
+    LuaType _type{ luaW_getfield(L_, kIdxRegistry, LUA_LOADED_TABLE) };                            // L_: _R._LOADED|nil
    if (_type != LuaType::TABLE) {                                                                 // L_: _R._LOADED|nil
        STACK_CHECK(L_, 1);
        return _type;
    }
-    _type = luaG_getfield(L_, kIdxTop, name_);                                                     // L_: _R._LOADED {module}|nil
+    _type = luaW_getfield(L_, kIdxTop, name_);                                                     // L_: _R._LOADED {module}|nil
    lua_remove(L_, -2);                                                                            // L_: {module}|nil
    STACK_CHECK(L_, 1);
    return _type;
@@ -52,7 +52,7 @@ int luaL_getsubtable(lua_State* const L_, StackIndex const idx_, char const* fna
        return 1; /* table already there */
    } else {
        lua_pop(L_, 1); /* remove previous result */
-        StackIndex const _absidx{ luaG_absindex(L_, idx_) };
+        StackIndex const _absidx{ luaW_absindex(L_, idx_) };
        lua_newtable(L_);
        lua_pushvalue(L_, -1); /* copy to be left at top */
        lua_setfield(L_, _absidx, fname_); /* assign new table to field */
@@ -149,3 +149,41 @@ int lua_setiuservalue(lua_State* const L_, StackIndex const idx_, UserValueIndex
 }
 #endif // LUA_VERSION_NUM
+// #################################################################################################
+#if LUA_VERSION_NUM < 505
+#include <time.h>
+/* Size for the buffer, in bytes */
+#define BUFSEEDB (sizeof(void*) + sizeof(time_t))
+/* Size for the buffer in int's, rounded up */
+#define BUFSEED ((BUFSEEDB + sizeof(int) - 1) / sizeof(int))
+/*
+** Copy the contents of variable 'v' into the buffer pointed by 'b'.
+** (The '&b[0]' disguises 'b' to fix an absurd warning from clang.)
+*/
+#define addbuff(b, v) (memcpy(&b[0], &(v), sizeof(v)), b += sizeof(v))
+// Copied from Lua 5.5 lauxlib.c
+unsigned int luaL_makeseed(lua_State*)
+{
+    unsigned int buff[BUFSEED];
+    unsigned int res;
+    unsigned int i;
+    time_t t = time(nullptr);
+    char* b = (char*) buff;
+    addbuff(b, b); /* local variable's address */
+    addbuff(b, t); /* time */
+    /* fill (rare but possible) remain of the buffer with zeros */
+    memset(b, 0, sizeof(buff) - BUFSEEDB);
+    res = buff[0];
+    for (i = 1; i < BUFSEED; i++)
+        res ^= (res >> 3) + (res << 7) + buff[i];
+    return res;
+}
+#endif // LUA_VERSION_NUM < 505
diff --git a/src/compat.hpp b/src/compat.hpp
index 9a8dedf..4dc7433 100644
--- a/src/compat.hpp
+++ b/src/compat.hpp
@@ -5,7 +5,6 @@
 // try to detect if we are building against LuaJIT or MoonJIT
 #if defined(LUA_JITLIBNAME)
-#include "luajit.h"
 #if (defined(__x86_64__) || defined(_M_X64) || defined(__LP64__))
 #define LUAJIT_FLAVOR() 64
 #else // 64 bits
@@ -21,7 +20,7 @@
 #endif // LUA_OK
 #ifndef LUA_ERRGCMM
-#define LUA_ERRGCMM 666 // doesn't exist in Lua 5.1 and Lua 5.4, we don't care about the actual value
+#define LUA_ERRGCMM 666 // doesn't exist in Lua 5.1 and Lua 5.4/5.5, we don't care about the actual value
 #endif // LUA_ERRGCMM
@@ -29,7 +28,7 @@
 #define LUA_LOADED_TABLE "_LOADED" // doesn't exist before Lua 5.3
 #endif // LUA_LOADED_TABLE
-// code is now preferring Lua 5.4 API
+// code is now preferring Lua 5.5 API
 // #################################################################################################
@@ -76,18 +75,6 @@ int luaL_getsubtable(lua_State* L_, StackIndex idx_, char const* fname_);
 // #################################################################################################
-// wrap Lua 5.3 calls under Lua 5.1 API when it is simpler that way
-#if LUA_VERSION_NUM == 503
-inline int luaL_optint(lua_State* L_, int n_, lua_Integer d_)
-{
-    return static_cast<int>(luaL_optinteger(L_, n_, d_));
-}
-#endif // LUA_VERSION_NUM == 503
-// #################################################################################################
 #if LUA_VERSION_NUM < 504
 void* lua_newuserdatauv(lua_State* L_, size_t sz_, UserValueCount nuvalue_);
@@ -100,15 +87,11 @@ int lua_setiuservalue(lua_State* L_, StackIndex idx_, UserValueIndex n_);
 // #################################################################################################
-// wrap Lua 5.4 calls under Lua 5.1 API when it is simpler that way
+#if LUA_VERSION_NUM < 505
-#if LUA_VERSION_NUM == 504
-inline int luaL_optint(lua_State* L_, StackIndex n_, lua_Integer d_)
+unsigned int luaL_makeseed(lua_State*);
-{
-    return static_cast<int>(luaL_optinteger(L_, n_, d_));
-}
-#endif // LUA_VERSION_NUM == 504
+#endif // LUA_VERSION_NUM < 505
 // #################################################################################################
@@ -136,14 +119,14 @@ inline constexpr LuaError ToLuaError(int const rc_)
 // break lexical order for that one because it's needed below
 [[nodiscard]]
-inline LuaType luaG_type(lua_State* const L_, StackIndex const idx_)
+inline LuaType luaW_type(lua_State* const L_, StackIndex const idx_)
 {
    return static_cast<LuaType>(lua_type(L_, idx_));
 }
 // #################################################################################################
 // #################################################################################################
-// All the compatibility wrappers we expose start with luaG_
+// All the compatibility wrappers we expose start with luaW_
 // #################################################################################################
 // #################################################################################################
@@ -152,7 +135,7 @@ inline LuaType luaG_type(lua_State* const L_, StackIndex const idx_)
 // a replacement of lua_tolstring
 [[nodiscard]]
-inline std::string_view luaG_tostring(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_tostring(lua_State* const L_, StackIndex const idx_)
 {
    size_t _len{ 0 };
    char const* _str{ lua_tolstring(L_, idx_, &_len) };
@@ -160,7 +143,7 @@ inline std::string_view luaG_tostring(lua_State* const L_, StackIndex const idx_
 }
 [[nodiscard]]
-inline std::string_view luaG_checkstring(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_checkstring(lua_State* const L_, StackIndex const idx_)
 {
    size_t _len{ 0 };
    char const* _str{ luaL_checklstring(L_, idx_, &_len) };
@@ -168,7 +151,7 @@ inline std::string_view luaG_checkstring(lua_State* const L_, StackIndex const i
 }
 [[nodiscard]]
-inline std::string_view luaG_optstring(lua_State* const L_, StackIndex const idx_, std::string_view const& default_)
+inline std::string_view luaW_optstring(lua_State* const L_, StackIndex const idx_, std::string_view const& default_)
 {
    if (lua_isnoneornil(L_, idx_)) {
        return default_;
@@ -179,13 +162,13 @@ inline std::string_view luaG_optstring(lua_State* const L_, StackIndex const idx
 }
 template <typename... EXTRA>
-inline std::string_view luaG_pushstring(lua_State* const L_, std::string_view const& str_, EXTRA&&... extra_)
+inline std::string_view luaW_pushstring(lua_State* const L_, std::string_view const& str_, EXTRA&&... extra_)
 {
    if constexpr (sizeof...(EXTRA) == 0) {
        if constexpr (LUA_VERSION_NUM == 501) {
            // lua_pushlstring doesn't return a value in Lua 5.1
            lua_pushlstring(L_, str_.data(), str_.size());
-            return luaG_tostring(L_, kIdxTop);
+            return luaW_tostring(L_, kIdxTop);
        } else {
            return std::string_view{ lua_pushlstring(L_, str_.data(), str_.size()), str_.size() };
        }
@@ -198,7 +181,7 @@ inline std::string_view luaG_pushstring(lua_State* const L_, std::string_view co
 // #################################################################################################
 // use this in place of lua_absindex to save a function call
-inline StackIndex luaG_absindex(lua_State* const L_, StackIndex const idx_)
+inline StackIndex luaW_absindex(lua_State* const L_, StackIndex const idx_)
 {
    return StackIndex{ (idx_ >= 0 || idx_ <= kIdxRegistry) ? idx_ : StackIndex{ lua_gettop(L_) + idx_ + 1 } };
 }
@@ -227,14 +210,14 @@ static inline int WrapLuaDump(LUA_DUMP f_, lua_State* const L_, lua_Writer const
 // -------------------------------------------------------------------------------------------------
-static inline int luaG_dump(lua_State* const L_, lua_Writer const writer_, void* const data_, int const strip_)
+static inline int luaW_dump(lua_State* const L_, lua_Writer const writer_, void* const data_, int const strip_)
 {
    return WrapLuaDump(lua_dump, L_, writer_, data_, strip_);
 }
 // #################################################################################################
-UserValueCount luaG_getalluservalues(lua_State* L_, StackIndex idx_);
+UserValueCount luaW_getalluservalues(lua_State* L_, StackIndex idx_);
 // #################################################################################################
@@ -272,7 +255,7 @@ static inline int WrapLuaGetField(LUA_GETFIELD f_, lua_State* const L_, StackInd
 // -------------------------------------------------------------------------------------------------
 [[nodiscard]]
-static inline LuaType luaG_getfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
+static inline LuaType luaW_getfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
 {
    return static_cast<LuaType>(WrapLuaGetField(lua_getfield, L_, idx_, name_));
 }
@@ -280,21 +263,62 @@ static inline LuaType luaG_getfield(lua_State* const L_, StackIndex const idx_,
 // #################################################################################################
 [[nodiscard]]
-LuaType luaG_getmodule(lua_State* L_, std::string_view const& name_);
+LuaType luaW_getmodule(lua_State* L_, std::string_view const& name_);
+// #################################################################################################
+template <typename LUA_NEWSTATE>
+concept RequiresOldLuaNewState = requires(LUA_NEWSTATE f_)
+{
+    {
+        f_(nullptr, 0)
+    } -> std::same_as<lua_State*>;
+};
+template <RequiresOldLuaNewState LUA_NEWSTATE>
+static inline lua_State* WrapLuaNewState(LUA_NEWSTATE const lua_newstate_, lua_Alloc const allocf_, void* const ud_, [[maybe_unused]] unsigned int const seed_)
+{
+    // until Lua 5.5, lua_newstate has only 2 parameters
+    return lua_newstate_(allocf_, ud_);
+}
+// -------------------------------------------------------------------------------------------------
+template <typename LUA_NEWSTATE>
+concept RequiresNewLuaNewState = requires(LUA_NEWSTATE f_)
+{
+    {
+        f_(nullptr, nullptr, 0)
+    } -> std::same_as<lua_State*>;
+};
+template <RequiresNewLuaNewState LUA_NEWSTATE>
+static inline lua_State* WrapLuaNewState(LUA_NEWSTATE const lua_newstate_, lua_Alloc const allocf_, void* const ud_, unsigned int const seed_)
+{
+    // starting with Lua 5.5, lua_newstate has 3 parameters
+    return lua_newstate_(allocf_, ud_, seed_);
+}
+// -------------------------------------------------------------------------------------------------
+static inline lua_State* luaW_newstate(lua_Alloc const allocf_, void* const ud_, unsigned int const seed_)
+{
+    return WrapLuaNewState(lua_newstate, allocf_, ud_, seed_);
+}
 // #################################################################################################
 template<typename ENUM>
 requires std::is_enum_v<ENUM>
 [[nodiscard]]
-ENUM luaG_optenum(lua_State* const L_, StackIndex const idx_, ENUM const def_)
+ENUM luaW_optenum(lua_State* const L_, StackIndex const idx_, ENUM const def_)
 {
    return static_cast<ENUM>(luaL_optinteger(L_, idx_, static_cast<std::underlying_type_t<ENUM>>(def_)));
 }
 // #################################################################################################
-inline void luaG_registerlibfuncs(lua_State* const L_, luaL_Reg const* funcs_)
+inline void luaW_registerlibfuncs(lua_State* const L_, luaL_Reg const* funcs_)
 {
    // fake externs to make clang happy...
    extern void luaL_register(lua_State*, char const*, luaL_Reg const*); // Lua 5.1
@@ -353,7 +377,7 @@ static inline int WrapLuaResume(LUA_RESUME const lua_resume_, lua_State* const L
 // -------------------------------------------------------------------------------------------------
 [[nodiscard]]
-static inline LuaError luaG_resume(lua_State* const L_, lua_State* const from_, int const nargs_, int* const nresults_)
+static inline LuaError luaW_resume(lua_State* const L_, lua_State* const from_, int const nargs_, int* const nresults_)
 {
    return ToLuaError(WrapLuaResume(lua_resume, L_, from_, nargs_, nresults_));
 }
@@ -364,11 +388,11 @@ template <typename LUA_RAWGET>
 concept RequiresOldLuaRawget = requires(LUA_RAWGET f_) { { f_(nullptr, 0) } -> std::same_as<void>; };
 template <RequiresOldLuaRawget LUA_RAWGET>
-static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_, StackIndex const idx_)
+static inline LuaType WrapLuaRawget(LUA_RAWGET const lua_rawget_, lua_State* const L_, StackIndex const idx_)
 {
    // until Lua 5.3, lua_rawget -> void
    lua_rawget_(L_, idx_);
-    return luaG_type(L_, kIdxTop);
+    return luaW_type(L_, kIdxTop);
 }
 // -------------------------------------------------------------------------------------------------
@@ -377,7 +401,7 @@ template <typename LUA_RAWGET>
 concept RequiresNewLuaRawget = requires(LUA_RAWGET f_) { { f_(nullptr, 0) } -> std::same_as<int>; };
 template <RequiresNewLuaRawget LUA_RAWGET>
-static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_, StackIndex const idx_)
+static inline LuaType WrapLuaRawget(LUA_RAWGET const lua_rawget_, lua_State* const L_, StackIndex const idx_)
 {
    // starting with Lua 5.3, lua_rawget -> int (the type of the extracted value)
    return static_cast<LuaType>(lua_rawget_(L_, idx_));
@@ -385,42 +409,42 @@ static inline LuaType WrapLuaRawget(LUA_RAWGET lua_rawget_, lua_State* const L_,
 // -------------------------------------------------------------------------------------------------
-static inline LuaType luaG_rawget(lua_State* const L_, StackIndex const idx_)
+static inline LuaType luaW_rawget(lua_State* const L_, StackIndex const idx_)
 {
    return WrapLuaRawget(lua_rawget, L_, idx_);
 }
 // #################################################################################################
-static inline LuaType luaG_rawgetfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
+static inline LuaType luaW_rawgetfield(lua_State* const L_, StackIndex const idx_, std::string_view const& name_)
 {
-    auto const _absIdx{ luaG_absindex(L_, idx_) };
+    auto const _absIdx{ luaW_absindex(L_, idx_) };
-    luaG_pushstring(L_, name_);                                                                    // L_: ... t ... name_
+    luaW_pushstring(L_, name_);                                                                    // L_: ... t ... name_
    lua_rawget(L_, _absIdx);                                                                       // L_: ... t ... <field>
-    return luaG_type(L_, kIdxTop);
+    return luaW_type(L_, kIdxTop);
 }
 // #################################################################################################
 template <size_t N>
-static inline void luaG_newlib(lua_State* const L_, luaL_Reg const (&funcs_)[N])
+static inline void luaW_newlib(lua_State* const L_, luaL_Reg const (&funcs_)[N])
 {
    lua_createtable(L_, 0, N - 1);
-    luaG_registerlibfuncs(L_, funcs_);
+    luaW_registerlibfuncs(L_, funcs_);
 }
 // #################################################################################################
 template <typename T>
 [[nodiscard]]
-T* luaG_newuserdatauv(lua_State* const L_, UserValueCount const nuvalue_)
+T* luaW_newuserdatauv(lua_State* const L_, UserValueCount const nuvalue_)
 {
    return static_cast<T*>(lua_newuserdatauv(L_, sizeof(T), nuvalue_));
 }
 // #################################################################################################
-inline void luaG_pushglobaltable(lua_State* const L_)
+inline void luaW_pushglobaltable(lua_State* const L_)
 {
 #ifdef LUA_GLOBALSINDEX // All flavors of Lua 5.1
    ::lua_pushvalue(L_, LUA_GLOBALSINDEX);
@@ -431,15 +455,15 @@ inline void luaG_pushglobaltable(lua_State* const L_)
 // #################################################################################################
-inline void luaG_setfield(lua_State* const L_, StackIndex const idx_, char const* const k_) = delete;
+inline void luaW_setfield(lua_State* const L_, StackIndex const idx_, char const* const k_) = delete;
-inline void luaG_setfield(lua_State* const L_, StackIndex const idx_, std::string_view const& k_)
+inline void luaW_setfield(lua_State* const L_, StackIndex const idx_, std::string_view const& k_)
 {
    lua_setfield(L_, idx_, k_.data());
 }
 // #################################################################################################
-inline void luaG_setmetatable(lua_State* const L_, std::string_view const& tname_)
+inline void luaW_setmetatable(lua_State* const L_, std::string_view const& tname_)
 {
    // fake externs to make clang happy...
    if constexpr (LUA_VERSION_NUM > 501) {
@@ -456,7 +480,7 @@ inline void luaG_setmetatable(lua_State* const L_, std::string_view const& tname
 // a small helper to extract a full userdata pointer from the stack in a safe way
 template <typename T>
 [[nodiscard]]
-T* luaG_tofulluserdata(lua_State* const L_, StackIndex const index_)
+T* luaW_tofulluserdata(lua_State* const L_, StackIndex const index_)
 {
    LUA_ASSERT(L_, lua_isnil(L_, index_) || lua_type(L_, index_) == LUA_TUSERDATA);
    return static_cast<T*>(lua_touserdata(L_, index_));
@@ -466,7 +490,7 @@ T* luaG_tofulluserdata(lua_State* const L_, StackIndex const index_)
 template <typename T>
 [[nodiscard]]
-auto luaG_tolightuserdata(lua_State* const L_, StackIndex const index_)
+auto luaW_tolightuserdata(lua_State* const L_, StackIndex const index_)
 {
    LUA_ASSERT(L_, lua_isnil(L_, index_) || lua_islightuserdata(L_, index_));
    if constexpr (std::is_pointer_v<T>) {
@@ -479,7 +503,7 @@ auto luaG_tolightuserdata(lua_State* const L_, StackIndex const index_)
 // -------------------------------------------------------------------------------------------------
 [[nodiscard]]
-inline std::string_view luaG_typename(lua_State* const L_, LuaType const t_)
+inline std::string_view luaW_typename(lua_State* const L_, LuaType const t_)
 {
    return lua_typename(L_, static_cast<int>(t_));
 }
@@ -487,7 +511,7 @@ inline std::string_view luaG_typename(lua_State* const L_, LuaType const t_)
 // -------------------------------------------------------------------------------------------------
 [[nodiscard]]
-inline std::string_view luaG_typename(lua_State* const L_, StackIndex const idx_)
+inline std::string_view luaW_typename(lua_State* const L_, StackIndex const idx_)
 {
-    return luaG_typename(L_, luaG_type(L_, idx_));
+    return luaW_typename(L_, luaW_type(L_, idx_));
 }
diff --git a/src/deep.cpp b/src/deep.cpp
index 82f1214..acd93a6 100644
--- a/src/deep.cpp
+++ b/src/deep.cpp
@@ -75,7 +75,7 @@ namespace {
            lua_rawget(L_, -2);                                                                    // L_: {} b
        }
        lua_remove(L_, -2);                                                                        // L_: a|b
-        LuaType const _type{ luaG_type(L_, kIdxTop) };
+        LuaType const _type{ luaW_type(L_, kIdxTop) };
        if (_type != LuaType::NIL && _type != expectedType_) {
            raise_luaL_error(L_, "INTERNAL ERROR: Unexpected value.");
        }
@@ -103,7 +103,7 @@ namespace {
 [[nodiscard]]
 int DeepFactory::DeepGC(lua_State* const L_)
 {
-    DeepPrelude* const* const _proxy{ luaG_tofulluserdata<DeepPrelude*>(L_, StackIndex{ 1 }) };
+    DeepPrelude* const* const _proxy{ luaW_tofulluserdata<DeepPrelude*>(L_, StackIndex{ 1 }) };
    DeepPrelude* const _p{ *_proxy };
    // can work without a universe if creating a deep userdata from some external C module when Lanes isn't loaded
@@ -150,7 +150,7 @@ DeepFactory* DeepFactory::LookupFactory(lua_State* const L_, StackIndex const in
 {
    // when looking inside a keeper, we are 100% sure the object is a deep userdata
    if (mode_ == LookupMode::FromKeeper) {
-        DeepPrelude* const _proxy{ *luaG_tofulluserdata<DeepPrelude*>(L_, index_) };
+        DeepPrelude* const _proxy{ *luaW_tofulluserdata<DeepPrelude*>(L_, index_) };
        // we can (and must) cast and fetch the internally stored factory
        return &_proxy->factory;
    } else {
@@ -167,7 +167,7 @@ DeepFactory* DeepFactory::LookupFactory(lua_State* const L_, StackIndex const in
        // replace metatable with the factory pointer, if it is actually a deep userdata
        LookupDeep(L_, LuaType::LIGHTUSERDATA);                                                    // L_: deep ... factory|nil
-        DeepFactory* const _ret{ luaG_tolightuserdata<DeepFactory>(L_, kIdxTop) }; // nullptr if not a userdata
+        DeepFactory* const _ret{ luaW_tolightuserdata<DeepFactory>(L_, kIdxTop) }; // nullptr if not a userdata
        lua_pop(L_, 1);
        STACK_CHECK(L_, 0);
        return _ret;
@@ -190,7 +190,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
    // Check if a proxy already exists
    lua_pushlightuserdata(L_, prelude_);                                                           // L_: DPC deep
-    if (luaG_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) {                                       // L_: DPC proxy
+    if (luaW_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) {                                       // L_: DPC proxy
        lua_remove(L_, -2);                                                                        // L_: proxy
        STACK_CHECK(L_, 1);
        return;
@@ -202,7 +202,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
    STACK_GROW(L_, 7);
    // a new full userdata, fitted with the specified number of uservalue slots (always 1 for Lua < 5.4)
-    DeepPrelude** const _proxy{ luaG_newuserdatauv<DeepPrelude*>(L_, nuv_) };                      // L_: DPC proxy
+    DeepPrelude** const _proxy{ luaW_newuserdatauv<DeepPrelude*>(L_, nuv_) };                      // L_: DPC proxy
    LUA_ASSERT(L_, _proxy);
    *_proxy = prelude_;
    prelude_->refcount.fetch_add(1, std::memory_order_relaxed); // one more proxy pointing to this deep data
@@ -223,7 +223,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
                raise_luaL_error(errL_, "Bad DeepFactory::createMetatable overload: unexpected pushed value");
            }
            // if the metatable contains a __gc, we will call it from our own
-            std::ignore = luaG_rawgetfield(L_, kIdxTop, "__gc");                                   // L_: DPC proxy metatable __gc
+            std::ignore = luaW_rawgetfield(L_, kIdxTop, "__gc");                                   // L_: DPC proxy metatable __gc
        } else {
            // keepers need a minimal metatable that only contains our own __gc
            lua_createtable(L_, 0, 1);                                                             // L_: DPC proxy metatable
@@ -251,8 +251,8 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
                raise_luaL_error(errL_, "lanes receiving deep userdata should register the 'package' library");
            }
-            luaG_pushstring(L_, _modname);                                                         // L_: DPC proxy metatable require() "module"
+            luaW_pushstring(L_, _modname);                                                         // L_: DPC proxy metatable require() "module"
-            if (luaG_getfield(L_, kIdxRegistry, LUA_LOADED_TABLE) != LuaType::TABLE) {             // L_: DPC proxy metatable require() "module" _R._LOADED
+            if (luaW_getfield(L_, kIdxRegistry, LUA_LOADED_TABLE) != LuaType::TABLE) {             // L_: DPC proxy metatable require() "module" _R._LOADED
                // no L.registry._LOADED; can this ever happen?
                lua_pop(L_, 6);                                                                    // L_:
                raise_luaL_error(errL_, "unexpected error while requiring a module identified by DeepFactory::moduleName");
@@ -270,7 +270,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
                    LuaError const _require_result{ lua_pcall(L_, 1, 0, 0) };                      // L_: DPC proxy metatable error?
                    if (_require_result != LuaError::OK) {
                        // failed, raise the error in the proper state
-                        raise_luaL_error(errL_, luaG_tostring(L_, kIdxTop));
+                        raise_luaL_error(errL_, luaW_tostring(L_, kIdxTop));
                    }
                }
            } else { // already loaded, we are happy
@@ -279,7 +279,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
        }
    }
    STACK_CHECK(L_, 3);                                                                            // L_: DPC proxy metatable
-    LUA_ASSERT(L_, luaG_type(L_, StackIndex{ -2 }) == LuaType::USERDATA);
+    LUA_ASSERT(L_, luaW_type(L_, StackIndex{ -2 }) == LuaType::USERDATA);
    LUA_ASSERT(L_, lua_istable(L_, -1));
    lua_setmetatable(L_, -2);                                                                      // L_: DPC proxy
@@ -288,7 +288,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
    lua_pushvalue(L_, -2);                                                                         // L_: DPC proxy deep proxy
    lua_rawset(L_, -4);                                                                            // L_: DPC proxy
    lua_remove(L_, -2);                                                                            // L_: proxy
-    LUA_ASSERT(L_, luaG_type(L_, kIdxTop) == LuaType::USERDATA);
+    LUA_ASSERT(L_, luaW_type(L_, kIdxTop) == LuaType::USERDATA);
    STACK_CHECK(L_, 1);
 }
@@ -305,7 +305,7 @@ void DeepFactory::PushDeepProxy(DestState const L_, DeepPrelude* const prelude_,
 * Reference counting and true userdata proxying are taken care of for the actual data type.
 *
 * Types using the deep userdata system (and only those!) can be passed between
- * separate Lua states via 'luaG_inter_move()'.
+ * separate Lua states via 'luaW_inter_move()'.
 *
 * Returns: 'proxy' userdata for accessing the deep data via 'DeepFactory::toDeep()'
 */
@@ -382,7 +382,7 @@ DeepPrelude* DeepFactory::toDeep(lua_State* const L_, StackIndex const index_) c
    }
    STACK_CHECK(L_, 0);
-    DeepPrelude** const _proxy{ luaG_tofulluserdata<DeepPrelude*>(L_, index_) };
+    DeepPrelude** const _proxy{ luaW_tofulluserdata<DeepPrelude*>(L_, index_) };
    return *_proxy;
 }
diff --git a/src/intercopycontext.cpp b/src/intercopycontext.cpp
index a93615b..6e9b66c 100644
--- a/src/intercopycontext.cpp
+++ b/src/intercopycontext.cpp
@@ -36,23 +36,6 @@ THE SOFTWARE.
 // #################################################################################################
-// Lua 5.4.3 style of dumping (see lstrlib.c)
-// we have to do it that way because we can't unbalance the stack between buffer operations
-// namely, this means we can't push a function on top of the stack *after* we initialize the buffer!
-// luckily, this also works with earlier Lua versions
-[[nodiscard]]
-static int buf_writer(lua_State* L_, void const* b_, size_t size_, void* ud_)
-{
-    luaL_Buffer* const _B{ static_cast<luaL_Buffer*>(ud_) };
-    if (!_B->L) {
-        luaL_buffinit(L_, _B);
-    }
-    luaL_addlstring(_B, static_cast<char const*>(b_), size_);
-    return 0;
-}
-// #################################################################################################
 // function sentinel used to transfer native functions from/to keeper states
 [[nodiscard]]
 static int func_lookup_sentinel(lua_State* const L_)
@@ -93,7 +76,7 @@ static int userdata_lookup_sentinel(lua_State* const L_)
 [[nodiscard]]
 std::string_view InterCopyContext::findLookupName() const
 {
-    LUA_ASSERT(L1, lua_isfunction(L1, L1_i) || lua_istable(L1, L1_i) || luaG_type(L1, L1_i) == LuaType::USERDATA);
+    LUA_ASSERT(L1, lua_isfunction(L1, L1_i) || lua_istable(L1, L1_i) || luaW_type(L1, L1_i) == LuaType::USERDATA);
    STACK_CHECK_START_REL(L1, 0);                                                                  // L1: ... v ...
    STACK_GROW(L1, 3); // up to 3 slots are necessary on error
    if (mode == LookupMode::FromKeeper) {
@@ -114,7 +97,7 @@ std::string_view InterCopyContext::findLookupName() const
        lua_pushvalue(L1, L1_i);                                                                   // L1: ... v ... {} v
        lua_rawget(L1, -2);                                                                        // L1: ... v ... {} "f.q.n"
    }
-    std::string_view _fqn{ luaG_tostring(L1, kIdxTop) };
+    std::string_view _fqn{ luaW_tostring(L1, kIdxTop) };
    DEBUGSPEW_CODE(DebugSpew(U) << "function [C] " << _fqn << std::endl);
    // popping doesn't invalidate the pointer since this is an interned string gotten from the lookup database
    lua_pop(L1, (mode == LookupMode::FromKeeper) ? 1 : 2);                                         // L1: ... v ...
@@ -122,12 +105,12 @@ std::string_view InterCopyContext::findLookupName() const
    if (_fqn.empty() && !lua_istable(L1, L1_i)) { // raise an error if we try to send an unknown function/userdata (but not for tables)
        // try to discover the name of the function/userdata we want to send
        kLaneNameRegKey.pushValue(L1);                                                             // L1: ... v ... lane_name
-        std::string_view const _from{ luaG_tostring(L1, kIdxTop) };
+        std::string_view const _from{ luaW_tostring(L1, kIdxTop) };
        lua_pushcfunction(L1, LG_nameof);                                                          // L1: ... v ... lane_name LG_nameof
        lua_pushvalue(L1, L1_i);                                                                   // L1: ... v ... lane_name LG_nameof t
        lua_call(L1, 1, 2);                                                                        // L1: ... v ... lane_name "type" "name"|nil
        StackIndex const _indexTypeWhat{ -2 };
-        std::string_view const _typewhat{ (luaG_type(L1, _indexTypeWhat) == LuaType::STRING) ? luaG_tostring(L1, _indexTypeWhat) : luaG_typename(L1, _indexTypeWhat) };
+        std::string_view const _typewhat{ (luaW_type(L1, _indexTypeWhat) == LuaType::STRING) ? luaW_tostring(L1, _indexTypeWhat) : luaW_typename(L1, _indexTypeWhat) };
        // second return value can be nil if the table was not found
        // probable reason: the function was removed from the source Lua state before Lanes was required.
        std::string_view _what, _gotchaA, _gotchaB;
@@ -139,7 +122,7 @@ std::string_view InterCopyContext::findLookupName() const
            _gotchaA = "";
            _gotchaB = "";
            StackIndex const _indexWhat{ kIdxTop };
-            _what = (luaG_type(L1, _indexWhat) == LuaType::STRING) ? luaG_tostring(L1, _indexWhat) : luaG_typename(L1, _indexWhat);
+            _what = (luaW_type(L1, _indexWhat) == LuaType::STRING) ? luaW_tostring(L1, _indexWhat) : luaW_typename(L1, _indexWhat);
        }
        raise_luaL_error(L1, "%s%s '%s' not found in %s origin transfer database.%s", _typewhat.data(), _gotchaA.data(), _what.data(), _from.empty() ? "main" : _from.data(), _gotchaB.data());
    }
@@ -158,7 +141,7 @@ static constexpr RegistryUniqueKey kMtIdRegKey{ 0xA8895DCF4EC3FE3Cull };
 [[nodiscard]]
 static lua_Integer get_mt_id(Universe* const U_, lua_State* const L_, StackIndex const idx_)
 {
-    StackIndex const _absidx{ luaG_absindex(L_, idx_) };
+    StackIndex const _absidx{ luaW_absindex(L_, idx_) };
    STACK_GROW(L_, 3);
@@ -195,11 +178,12 @@ static lua_Integer get_mt_id(Universe* const U_, lua_State* const L_, StackIndex
 // L2 has the cache key for this function at the top of the stack
 void InterCopyContext::copyFunction() const
 {
-    LUA_ASSERT(L1, L2_cache_i != 0);                                                               //                                                L2: ... {cache} ... p
+    LUA_ASSERT(L1, L2_cache_i != 0);                                                               // L1: ... f                                      L2: ... {cache} ... p
    STACK_GROW(L1, 2);
    STACK_CHECK_START_REL(L1, 0);
+    STACK_CHECK_START_REL(L2, 0);
-    // 'luaG_dump()' needs the function at top of stack
+    // 'luaW_dump()' needs the function at top of stack
    // if already on top of the stack, no need to push again
    bool const _needToPush{ L1_i != lua_gettop(L1) };
    if (_needToPush) {
@@ -211,19 +195,17 @@ void InterCopyContext::copyFunction() const
    // to the writer" (and we only return 0)
    // not sure this could ever fail but for memory shortage reasons
    // last argument is Lua 5.4-specific (no stripping)
-    luaL_Buffer B{};
+    tools::PushFunctionBytecode(L1, L2, U->stripFunctions);                                        // L1: ... f                                      L2: ... {cache} ... p "<bytecode>"
-    if (luaG_dump(L1, buf_writer, &B, U->stripFunctions) != 0) {
-        raise_luaL_error(getErrL(), "internal error: function dump failed.");
-    }
-    // pushes dumped string on 'L1'
+    // if pushed, we need to pop
-    luaL_pushresult(&B);                                                                           // L1: ... f b
-    // if not pushed, no need to pop
    if (_needToPush) {
-        lua_remove(L1, -2);                                                                        // L1: ... b
+        lua_pop(L1, 1);                                                                            // L1: ...
    }
+    // When we are done, the stack of L1 should be the original one, with the bytecode string added on top of L2
+    STACK_CHECK(L1, 0);
+    STACK_CHECK(L2, 1);
    // transfer the bytecode, then the upvalues, to create a similar closure
    {
        char const* _fname{};
@@ -231,16 +213,16 @@ void InterCopyContext::copyFunction() const
        if constexpr (LOG_FUNC_INFO)
        {
            lua_Debug _ar;
-            lua_pushvalue(L1, L1_i);                                                               // L1: ... b f
+            lua_pushvalue(L1, L1_i);                                                               // L1: ... f
            // "To get information about a function you push it onto the stack and start the what string with the character '>'."
            // fills 'fname' 'namewhat' and 'linedefined', pops function
-            lua_getinfo(L1, ">nS", &_ar);                                                          // L1: ... b
+            lua_getinfo(L1, ">nS", &_ar);                                                          // L1: ...
            _fname = _ar.namewhat;
            DEBUGSPEW_CODE(DebugSpew(U) << "FNAME: " << _ar.short_src << " @ " << _ar.linedefined << std::endl);
        }
        {
-            std::string_view const _bytecode{ luaG_tostring(L1, kIdxTop) };                        // L1: ... b
+            std::string_view const _bytecode{ luaW_tostring(L2, kIdxTop) };                        //                                                L2: ... {cache} ... p "<bytecode>"
            LUA_ASSERT(L1, !_bytecode.empty());
            STACK_GROW(L2, 2);
            // Note: Line numbers seem to be taken precisely from the
@@ -249,15 +231,15 @@ void InterCopyContext::copyFunction() const
            //
            // TBD: Can we get the function's original name through, as well?
            //
-            if (luaL_loadbuffer(L2, _bytecode.data(), _bytecode.size(), _fname) != 0) {            //                                                L2: ... {cache} ... p function
+            if (luaL_loadbuffer(L2, _bytecode.data(), _bytecode.size(), _fname) != 0) {            //                                                L2: ... {cache} ... p "<bytecode>" function
                // chunk is precompiled so only LUA_ERRMEM can happen
                // "Otherwise, it pushes an error message"
                //
                STACK_GROW(L1, 1);
-                raise_luaL_error(getErrL(), "%s: %s", _fname, lua_tostring(L2, -1));
+                raise_luaL_error(getErrL(), "%s: %s", _fname, lua_tostring(L2, kIdxTop));
            }
            // remove the dumped string
-            lua_pop(L1, 1); // ...
+            lua_replace(L2, -2);                                                                   //                                                L2: ... {cache} ... p function
            // now set the cache as soon as we can.
            // this is necessary if one of the function's upvalues references it indirectly
            // we need to find it in the cache even if it isn't fully transfered yet
@@ -267,6 +249,7 @@ void InterCopyContext::copyFunction() const
            lua_rawset(L2, L2_cache_i);                                                            //                                                L2: ... {cache} ... function
        }
        STACK_CHECK(L1, 0);
+        STACK_CHECK(L2, 0); // cache key is replaced by the function, so no stack level change
        /* push over any upvalues; references to this function will come from
         * cache so we don't end up in eternal loop.
@@ -278,12 +261,12 @@ void InterCopyContext::copyFunction() const
        {
            InterCopyContext _c{ U, L2, L1, L2_cache_i, {}, VT::NORMAL, mode, {} };
            // if we encounter an upvalue equal to the global table in the source, bind it to the destination's global table
-            luaG_pushglobaltable(L1);                                                              // L1: ... _G
+            luaW_pushglobaltable(L1);                                                              // L1: ... _G
            for (char const* _upname{}; (_upname = lua_getupvalue(L1, L1_i, 1 + _n)); ++_n) {      // L1: ... _G up[n]
                DEBUGSPEW_CODE(DebugSpew(U) << "UPNAME[" << _n << "]: " << _c.name << " -> ");
                if (lua_rawequal(L1, -1, -2)) { // is the upvalue equal to the global table?
                    DEBUGSPEW_CODE(DebugSpew(nullptr) << "pushing destination global scope" << std::endl);
-                    luaG_pushglobaltable(L2);                                                      //                                                L2: ... {cache} ... function <upvalues>
+                    luaW_pushglobaltable(L2);                                                      //                                                L2: ... {cache} ... function <upvalues>
                } else {
                    DEBUGSPEW_CODE(DebugSpew(nullptr) << "copying value" << std::endl);
                    _c.name = _upname;
@@ -297,6 +280,7 @@ void InterCopyContext::copyFunction() const
            lua_pop(L1, 1);                                                                        // L1: ...
        }                                                                                          //                                                L2: ... {cache} ... function + 'n' upvalues (>=0)
        STACK_CHECK(L1, 0);
+        STACK_CHECK(L2, _n);
        // Set upvalues (originally set to 'nil' by 'lua_load')
        for (StackIndex const _func_index{ lua_gettop(L2) - _n }; _n > 0; --_n) {
@@ -307,6 +291,7 @@ void InterCopyContext::copyFunction() const
        // once all upvalues have been set we are left
        // with the function at the top of the stack                                               //                                                L2: ... {cache} ... function
    }
+    STACK_CHECK(L2, 0);
    STACK_CHECK(L1, 0);
 }
@@ -327,7 +312,7 @@ void InterCopyContext::lookupNativeFunction() const
    case LookupMode::ToKeeper:
        // push a sentinel closure that holds the lookup name as upvalue
-        luaG_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: "f.q.n"
        lua_pushcclosure(L2, func_lookup_sentinel, 1);                                             // L1: ... f ...                                  L2: f
        break;
@@ -336,16 +321,16 @@ void InterCopyContext::lookupNativeFunction() const
        kLookupRegKey.pushValue(L2);                                                               // L1: ... f ...                                  L2: {}
        STACK_CHECK(L2, 1);
        LUA_ASSERT(L1, lua_istable(L2, -1));
-        luaG_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: {} "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: {} "f.q.n"
-        LuaType const _objType{ luaG_rawget(L2, StackIndex{ -2 }) };                               // L1: ... f ...                                  L2: {} f
+        LuaType const _objType{ luaW_rawget(L2, StackIndex{ -2 }) };                               // L1: ... f ...                                  L2: {} f
        // nil means we don't know how to transfer stuff: user should do something
        // anything other than function or table should not happen!
        if (_objType != LuaType::FUNCTION && _objType != LuaType::TABLE && _objType != LuaType::USERDATA) {
            kLaneNameRegKey.pushValue(L1);                                                         // L1: ... f ... lane_name
-            std::string_view const _from{ luaG_tostring(L1, kIdxTop) };
+            std::string_view const _from{ luaW_tostring(L1, kIdxTop) };
            lua_pop(L1, 1);                                                                        // L1: ... f ...
            kLaneNameRegKey.pushValue(L2);                                                         // L1: ... f ...                                  L2: {} f lane_name
-            std::string_view const _to{ luaG_tostring(L2, kIdxTop) };
+            std::string_view const _to{ luaW_tostring(L2, kIdxTop) };
            lua_pop(L2, 1);                                                                        //                                                L2: {} f
            raise_luaL_error(
                getErrL(),
@@ -368,7 +353,7 @@ void InterCopyContext::lookupNativeFunction() const
 // Always pushes a function to 'L2'.
 void InterCopyContext::copyCachedFunction() const
 {
-    FuncSubType const _funcSubType{ luaG_getfuncsubtype(L1, L1_i) };
+    FuncSubType const _funcSubType{ luaW_getfuncsubtype(L1, L1_i) };
    if (_funcSubType == FuncSubType::Bytecode) {
        void* const _aspointer{ const_cast<void*>(lua_topointer(L1, L1_i)) };
        // TODO: Merge this and same code for tables
@@ -386,10 +371,10 @@ void InterCopyContext::copyCachedFunction() const
        // push a light userdata uniquely representing the function
        lua_pushlightuserdata(L2, _aspointer);                                                     //                                                L2: ... {cache} ... p
-        //DEBUGSPEW_CODE(DebugSpew(U) << "<< ID: " << luaG_tostring(L2, -1) << " >>" << std::endl);
+        //DEBUGSPEW_CODE(DebugSpew(U) << "<< ID: " << luaW_tostring(L2, -1) << " >>" << std::endl);
        lua_pushvalue(L2, -1);                                                                     //                                                L2: ... {cache} ... p p
-        if (luaG_rawget(L2, L2_cache_i) == LuaType::NIL) { // function is unknown                  //                                                L2: ... {cache} ... p function|nil|true
+        if (luaW_rawget(L2, L2_cache_i) == LuaType::NIL) { // function is unknown                  //                                                L2: ... {cache} ... p function|nil|true
            lua_pop(L2, 1);                                                                        //                                                L2: ... {cache} ... p
            // Set to 'true' for the duration of creation; need to find self-references
@@ -405,7 +390,7 @@ void InterCopyContext::copyCachedFunction() const
    } else { // function is native/LuaJIT: no need to cache
        lookupNativeFunction();                                                                    //                                                L2: ... {cache} ... function
        // if the function was in fact a lookup sentinel, we can either get a function, table or full userdata here
-        LUA_ASSERT(L1, lua_isfunction(L2, kIdxTop) || lua_istable(L2, kIdxTop) || luaG_type(L2, kIdxTop) == LuaType::USERDATA);
+        LUA_ASSERT(L1, lua_isfunction(L2, kIdxTop) || lua_istable(L2, kIdxTop) || luaW_type(L2, kIdxTop) == LuaType::USERDATA);
    }
 }
@@ -430,7 +415,7 @@ bool InterCopyContext::lookupTable() const
    case LookupMode::ToKeeper:
        // push a sentinel closure that holds the lookup name as upvalue
-        luaG_pushstring(L2, _fqn);                                                                 // L1: ... t ...                                  L2: "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 // L1: ... t ...                                  L2: "f.q.n"
        lua_pushcclosure(L2, table_lookup_sentinel, 1);                                            // L1: ... t ...                                  L2: f
        break;
@@ -439,26 +424,26 @@ bool InterCopyContext::lookupTable() const
        kLookupRegKey.pushValue(L2);                                                               // L1: ... t ...                                  L2: {}
        STACK_CHECK(L2, 1);
        LUA_ASSERT(L1, lua_istable(L2, -1));
-        luaG_pushstring(L2, _fqn);                                                                 //                                                L2: {} "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 //                                                L2: {} "f.q.n"
        // we accept destination lookup failures in the case of transfering the Lanes body function (this will result in the source table being cloned instead)
        // but not when we extract something out of a keeper, as there is nothing to clone!
-        if (luaG_rawget(L2, StackIndex{ -2 }) == LuaType::NIL && mode == LookupMode::LaneBody) {   //                                                L2: {} t
+        if (luaW_rawget(L2, StackIndex{ -2 }) == LuaType::NIL && mode == LookupMode::LaneBody) {   //                                                L2: {} t
            lua_pop(L2, 2);                                                                        // L1: ... t ...                                  L2:
            STACK_CHECK(L2, 0);
            return false;
        } else if (!lua_istable(L2, -1)) { // this can happen if someone decides to replace same already registered item (for a example a standard lib function) with a table
            kLaneNameRegKey.pushValue(L1);                                                         // L1: ... t ... lane_name
-            std::string_view const _from{ luaG_tostring(L1, kIdxTop) };
+            std::string_view const _from{ luaW_tostring(L1, kIdxTop) };
            lua_pop(L1, 1);                                                                        // L1: ... t ...
            kLaneNameRegKey.pushValue(L2);                                                         // L1: ... t ...                                  L2: {} t lane_name
-            std::string_view const _to{ luaG_tostring(L2, kIdxTop) };
+            std::string_view const _to{ luaW_tostring(L2, kIdxTop) };
            lua_pop(L2, 1);                                                                        // L1: ... t ...                                  L2: {} t
            raise_luaL_error(
                getErrL(),
                "%s: source table '%s' found as %s in %s destination transfer database.",
                _from.empty() ? "main" : _from.data(),
                _fqn.data(),
-                luaG_typename(L2, kIdxTop).data(),
+                luaW_typename(L2, kIdxTop).data(),
                _to.empty() ? "main" : _to.data());
        }
        lua_remove(L2, -2);                                                                        // L1: ... t ...                                  L2: t
@@ -487,8 +472,8 @@ void InterCopyContext::interCopyKeyValuePair() const
    char* _valPath{ nullptr };
    if (U->verboseErrors) {
        // for debug purposes, let's try to build a useful name
-        if (luaG_type(L1, _key_i) == LuaType::STRING) {
+        if (luaW_type(L1, _key_i) == LuaType::STRING) {
-            std::string_view const _key{ luaG_tostring(L1, _key_i) };
+            std::string_view const _key{ luaW_tostring(L1, _key_i) };
            size_t const _bufLen{ name.size() + _key.size() + 2 }; // +2 for separator dot and terminating 0
            _valPath = static_cast<char*>(alloca(_bufLen));
            sprintf(_valPath, "%s." STRINGVIEW_FMT, name.data(), (int) _key.size(), _key.data());
@@ -500,15 +485,15 @@ void InterCopyContext::interCopyKeyValuePair() const
            sprintf(_valPath, "%s[" LUA_INTEGER_FMT "]", name.data(), key);
        }
 #endif // defined LUA_LNUM || LUA_VERSION_NUM >= 503
-        else if (luaG_type(L1, _key_i) == LuaType::NUMBER) {
+        else if (luaW_type(L1, _key_i) == LuaType::NUMBER) {
            lua_Number const key{ lua_tonumber(L1, _key_i) };
            _valPath = (char*) alloca(name.size() + 32 + 3); // +3 for [] and terminating 0
            sprintf(_valPath, "%s[" LUA_NUMBER_FMT "]", name.data(), key);
-        } else if (luaG_type(L1, _key_i) == LuaType::LIGHTUSERDATA) {
+        } else if (luaW_type(L1, _key_i) == LuaType::LIGHTUSERDATA) {
            void* const _key{ lua_touserdata(L1, _key_i) };
            _valPath = (char*) alloca(name.size() + 16 + 5); // +5 for [U:] and terminating 0
            sprintf(_valPath, "%s[U:%p]", name.data(), _key);
-        } else if (luaG_type(L1, _key_i) == LuaType::BOOLEAN) {
+        } else if (luaW_type(L1, _key_i) == LuaType::BOOLEAN) {
            int const _key{ lua_toboolean(L1, _key_i) };
            _valPath = (char*) alloca(name.size() + 8); // +8 for [], 'false' and terminating 0
            sprintf(_valPath, "%s[%s]", name.data(), _key ? "true" : "false");
@@ -532,7 +517,7 @@ LuaType InterCopyContext::processConversion() const
 {
    static constexpr int kPODmask = (1 << LUA_TNIL) | (1 << LUA_TBOOLEAN) | (1 << LUA_TLIGHTUSERDATA) | (1 << LUA_TNUMBER) | (1 << LUA_TSTRING);
-    LuaType _val_type{ luaG_type(L1, L1_i) };
+    LuaType _val_type{ luaW_type(L1, L1_i) };
    STACK_CHECK_START_REL(L1, 0);
@@ -548,7 +533,7 @@ LuaType InterCopyContext::processConversion() const
    }
    // we have a metatable                                                                         // L1: ... mt
    static constexpr std::string_view kConvertField{ "__lanesconvert" };
-    LuaType const _converterType{ luaG_getfield(L1, kIdxTop, kConvertField) };                     // L1: ... mt kConvertField
+    LuaType const _converterType{ luaW_getfield(L1, kIdxTop, kConvertField) };                     // L1: ... mt kConvertField
    switch (_converterType) {
    case LuaType::NIL:
        // no __lanesconvert, nothing to do
@@ -557,18 +542,18 @@ LuaType InterCopyContext::processConversion() const
    case LuaType::LIGHTUSERDATA:
        if (kNilSentinel.equals(L1, kIdxTop)) {
-            DEBUGSPEW_CODE(DebugSpew(U) << "converted " << luaG_typename(L1, _val_type) << " to nil" << std::endl);
+            DEBUGSPEW_CODE(DebugSpew(U) << "converted " << luaW_typename(L1, _val_type) << " to nil" << std::endl);
            lua_replace(L1, L1_i);                                                                 // L1: ... mt
            lua_pop(L1, 1);                                                                        // L1: ...
            _val_type = _converterType;
        } else {
-            raise_luaL_error(getErrL(), "Invalid %s type %s", kConvertField.data(), luaG_typename(L1, _converterType).data());
+            raise_luaL_error(getErrL(), "Invalid %s type %s", kConvertField.data(), luaW_typename(L1, _converterType).data());
        }
        break;
    case LuaType::STRING:
        // kConvertField == "decay" -> replace source value with it's pointer
-        if (std::string_view const _mode{ luaG_tostring(L1, kIdxTop) }; _mode == "decay") {
+        if (std::string_view const _mode{ luaW_tostring(L1, kIdxTop) }; _mode == "decay") {
            lua_pop(L1, 1);                                                                        // L1: ... mt
            lua_pushlightuserdata(L1, const_cast<void*>(lua_topointer(L1, L1_i)));                 // L1: ... mt decayed
            lua_replace(L1, L1_i);                                                                 // L1: ... mt
@@ -581,18 +566,18 @@ LuaType InterCopyContext::processConversion() const
    case LuaType::FUNCTION:
        lua_pushvalue(L1, L1_i);                                                                   // L1: ... mt kConvertField val
-        luaG_pushstring(L1, mode == LookupMode::ToKeeper ? "keeper" : "regular");                  // L1: ... mt kConvertField val string
+        luaW_pushstring(L1, mode == LookupMode::ToKeeper ? "keeper" : "regular");                  // L1: ... mt kConvertField val string
        lua_call(L1, 2, 1); // val:kConvertField(str) -> result                                    // L1: ... mt kConvertField converted
        lua_replace(L1, L1_i);                                                                     // L1: ... mt
        lua_pop(L1, 1);                                                                            // L1: ... mt
-        _val_type =  luaG_type(L1, L1_i);
+        _val_type =  luaW_type(L1, L1_i);
        break;
    default:
-        raise_luaL_error(getErrL(), "Invalid %s type %s", kConvertField.data(), luaG_typename(L1, _converterType).data());
+        raise_luaL_error(getErrL(), "Invalid %s type %s", kConvertField.data(), luaW_typename(L1, _converterType).data());
    }
    STACK_CHECK(L1, 0);
-    LUA_ASSERT(getErrL(), luaG_type(L1, L1_i) == _val_type);
+    LUA_ASSERT(getErrL(), luaW_type(L1, L1_i) == _val_type);
    return _val_type;
 }
@@ -615,7 +600,7 @@ bool InterCopyContext::pushCachedMetatable() const
    // do we already know this metatable?
    std::ignore = kMtIdRegKey.getSubTable(L2, NArr{ 0 }, NRec{ 0 });                               //                                                L2: _R[kMtIdRegKey]
    lua_pushinteger(L2, _mt_id);                                                                   //                                                L2: _R[kMtIdRegKey] id
-    if (luaG_rawget(L2, StackIndex{ -2 }) == LuaType::NIL) { // L2 did not know the metatable      //                                                L2: _R[kMtIdRegKey] mt|nil
+    if (luaW_rawget(L2, StackIndex{ -2 }) == LuaType::NIL) { // L2 did not know the metatable      //                                                L2: _R[kMtIdRegKey] mt|nil
        lua_pop(L2, 1);                                                                            //                                                L2: _R[kMtIdRegKey]
        InterCopyContext const _c{ U, L2, L1, L2_cache_i, SourceIndex{ lua_gettop(L1) }, VT::METATABLE, mode, name };
        if (_c.interCopyOne() != InterCopyResult::Success) {                                       //                                                L2: _R[kMtIdRegKey] mt?
@@ -662,9 +647,9 @@ bool InterCopyContext::pushCachedTable() const
    // push a light userdata uniquely representing the table
    lua_pushlightuserdata(L2, const_cast<void*>(_p));                                              // L1: ... t ...                                  L2: ... p
-    //DEBUGSPEW_CODE(DebugSpew(U) << "<< ID: " << luaG_tostring(L2, -1) << " >>" << std::endl);
+    //DEBUGSPEW_CODE(DebugSpew(U) << "<< ID: " << luaW_tostring(L2, -1) << " >>" << std::endl);
-    bool const _not_found_in_cache{ luaG_rawget(L2, L2_cache_i) == LuaType::NIL };                 // L1: ... t ...                                  L2: ... {cached|nil}
+    bool const _not_found_in_cache{ luaW_rawget(L2, L2_cache_i) == LuaType::NIL };                 // L1: ... t ...                                  L2: ... {cached|nil}
    if (_not_found_in_cache) {
        // create a new entry in the cache
        lua_pop(L2, 1);                                                                            // L1: ... t ...                                  L2: ...
@@ -696,7 +681,7 @@ bool InterCopyContext::lookupUserdata() const
    case LookupMode::ToKeeper:
        // push a sentinel closure that holds the lookup name as upvalue
-        luaG_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: "f.q.n"
        lua_pushcclosure(L2, userdata_lookup_sentinel, 1);                                         // L1: ... f ...                                  L2: f
        break;
@@ -705,16 +690,16 @@ bool InterCopyContext::lookupUserdata() const
        kLookupRegKey.pushValue(L2);                                                               // L1: ... f ...                                  L2: {}
        STACK_CHECK(L2, 1);
        LUA_ASSERT(L1, lua_istable(L2, -1));
-        luaG_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: {} "f.q.n"
+        luaW_pushstring(L2, _fqn);                                                                 // L1: ... f ...                                  L2: {} "f.q.n"
-        LuaType const _type{ luaG_rawget(L2, StackIndex{ -2 }) };                                  // L1: ... f ...                                  L2: {} f
+        LuaType const _type{ luaW_rawget(L2, StackIndex{ -2 }) };                                  // L1: ... f ...                                  L2: {} f
        // nil means we don't know how to transfer stuff: user should do something
        // anything other than function or table should not happen!
        if (_type != LuaType::FUNCTION && _type != LuaType::TABLE) {
            kLaneNameRegKey.pushValue(L1);                                                         // L1: ... f ... lane_name
-            std::string_view const _from{ luaG_tostring(L1, kIdxTop) };
+            std::string_view const _from{ luaW_tostring(L1, kIdxTop) };
            lua_pop(L1, 1);                                                                        // L1: ... f ...
            kLaneNameRegKey.pushValue(L2);                                                         // L1: ... f ...                                  L2: {} f lane_name
-            std::string_view const _to{ luaG_tostring(L2, kIdxTop) };
+            std::string_view const _to{ luaW_tostring(L2, kIdxTop) };
            lua_pop(L2, 1);                                                                        //                                                L2: {} f
            raise_luaL_error(
                getErrL(),
@@ -736,7 +721,7 @@ bool InterCopyContext::lookupUserdata() const
 [[nodiscard]]
 bool InterCopyContext::tryCopyClonable() const
 {
-    SourceIndex const _L1_i{ luaG_absindex(L1, L1_i).value() };
+    SourceIndex const _L1_i{ luaW_absindex(L1, L1_i).value() };
    void* const _source{ lua_touserdata(L1, _L1_i) };
    STACK_CHECK_START_REL(L1, 0);
@@ -744,7 +729,7 @@ bool InterCopyContext::tryCopyClonable() const
    // Check if the source was already cloned during this copy
    lua_pushlightuserdata(L2, _source);                                                            //                                                L2: ... source
-    if (luaG_rawget(L2, L2_cache_i) != LuaType::NIL) {                                             //                                                L2: ... clone?
+    if (luaW_rawget(L2, L2_cache_i) != LuaType::NIL) {                                             //                                                L2: ... clone?
        STACK_CHECK(L2, 1);
        return true;
    } else {
@@ -759,7 +744,7 @@ bool InterCopyContext::tryCopyClonable() const
    }
    // no __lanesclone? -> not clonable
-    if (luaG_getfield(L1, kIdxTop, "__lanesclone") == LuaType::NIL) {                              // L1: ... mt nil
+    if (luaW_getfield(L1, kIdxTop, "__lanesclone") == LuaType::NIL) {                              // L1: ... mt nil
        lua_pop(L1, 2);                                                                            // L1: ...
        STACK_CHECK(L1, 0);
        return false;
@@ -769,10 +754,10 @@ bool InterCopyContext::tryCopyClonable() const
    // we need to copy over the uservalues of the userdata as well
    {
-        StackIndex const _mt{ luaG_absindex(L1, StackIndex{ -2 }) };                               // L1: ... mt __lanesclone
+        StackIndex const _mt{ luaW_absindex(L1, StackIndex{ -2 }) };                               // L1: ... mt __lanesclone
        auto const userdata_size{ static_cast<size_t>(lua_rawlen(L1, _L1_i)) }; // make 32-bits builds happy
        // extract all the uservalues, but don't transfer them yet
-        UserValueCount const _nuv{ luaG_getalluservalues(L1, _L1_i) };                             // L1: ... mt __lanesclone [uv]*
+        UserValueCount const _nuv{ luaW_getalluservalues(L1, _L1_i) };                             // L1: ... mt __lanesclone [uv]*
        // create the clone userdata with the required number of uservalue slots
        void* const _clone{ lua_newuserdatauv(L2, userdata_size, _nuv) };                          //                                                L2: ... u
        // copy the metatable in the target state, and give it to the clone we put there
@@ -804,7 +789,7 @@ bool InterCopyContext::tryCopyClonable() const
        // assign uservalues
        UserValueIndex _uvi{ _nuv.value() };
        while (_uvi > 0) {
-            _c.L1_i = SourceIndex{ luaG_absindex(L1, kIdxTop).value() };
+            _c.L1_i = SourceIndex{ luaW_absindex(L1, kIdxTop).value() };
            if (_c.interCopyOne() != InterCopyResult::Success) {                                   //                                                L2: ... u uv
                raise_luaL_error(getErrL(), "Cannot copy upvalue type '%s'", luaL_typename(L1, -1));
            }
@@ -850,10 +835,10 @@ bool InterCopyContext::tryCopyDeep() const
    STACK_CHECK_START_REL(L2, 0);
    // extract all uservalues of the source. unfortunately, the only way to know their count is to iterate until we fail
-    UserValueCount const _nuv{ luaG_getalluservalues(L1, L1_i) };                                  // L1: ... deep ... [uv]*
+    UserValueCount const _nuv{ luaW_getalluservalues(L1, L1_i) };                                  // L1: ... deep ... [uv]*
    STACK_CHECK(L1, _nuv);
-    DeepPrelude* const _deep{ *luaG_tofulluserdata<DeepPrelude*>(L1, L1_i) };
+    DeepPrelude* const _deep{ *luaW_tofulluserdata<DeepPrelude*>(L1, L1_i) };
    DeepFactory::PushDeepProxy(L2, _deep, _nuv, mode, getErrL());                                  // L1: ... deep ... [uv]*                           L2: deep
    // transfer all uservalues of the source in the destination
@@ -863,7 +848,7 @@ bool InterCopyContext::tryCopyDeep() const
        STACK_GROW(L2, _nuv);
        UserValueIndex _uvi{ _nuv.value() };
        while (_uvi) {
-            _c.L1_i = SourceIndex{ luaG_absindex(L1, kIdxTop).value() };
+            _c.L1_i = SourceIndex{ luaW_absindex(L1, kIdxTop).value() };
            if (_c.interCopyOne() != InterCopyResult::Success) {                                   // L1: ... deep ... [uv]*                           L2: deep uv
                raise_luaL_error(getErrL(), "Cannot copy upvalue type '%s'", luaL_typename(L1, -1));
            }
@@ -911,7 +896,7 @@ bool InterCopyContext::interCopyFunction() const
        lua_getupvalue(L1, L1_i, 2);                                                               // L1: ... u
        void* _source{ lua_touserdata(L1, -1) };
        lua_pushlightuserdata(L2, _source);                                                        //                                                L2: ... source
-        if (luaG_rawget(L2, L2_cache_i) != LuaType::NIL) {                                         //                                                L2: ... u?
+        if (luaW_rawget(L2, L2_cache_i) != LuaType::NIL) {                                         //                                                L2: ... u?
            lua_pop(L1, 1);                                                                        // L1: ...
            STACK_CHECK(L1, 0);
            STACK_CHECK(L2, 1);
@@ -933,7 +918,7 @@ bool InterCopyContext::interCopyFunction() const
        auto const _userdata_size{ static_cast<size_t>(lua_rawlen(L1, kIdxTop)) };  // make 32-bits builds happy
        {
            // extract uservalues (don't transfer them yet)
-            UserValueCount const _nuv{ luaG_getalluservalues(L1, source_i) };                      // L1: ... u [uv]*
+            UserValueCount const _nuv{ luaW_getalluservalues(L1, source_i) };                      // L1: ... u [uv]*
            STACK_CHECK(L1, _nuv + 1);
            // create the clone userdata with the required number of uservalue slots
            _clone = lua_newuserdatauv(L2, _userdata_size, _nuv);                                  //                                                L2: ... mt u
@@ -948,7 +933,7 @@ bool InterCopyContext::interCopyFunction() const
            InterCopyContext _c{ *this };
            UserValueIndex _uvi{ _nuv.value() };
            while (_uvi > 0) {
-                _c.L1_i = SourceIndex{ luaG_absindex(L1, kIdxTop).value() };
+                _c.L1_i = SourceIndex{ luaW_absindex(L1, kIdxTop).value() };
                if (_c.interCopyOne() != InterCopyResult::Success) {                               //                                                L2: ... mt u uv
                    raise_luaL_error(getErrL(), "Cannot copy upvalue type '%s'", luaL_typename(L1, -1));
                }
@@ -965,9 +950,9 @@ bool InterCopyContext::interCopyFunction() const
        // perform the custom cloning part
        lua_insert(L2, -2);                                                                        //                                                L2: ... u mt
        // __lanesclone should always exist because we wouldn't be restoring data from a userdata_clone_sentinel closure to begin with
-        LuaType const _funcType{ luaG_getfield(L2, kIdxTop, "__lanesclone") };                     //                                                L2: ... u mt __lanesclone
+        LuaType const _funcType{ luaW_getfield(L2, kIdxTop, "__lanesclone") };                     //                                                L2: ... u mt __lanesclone
        if (_funcType != LuaType::FUNCTION) {
-            raise_luaL_error(getErrL(), "INTERNAL ERROR: __lanesclone is a %s, not a function", luaG_typename(L2, _funcType).data());
+            raise_luaL_error(getErrL(), "INTERNAL ERROR: __lanesclone is a %s, not a function", luaW_typename(L2, _funcType).data());
        }
        lua_remove(L2, -2);                                                                        //                                                L2: ... u __lanesclone
        lua_pushlightuserdata(L2, _clone);                                                         //                                                L2: ... u __lanesclone clone
@@ -1060,9 +1045,9 @@ bool InterCopyContext::interCopyNumber() const
 [[nodiscard]]
 bool InterCopyContext::interCopyString() const
 {
-    std::string_view const _s{ luaG_tostring(L1, L1_i) };
+    std::string_view const _s{ luaW_tostring(L1, L1_i) };
    DEBUGSPEW_CODE(DebugSpew(nullptr) << "'" << _s << "'" << std::endl);
-    luaG_pushstring(L2, _s);
+    luaW_pushstring(L2, _s);
    return true;
 }
@@ -1154,7 +1139,7 @@ bool InterCopyContext::interCopyUserdata() const
    // Last, let's try to see if this userdata is special (aka is it some userdata that we registered in our lookup databases during module registration?)
    if (lookupUserdata()) {
-        LUA_ASSERT(L1, luaG_type(L2, kIdxTop) == LuaType::USERDATA || (lua_tocfunction(L2, kIdxTop) == userdata_lookup_sentinel)); // from lookup data. can also be userdata_lookup_sentinel if this is a userdata we know
+        LUA_ASSERT(L1, luaW_type(L2, kIdxTop) == LuaType::USERDATA || (lua_tocfunction(L2, kIdxTop) == userdata_lookup_sentinel)); // from lookup data. can also be userdata_lookup_sentinel if this is a userdata we know
        return true;
    }
@@ -1291,8 +1276,8 @@ InterCopyResult InterCopyContext::interCopyPackage() const
    } const _onExit{ L2 };
    STACK_CHECK_START_REL(L1, 0);
-    if (luaG_type(L1, L1_i) != LuaType::TABLE) {
+    if (luaW_type(L1, L1_i) != LuaType::TABLE) {
-        std::string_view const _msg{ luaG_pushstring(L1, "expected package as table, got a %s", luaL_typename(L1, L1_i)) };
+        std::string_view const _msg{ luaW_pushstring(L1, "expected package as table, got a %s", luaL_typename(L1, L1_i)) };
        STACK_CHECK(L1, 1);
        // raise the error when copying from lane to lane, else just leave it on the stack to be raised later
        if (mode == LookupMode::LaneBody) {
@@ -1300,7 +1285,7 @@ InterCopyResult InterCopyContext::interCopyPackage() const
        }
        return InterCopyResult::Error;
    }
-    if (luaG_getmodule(L2, LUA_LOADLIBNAME) == LuaType::NIL) { // package library not loaded: do nothing
+    if (luaW_getmodule(L2, LUA_LOADLIBNAME) == LuaType::NIL) { // package library not loaded: do nothing
        DEBUGSPEW_CODE(DebugSpew(U) << "'package' not loaded, nothing to do" << std::endl);
        STACK_CHECK(L1, 0);
        return InterCopyResult::Success;
@@ -1317,7 +1302,7 @@ InterCopyResult InterCopyContext::interCopyPackage() const
            continue;
        }
        DEBUGSPEW_CODE(DebugSpew(U) << "package." << _entry << std::endl);
-        if (luaG_getfield(L1, L1_i, _entry) == LuaType::NIL) {
+        if (luaW_getfield(L1, L1_i, _entry) == LuaType::NIL) {
            lua_pop(L1, 1);
        } else {
            {
@@ -1328,9 +1313,9 @@ InterCopyResult InterCopyContext::interCopyPackage() const
                STACK_CHECK(L1, 0);
            }
            if (_result == InterCopyResult::Success) {
-                luaG_setfield(L2, StackIndex{ -2 }, _entry); // set package[entry]
+                luaW_setfield(L2, StackIndex{ -2 }, _entry); // set package[entry]
            } else {
-                std::string_view const _msg{ luaG_pushstring(L1, "failed to copy package.%s", _entry.data()) };
+                std::string_view const _msg{ luaW_pushstring(L1, "failed to copy package.%s", _entry.data()) };
                // raise the error when copying from lane to lane, else just leave it on the stack to be raised later
                if (mode == LookupMode::LaneBody) {
                    raise_luaL_error(getErrL(), _msg);
diff --git a/src/keeper.cpp b/src/keeper.cpp
index c8c470f..4af0d86 100644
--- a/src/keeper.cpp
+++ b/src/keeper.cpp
@@ -77,7 +77,7 @@ class KeyUD final
    // a fifo full userdata has one uservalue, the table that holds the actual fifo contents
    [[nodiscard]]
-    static void* operator new([[maybe_unused]] size_t size_, KeeperState L_) noexcept { return luaG_newuserdatauv<KeyUD>(L_, UserValueCount{ 1 }); }
+    static void* operator new([[maybe_unused]] size_t size_, KeeperState L_) noexcept { return luaW_newuserdatauv<KeyUD>(L_, UserValueCount{ 1 }); }
    // always embedded somewhere else or "in-place constructed" as a full userdata
    // can't actually delete the operator because the compiler generates stack unwinding code that could call it in case of exception
    static void operator delete([[maybe_unused]] void* p_, [[maybe_unused]] KeeperState L_) { LUA_ASSERT(L_, !"should never be called"); }
@@ -104,6 +104,7 @@ class KeyUD final
 // #################################################################################################
+[[nodiscard]]
 bool KeyUD::changeLimit(LindaLimit const limit_)
 {
    bool const _newSlackAvailable{
@@ -127,6 +128,7 @@ LindaRestrict KeyUD::changeRestrict(LindaRestrict const restrict_)
 // in: nothing
 // out: { first = 1, count = 0, limit = -1}
+[[nodiscard]]
 KeyUD* KeyUD::Create(KeeperState const K_)
 {
    STACK_GROW(K_, 2);
@@ -141,9 +143,10 @@ KeyUD* KeyUD::Create(KeeperState const K_)
 // #################################################################################################
+[[nodiscard]]
 KeyUD* KeyUD::GetPtr(KeeperState const K_, StackIndex const idx_)
 {
-    return luaG_tofulluserdata<KeyUD>(K_, idx_);
+    return luaW_tofulluserdata<KeyUD>(K_, idx_);
 }
 // #################################################################################################
@@ -181,6 +184,7 @@ void KeyUD::peek(KeeperState const K_, int const count_) const
 // in: fifo
 // out: remove the fifo table from the stack, push as many items as required on the stack (function assumes they exist in sufficient number)
+[[nodiscard]]
 int KeyUD::pop(KeeperState const K_, int const minCount_, int const maxCount_)
 {
    if (count < minCount_) {
@@ -191,23 +195,33 @@ int KeyUD::pop(KeeperState const K_, int const minCount_, int const maxCount_)
    int const _popCount{ std::min(count, maxCount_) };
    LUA_ASSERT(K_, KeyUD::GetPtr(K_, kIdxTop) == this);                                            // K_: ... this
    prepareAccess(K_, kIdxTop);                                                                    // K_: ... fifo
+    STACK_CHECK_START_REL(K_, 0);
    StackIndex const _fifo_idx{ lua_gettop(K_) };
    // each iteration pushes a value on the stack!
    STACK_GROW(K_, _popCount + 2);
-    // skip first item, we will push it last
-    for (int const _i : std::ranges::iota_view{ 1, _popCount }) {
+    // remove an element from fifo sequence and push it on the stack
+    auto _extractFifoItem = [K = K_, first = first, fifo_idx = lua_gettop(K_)](int const _i)
+    {
+        STACK_CHECK_START_REL(K, 0);
        int const _at{ first + _i };
        // push item on the stack
-        lua_rawgeti(K_, _fifo_idx, _at);                                                           // K_: ... fifo val
+        lua_rawgeti(K, fifo_idx, _at);                                                             // K_: ... fifo val
        // remove item from the fifo
-        lua_pushnil(K_);                                                                           // K_: ... fifo val nil
+        lua_pushnil(K);                                                                            // K_: ... fifo val nil
-        lua_rawseti(K_, _fifo_idx, _at);                                                           // K_: ... fifo val
+        lua_rawseti(K, fifo_idx, _at);                                                             // K_: ... fifo val
+        STACK_CHECK(K, 1);
+    };
+    // skip first item, we will push it last to avoid shifting the whole stack when removing 'fifo'
+    for (int const _i : std::ranges::iota_view{ 1, _popCount }) {
+        _extractFifoItem(_i);                                                                      // K_: ... fifo val1...valN
    }
    // now process first item
-    lua_rawgeti(K_, _fifo_idx, first);                                                             // K_: ... fifo vals val
+    _extractFifoItem(0);                                                                           // K_: ... fifo val1...valN val0
-    lua_pushnil(K_);                                                                               // K_: ... fifo vals val nil
+    STACK_CHECK(K_, _popCount);
-    lua_rawseti(K_, _fifo_idx, first);                                                             // K_: ... fifo vals val
+    lua_replace(K_, _fifo_idx);                                                                    // K_: ... val0...valN
-    lua_replace(K_, _fifo_idx);                                                                    // K_: ... vals
    // avoid ever-growing indexes by resetting each time we detect the fifo is empty
    int const _new_count{ count - _popCount };
@@ -222,7 +236,7 @@ int KeyUD::pop(KeeperState const K_, int const minCount_, int const maxCount_)
 // replaces it by its uservalue on the stack (the table holding the fifo values)
 void KeyUD::prepareAccess(KeeperState const K_, StackIndex const idx_) const
 {
-    StackIndex const _idx{ luaG_absindex(K_, idx_) };
+    StackIndex const _idx{ luaW_absindex(K_, idx_) };
    LUA_ASSERT(K_, KeyUD::GetPtr(K_, idx_) == this);
    // we can replace the key userdata in the stack without fear of it being GCed, there are other references around
    lua_getiuservalue(K_, _idx, kContentsTableIndex);
@@ -233,9 +247,10 @@ void KeyUD::prepareAccess(KeeperState const K_, StackIndex const idx_) const
 // in: expect this val... on top of the stack
 // out: nothing, removes all pushed values from the stack
+[[nodiscard]]
 bool KeyUD::push(KeeperState const K_, int const count_, bool const enforceLimit_)
 {
-    StackIndex const _fifoIdx{ luaG_absindex(K_, StackIndex{ -1 - count_ }) };
+    StackIndex const _fifoIdx{ luaW_absindex(K_, StackIndex{ -1 - count_ }) };
    LUA_ASSERT(K_, KeyUD::GetPtr(K_, _fifoIdx) == this);                                           // K_: this val...
    if (enforceLimit_ && (limit >= 0) && (count + count_ > limit)) { // not enough room
        return false;
@@ -259,16 +274,16 @@ bool KeyUD::push(KeeperState const K_, int const count_, bool const enforceLimit
 void KeyUD::pushFillStatus(KeeperState const K_) const
 {
    if (limit < 0) {
-        luaG_pushstring(K_, kUnder);
+        luaW_pushstring(K_, kUnder);
        return;
    }
-    int const _delta{limit - count};
+    int const _delta{ limit - count };
    if (_delta < 0) {
-        luaG_pushstring(K_, kOver);
+        luaW_pushstring(K_, kOver);
    } else if (_delta > 0) {
-        luaG_pushstring(K_, kUnder);
+        luaW_pushstring(K_, kUnder);
    } else {
-        luaG_pushstring(K_, kExact);
+        luaW_pushstring(K_, kExact);
    }
 }
@@ -279,13 +294,16 @@ void KeyUD::PushFillStatus(KeeperState const K_, KeyUD const* const key_)
    if (key_) {
        key_->pushFillStatus(K_);                                                                  // _K: ... <fill status>
    } else {
-        luaG_pushstring(K_, KeyUD::kUnder);                                                        // _K: ... "under"
+        luaW_pushstring(K_, KeyUD::kUnder);                                                        // _K: ... "under"
    }
 }
 // #################################################################################################
-// expects 'this' on top of the stack
+// in: expects 'this' on top of the stack
+// out: nothing
+// returns true if the channel was full
+[[nodiscard]]
 bool KeyUD::reset(KeeperState const K_)
 {
    LUA_ASSERT(K_, KeyUD::GetPtr(K_, kIdxTop) == this);
@@ -312,10 +330,10 @@ static void PushKeysDB(KeeperState const K_, StackIndex const idx_)
 {
    STACK_GROW(K_, 5);
    STACK_CHECK_START_REL(K_, 0);
-    StackIndex const _absidx{ luaG_absindex(K_, idx_) };
+    StackIndex const _absidx{ luaW_absindex(K_, idx_) };
    kLindasRegKey.pushValue(K_);                                                                   // K_: ... LindasDB
    lua_pushvalue(K_, _absidx);                                                                    // K_: ... LindasDB linda
-    if (luaG_rawget(K_, StackIndex{ -2 }) == LuaType::NIL) {                                       // K_: ... LindasDB KeysDB
+    if (luaW_rawget(K_, StackIndex{ -2 }) == LuaType::NIL) {                                       // K_: ... LindasDB KeysDB
        lua_pop(K_, 1);                                                                            // K_: ... LindasDB
        // add a new KeysDB table for this linda
        lua_newtable(K_);                                                                          // K_: ... LindasDB KeysDB
@@ -337,6 +355,7 @@ static void PushKeysDB(KeeperState const K_, StackIndex const idx_)
 // in: linda
 // out: nothing
+[[nodiscard]]
 int keepercall_collectgarbage(lua_State* const L_)
 {
    lua_gc(L_, LUA_GCCOLLECT, 0);
@@ -346,6 +365,7 @@ int keepercall_collectgarbage(lua_State* const L_)
 // #################################################################################################
 // in: linda [, key [, ...]]
+[[nodiscard]]
 int keepercall_count(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -370,7 +390,7 @@ int keepercall_count(lua_State* const L_)
    case 2:                                                                                        // _K: linda key
        PushKeysDB(_K, StackIndex{ 1 });                                                           // _K: linda key KeysDB
        lua_replace(_K, 1);                                                                        // _K: KeysDB key
-        if (luaG_rawget(_K, StackIndex{ -2 }) == LuaType::NIL) { // the key is unknown             // _K: KeysDB KeyUD|nil
+        if (luaW_rawget(_K, StackIndex{ -2 }) == LuaType::NIL) { // the key is unknown             // _K: KeysDB KeyUD|nil
            lua_remove(_K, -2);                                                                    // _K: nil
        } else { // the key is known                                                               // _K: KeysDB KeyUD
            KeyUD* const _key{ KeyUD::GetPtr(_K, kIdxTop) };
@@ -409,6 +429,7 @@ int keepercall_count(lua_State* const L_)
 // in: linda
 // not part of the linda public API, only used for cleanup at linda GC
+[[nodiscard]]
 int keepercall_destruct(lua_State* const L_)
 {
    STACK_GROW(L_, 3);
@@ -427,6 +448,7 @@ int keepercall_destruct(lua_State* const L_)
 // in: linda_ud key [count]
 // out: N <N values>|kRestrictedChannel
+[[nodiscard]]
 int keepercall_get(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -461,6 +483,7 @@ int keepercall_get(lua_State* const L_)
 // in: linda key [n|nil]
 // out: boolean, <fill status: string>
+[[nodiscard]]
 int keepercall_limit(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -480,7 +503,7 @@ int keepercall_limit(lua_State* const L_)
        if (_key && _key->limit >= 0) {
            lua_pushinteger(_K, _key->limit);                                                      // _K: limit
        } else { // if the key doesn't exist, it is unlimited by default
-            luaG_pushstring(_K, "unlimited");                                                      // _K: "unlimited"
+            luaW_pushstring(_K, "unlimited");                                                      // _K: "unlimited"
        }
        // return a single value: the limit of the key
    } else {
@@ -504,6 +527,7 @@ int keepercall_limit(lua_State* const L_)
 // in: linda, key [, key]?
 // out: (key, val) or nothing
+[[nodiscard]]
 int keepercall_receive(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -548,6 +572,7 @@ int keepercall_receive(lua_State* const L_)
 // #################################################################################################
 // in: linda key mincount [maxcount]
+[[nodiscard]]
 int keepercall_receive_batched(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -581,6 +606,7 @@ int keepercall_receive_batched(lua_State* const L_)
 // in: linda key [mode]
 // out: mode
+[[nodiscard]]
 int keepercall_restrict(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -591,7 +617,7 @@ int keepercall_restrict(lua_State* const L_)
        if (_reading) {
            return LindaRestrict::None;
        }
-        std::string_view const _val{ luaG_tostring(_K, StackIndex{ 3 }) };
+        std::string_view const _val{ luaW_tostring(_K, StackIndex{ 3 }) };
        if (_val == "set/get") {
            return LindaRestrict::SetGet;
        }
@@ -623,7 +649,7 @@ int keepercall_restrict(lua_State* const L_)
        lua_settop(_K, 0);                                                                         // _K:
        auto const _prevRstrct{ _key ? _key->restrict : LindaRestrict::None };
        // return a single value: the restrict mode of the key
-        luaG_pushstring(_K, _encodeRestrict(_prevRstrct));                                          // _K: _previous
+        luaW_pushstring(_K, _encodeRestrict(_prevRstrct));                                          // _K: _previous
    } else {
        if (_key == nullptr) {                                                                     // _K: KeysDB key nil
            lua_pop(_K, 1);                                                                        // _K: KeysDB key
@@ -635,7 +661,7 @@ int keepercall_restrict(lua_State* const L_)
        // return true if we decide that blocked threads waiting to write on that key should be awakened
        // this is the case if we detect the key was full but it is no longer the case
        LindaRestrict const _previous{ _key->changeRestrict(_rstrct) };
-        luaG_pushstring(_K, _encodeRestrict(_previous));                                           // _K: _previous
+        luaW_pushstring(_K, _encodeRestrict(_previous));                                           // _K: _previous
    }
    STACK_CHECK(_K, 1);
    return 1;
@@ -645,6 +671,7 @@ int keepercall_restrict(lua_State* const L_)
 // in: linda, key, ...
 // out: true|false|kRestrictedChannel
+[[nodiscard]]
 int keepercall_send(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -653,7 +680,7 @@ int keepercall_send(lua_State* const L_)
    PushKeysDB(_K, StackIndex{ 1 });                                                               // _K: linda key val... KeysDB
    // get the fifo associated to this key in this linda, create it if it doesn't exist
    lua_pushvalue(_K, 2);                                                                          // _K: linda key val... KeysDB key
-    if (luaG_rawget(_K, StackIndex{ -2 }) == LuaType::NIL) {                                       // _K: linda key val... KeysDB KeyUD|nil
+    if (luaW_rawget(_K, StackIndex{ -2 }) == LuaType::NIL) {                                       // _K: linda key val... KeysDB KeyUD|nil
        lua_pop(_K, 1);                                                                            // _K: linda key val... KeysDB
        std::ignore = KeyUD::Create(KeeperState{ _K });                                            // _K: linda key val... KeysDB KeyUD
        // KeysDB[key] = KeyUD
@@ -684,6 +711,7 @@ int keepercall_send(lua_State* const L_)
 // in: linda key [val...]
 // out: true if the linda was full but it's no longer the case, else false, or kRestrictedChannel if the key is restricted
+[[nodiscard]]
 int keepercall_set(lua_State* const L_)
 {
    KeeperState const _K{ L_ };
@@ -753,6 +781,7 @@ int keepercall_set(lua_State* const L_)
 *
 * Returns: number of return values (pushed to 'L'), unset in case of error
 */
+[[nodiscard]]
 KeeperCallResult keeper_call(KeeperState const K_, keeper_api_t const func_, lua_State* const L_, Linda* const linda_, StackIndex const starting_index_)
 {
    KeeperCallResult _result;
@@ -822,6 +851,7 @@ KeeperCallResult keeper_call(KeeperState const K_, keeper_api_t const func_, lua
 //     }
 //     ...
 // }
+[[nodiscard]]
 int Keeper::PushLindaStorage(Linda& linda_, DestState const L_)
 {
    Keeper* const _keeper{ linda_.whichKeeper() };
@@ -833,7 +863,7 @@ int Keeper::PushLindaStorage(Linda& linda_, DestState const L_)
    STACK_CHECK_START_REL(_K, 0);
    kLindasRegKey.pushValue(_K);                                                                   // _K: LindasDB                                       L_:
    lua_pushlightuserdata(_K, &linda_);                                                            // _K: LindasDB linda                                 L_:
-    LuaType const _type{ luaG_rawget(_K, StackIndex{ -2 }) };                                      // _K: LindasDB KeysDB                                L_:
+    LuaType const _type{ luaW_rawget(_K, StackIndex{ -2 }) };                                      // _K: LindasDB KeysDB                                L_:
    lua_remove(_K, -2);                                                                            // _K: KeysDB                                         L_:
    if (_type != LuaType::TABLE) { // possible if we didn't send anything through that linda
        lua_pop(_K, 1);                                                                            // _K:                                                L_:
@@ -870,20 +900,20 @@ int Keeper::PushLindaStorage(Linda& linda_, DestState const L_)
        if (_key->limit >= 0) {
            lua_pushinteger(L_, _key->limit);                                                      // _K: KeysDB key                                     L_: out key keyout fifo limit
        } else {
-            luaG_pushstring(L_, "unlimited");                                                      // _K: KeysDB key                                     L_: out key keyout fifo limit
+            luaW_pushstring(L_, "unlimited");                                                      // _K: KeysDB key                                     L_: out key keyout fifo limit
        }
        STACK_CHECK(L_, 5);
        lua_setfield(L_, -3, "limit");                                                             // _K: KeysDB key                                     L_: out key keyout fifo
        // keyout.restrict
        switch (_key->restrict) {
        case LindaRestrict::None:
-            luaG_pushstring(L_, "none");                                                           // _K: KeysDB key                                     L_: out key keyout fifo restrict
+            luaW_pushstring(L_, "none");                                                           // _K: KeysDB key                                     L_: out key keyout fifo restrict
            break;
        case LindaRestrict::SetGet:
-            luaG_pushstring(L_, "set/get");                                                        // _K: KeysDB key                                     L_: out key keyout fifo restrict
+            luaW_pushstring(L_, "set/get");                                                        // _K: KeysDB key                                     L_: out key keyout fifo restrict
            break;
        case LindaRestrict::SendReceive:
-            luaG_pushstring(L_, "send/receive");                                                   // _K: KeysDB key                                     L_: out key keyout fifo restrict
+            luaW_pushstring(L_, "send/receive");                                                   // _K: KeysDB key                                     L_: out key keyout fifo restrict
            break;
        }
        STACK_CHECK(L_, 5);
@@ -951,16 +981,16 @@ void Keepers::collectGarbage()
 // #################################################################################################
+[[nodiscard]]
-void Keepers::close()
+bool Keepers::close()
 {
    if (isClosing.test_and_set(std::memory_order_release)) {
-        assert(false); // should never close more than once in practice
+        return false; // should never close more than once in practice
-        return;
    }
+    // We may have not initialized the keepers if an error was raised in Universe::Create because of bad settings
    if (std::holds_alternative<std::monostate>(keeper_array)) {
-        return;
+        return true;
    }
    auto _closeOneKeeper = [](Keeper& keeper_) {
@@ -989,6 +1019,7 @@ void Keepers::close()
    }
    keeper_array.emplace<std::monostate>();
+    return true;
 }
 // #################################################################################################
@@ -1059,7 +1090,7 @@ void Keepers::initialize(Universe& U_, lua_State* L_, size_t const nbKeepers_, i
        keeper_.K = _K;
        // Give a name to the state
-        luaG_pushstring(_K, "Keeper #%d", i_ + 1);                                                 // L_: settings                                   _K: "Keeper #n"
+        luaW_pushstring(_K, "Keeper #%d", i_ + 1);                                                 // L_: settings                                   _K: "Keeper #n"
        if constexpr (HAVE_DECODA_SUPPORT()) {
            lua_pushvalue(_K, -1);                                                                 //                                                _K: "Keeper #n" Keeper #n"
            lua_setglobal(_K, "decoda_name");                                                      // L_: settings                                   _K: "Keeper #n"
@@ -1081,9 +1112,9 @@ void Keepers::initialize(Universe& U_, lua_State* L_, size_t const nbKeepers_, i
        STACK_CHECK(_K, 0);
        // copy package.path and package.cpath from the source state
-        if (luaG_getmodule(L, LUA_LOADLIBNAME) != LuaType::NIL) {                                  // L_: settings package                           _K:
+        if (luaW_getmodule(L, LUA_LOADLIBNAME) != LuaType::NIL) {                                  // L_: settings package                           _K:
            // when copying with mode LookupMode::ToKeeper, error message is pushed at the top of the stack, not raised immediately
-            InterCopyContext _c{ U, DestState{ _K.value() }, SourceState{ L }, {}, SourceIndex{ luaG_absindex(L, kIdxTop).value() }, {}, LookupMode::ToKeeper, {} };
+            InterCopyContext _c{ U, DestState{ _K.value() }, SourceState{ L }, {}, SourceIndex{ luaW_absindex(L, kIdxTop).value() }, {}, LookupMode::ToKeeper, {} };
            if (_c.interCopyPackage() != InterCopyResult::Success) {                               // L_: settings ... error_msg                     _K:
                // if something went wrong, the error message is at the top of the stack
                lua_remove(L, -2);                                                                 // L_: settings error_msg
diff --git a/src/keeper.hpp b/src/keeper.hpp
index f1083b3..955577c 100644
--- a/src/keeper.hpp
+++ b/src/keeper.hpp
@@ -68,7 +68,8 @@ struct Keepers
    Keepers() = default;
    void collectGarbage();
-    void close();
+    [[nodiscard]]
+    bool close();
    [[nodiscard]]
    Keeper* getKeeper(KeeperIndex idx_);
    [[nodiscard]]
diff --git a/src/lane.cpp b/src/lane.cpp
index 5cebdfa..b23ff78 100644
--- a/src/lane.cpp
+++ b/src/lane.cpp
@@ -49,7 +49,7 @@ static LUAG_FUNC(lane_get_threadname)
 {
    Lane* const _lane{ ToLane(L_, StackIndex{ 1 }) };
    luaL_argcheck(L_, lua_gettop(L_) == 1, 2, "too many arguments");
-    luaG_pushstring(L_, _lane->getDebugName());
+    luaW_pushstring(L_, _lane->getDebugName());
    return 1;
 }
@@ -85,17 +85,17 @@ static LUAG_FUNC(set_finalizer)
 static LUAG_FUNC(lane_threadname)
 {
    // C s_lane structure is a light userdata upvalue
-    Lane* const _lane{ luaG_tolightuserdata<Lane>(L_, StackIndex{ lua_upvalueindex(1) }) };
+    Lane* const _lane{ luaW_tolightuserdata<Lane>(L_, StackIndex{ lua_upvalueindex(1) }) };
    LUA_ASSERT(L_, L_ == _lane->L); // this function is exported in a lane's state, therefore it is callable only from inside the Lane's state
    if (lua_gettop(L_) == 1) {
        lua_settop(L_, 1);
        STACK_CHECK_START_REL(L_, 0);
-        _lane->storeDebugName(luaG_tostring(L_, kIdxTop));
+        _lane->storeDebugName(luaW_tostring(L_, kIdxTop));
        _lane->applyDebugName();
        STACK_CHECK(L_, 0);
        return 0;
    } else if (lua_gettop(L_) == 0) {
-        luaG_pushstring(L_, _lane->getDebugName());
+        luaW_pushstring(L_, _lane->getDebugName());
        return 1;
    } else {
        raise_luaL_error(L_, "Wrong number of arguments");
@@ -105,7 +105,7 @@ static LUAG_FUNC(lane_threadname)
 // #################################################################################################
 //---
-// [...] | [nil, err_any, stack_tbl]= lane:join([wait_secs])
+// [true, ...] | [nil, err_any, stack_tbl]= lane:join([wait_secs])
 //
 //  timeout:   returns nil
 //  done:      returns return values (0..N)
@@ -117,7 +117,7 @@ static LUAG_FUNC(lane_join)
    Lane* const _lane{ ToLane(L_, StackIndex{ 1 }) };
    std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-    if (luaG_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
+    if (luaW_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
        lua_Duration const duration{ lua_tonumber(L_, 2) };
        if (duration.count() >= 0.0) {
            _until = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(duration);
@@ -128,71 +128,20 @@ static LUAG_FUNC(lane_join)
    } else if (!lua_isnoneornil(L_, 2)) {
        raise_luaL_argerror(L_, StackIndex{ 2 }, "incorrect duration type");
    }
    lua_settop(L_, 1);                                                                             // L_: lane
-    bool const _done{ !_lane->thread.joinable() || _lane->waitForCompletion(_until) };
-    if (!_done) {
+    // wait until suspended or done
-        lua_pushnil(L_);                                                                           // L_: lane nil
+    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: lane
-        luaG_pushstring(L_, "timeout");                                                            // L_: lane nil "timeout"
+    if (!_lane->waitForJoin(L_, _until)) {
+        // in that case, should have pushed nil, "timeout"
+        STACK_CHECK(L_, 2);
        return 2;
    }
+    STACK_CHECK(L_, 0);                                                                            // L_: lane
+    // Thread is Done/Error/Cancelled; the Lane thread isn't working with it, therefore we can.
-    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: lane
+    std::ignore = _lane->storeResults(L_);
-    // Thread is Suspended or Done/Error/Cancelled; the Lane thread isn't working with it, therefore we can.
+    int const _ret{ _lane->pushStoredResults(L_) };
-    int _ret{ 0 };
-    int const _stored{ _lane->storeResults(L_) };
-    STACK_GROW(L_, std::max(3, _stored + 1));
-    switch (_lane->status.load(std::memory_order_acquire)) {
-    case Lane::Suspended: // got yielded values
-    case Lane::Done: // got regular return values
-        {
-            if (_stored == 0) {
-                raise_luaL_error(L_, _lane->L ? "First return value must be non-nil when using join()" : "Can't join() more than once or after indexing");
-            }
-            lua_getiuservalue(L_, StackIndex{ 1 }, UserValueIndex{ 1 });                           // L_: lane {uv}
-            for (int _i = 2; _i <= _stored; ++_i) {
-                lua_rawgeti(L_, 2, _i);                                                            // L_: lane {uv} results2...N
-            }
-            lua_rawgeti(L_, 2, 1);                                                                 // L_: lane {uv} results2...N result1
-            lua_replace(L_, 2);                                                                    // L_: lane results
-            _ret = _stored;
-        }
-        break;
-    case Lane::Error:
-        {
-            LUA_ASSERT(L_, _stored == 2 || _stored == 3);
-            lua_getiuservalue(L_, StackIndex{ 1 }, UserValueIndex{ 1 });                           // L_: lane {uv}
-            lua_rawgeti(L_, 2, 2);                                                                 // L_: lane {uv} <error>
-            lua_rawgeti(L_, 2, 3);                                                                 // L_: lane {uv} <error> <trace>|nil
-            if (lua_isnil(L_, -1)) {
-                lua_replace(L_, 2);                                                                // L_: lane nil <error>
-            } else {
-                lua_rawgeti(L_, 2, 1);                                                             // L_: lane {uv} <error> <trace> nil
-                lua_replace(L_, 2);                                                                // L_: lane nil <error> <trace>
-            }
-            _ret = lua_gettop(L_) - 1; // 2 or 3
-        }
-        break;
-    case Lane::Cancelled:
-        LUA_ASSERT(L_, _stored == 2);
-        lua_getiuservalue(L_, StackIndex{ 1 }, UserValueIndex{ 1 });                              // L_: lane {uv}
-        lua_rawgeti(L_, 2, 2);                                                                    // L_: lane {uv} cancel_error
-        lua_rawgeti(L_, 2, 1);                                                                    // L_: lane {uv} cancel_error nil
-        lua_replace(L_, -3);                                                                      // L_: lane nil cancel_error
-        LUA_ASSERT(L_, lua_isnil(L_, -2) && kCancelError.equals(L_, kIdxTop));
-        _ret = 2;
-        break;
-    default:
-        DEBUGSPEW_CODE(DebugSpew(nullptr) << "Unknown Lane status: " << static_cast<int>(_lane->status.load(std::memory_order_relaxed)) << std::endl);
-        LUA_ASSERT(L_, false);
-        _ret = 0;
-    }
-    STACK_CHECK(L_, _ret);
    return _ret;
 }
@@ -204,23 +153,13 @@ LUAG_FUNC(lane_resume)
    Lane* const _lane{ ToLane(L_, kIdxSelf) };
    lua_State* const _L2{ _lane->L };
-    // wait until the lane yields
+    // wait until the lane yields or returns
-    std::optional<Lane::Status> _hadToWait{}; // for debugging, if we ever raise the error just below
+    std::ignore = _lane->waitForCompletion(std::chrono::time_point<std::chrono::steady_clock>::max(), true);
-    {
-        std::unique_lock _guard{ _lane->doneMutex };
-        Lane::Status const _status{ _lane->status.load(std::memory_order_acquire) };
-        if (_status == Lane::Pending || _status == Lane::Running || _status == Lane::Resuming) {
-            _hadToWait = _status;
-            _lane->doneCondVar.wait(_guard, [_lane]() { return _lane->status.load(std::memory_order_acquire) == Lane::Suspended; });
-        }
-    }
    if (_lane->status.load(std::memory_order_acquire) != Lane::Suspended) {
-        if (_hadToWait) {
+        raise_luaL_error(L_, "cannot resume non-suspended coroutine Lane");
-            raise_luaL_error(L_, "INTERNAL ERROR: Lane status is %s instead of 'suspended'", _lane->threadStatusString().data());
-        } else {
-            raise_luaL_error(L_, "Can't resume a non-suspended coroutine-type Lane");
-        }
    }
    int const _nargs{ lua_gettop(L_) - 1 };
    int const _nresults{ lua_gettop(_L2) };
    STACK_CHECK_START_ABS(L_, 1 + _nargs);                                                         // L_: self args...                               _L2: results...
@@ -263,12 +202,17 @@ static int lane_index_number(lua_State* L_)
    int const _key{ static_cast<int>(lua_tointeger(L_, 2)) };
    lua_pop(L_, 1);                                                                                // L_: lane
+    // wait until suspended or done
+    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: lane
    std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-    if (!_lane->waitForCompletion(_until)) {
+    if (!_lane->waitForJoin(L_, _until)) {
-        raise_luaL_error(L_, "INTERNAL ERROR: Failed to join");
+        // in that case, should have pushed nil, "timeout"
+        STACK_CHECK(L_, 2);
+        return 2;
    }
+    STACK_CHECK(L_, 0);                                                                            // L_: lane
+    // Thread is Done/Error/Cancelled; the Lane thread isn't working with it, therefore we can.
-    // make sure results are stored
    int const _stored{ _lane->storeResults(L_) };
    if (_key > _stored) {
        // get nil if indexing beyond the actual returned value count
@@ -276,6 +220,7 @@ static int lane_index_number(lua_State* L_)
    } else {
        _lane->pushIndexedResult(L_, _key);                                                        // L_: lane result
    }
    return 1;
 }
@@ -292,13 +237,13 @@ static int lane_index_string(lua_State* L_)
    Lane* const _lane{ ToLane(L_, kIdxSelf) };
    LUA_ASSERT(L_, lua_gettop(L_) == 2);                                                           // L_: lane "key"
-    std::string_view const _keystr{ luaG_tostring(L_, kIdxKey) };
+    std::string_view const _keystr{ luaW_tostring(L_, kIdxKey) };
    lua_settop(L_, 2); // keep only our original arguments on the stack
    // look in metatable first
    lua_getmetatable(L_, kIdxSelf);                                                                // L_: lane "key" mt
    lua_replace(L_, -3);                                                                           // L_: mt "key"
-    if (luaG_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) { // found something?                   // L_: mt value
+    if (luaW_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) { // found something?                   // L_: mt value
        return 1; // done
    }
@@ -324,7 +269,7 @@ static LUAG_FUNC(lane_index)
    Lane* const _lane{ ToLane(L_, kIdxSelf) };
    LUA_ASSERT(L_, lua_gettop(L_) == 2);
-    switch (luaG_type(L_, kKey)) {
+    switch (luaW_type(L_, kKey)) {
    case LuaType::NUMBER:
        return lane_index_number(L_); // stack modification is undefined, returned value is at the top
@@ -334,19 +279,19 @@ static LUAG_FUNC(lane_index)
    default: // unknown key
        lua_getmetatable(L_, kIdxSelf);                                                            // L_: mt
        kCachedError.pushKey(L_);                                                                  // L_: mt kCachedError
-        if (luaG_rawget(L_, StackIndex{ -2 }) != LuaType::FUNCTION) {                              // L_: mt error()
+        if (luaW_rawget(L_, StackIndex{ -2 }) != LuaType::FUNCTION) {                              // L_: mt error()
-            raise_luaL_error(L_, "INTERNAL ERROR: cached error() is a %s, not a function", luaG_typename(L_, kIdxTop).data());
+            raise_luaL_error(L_, "INTERNAL ERROR: cached error() is a %s, not a function", luaW_typename(L_, kIdxTop).data());
        }
-        luaG_pushstring(L_, "Unknown key: ");                                                      // L_: mt error() "Unknown key: "
+        luaW_pushstring(L_, "Unknown key: ");                                                      // L_: mt error() "Unknown key: "
        kCachedTostring.pushKey(L_);                                                               // L_: mt error() "Unknown key: " kCachedTostring
-        if (luaG_rawget(L_, StackIndex{ -4 }) != LuaType::FUNCTION) {                              // L_: mt error() "Unknown key: " tostring()
+        if (luaW_rawget(L_, StackIndex{ -4 }) != LuaType::FUNCTION) {                              // L_: mt error() "Unknown key: " tostring()
-            raise_luaL_error(L_, "INTERNAL ERROR: cached tostring() is a %s, not a function", luaG_typename(L_, kIdxTop).data());
+            raise_luaL_error(L_, "INTERNAL ERROR: cached tostring() is a %s, not a function", luaW_typename(L_, kIdxTop).data());
        }
        lua_pushvalue(L_, kKey);                                                                   // L_: mt error() "Unknown key: " tostring() k
        lua_call(L_, 1, 1);                                                                        // L_: mt error() "Unknown key: " "k"
        lua_concat(L_, 2);                                                                         // L_: mt error() "Unknown key: <k>"
        lua_call(L_, 1, 0); // error( "Unknown key: " .. key) -> doesn't return                    // L_: mt
-        raise_luaL_error(L_, "%s[%s]: should not get here!", _lane->getDebugName().data(), luaG_typename(L_, kKey).data());
+        raise_luaL_error(L_, "%s[%s]: should not get here!", _lane->getDebugName().data(), luaW_typename(L_, kKey).data());
    }
 }
@@ -437,7 +382,7 @@ int Lane::LuaErrorHandler(lua_State* L_)
    // table of { "sourcefile.lua:<line>", ... }
    //
    lua_newtable(L_);                                                                              // L_: some_error {}
-    StackIndex const kIdxTraceTbl{ luaG_absindex(L_, kIdxTop) };
+    StackIndex const kIdxTraceTbl{ luaW_absindex(L_, kIdxTop) };
    // Best to start from level 1, but in some cases it might be a C function
    // and we don't get '.currentline' for that. It's okay - just keep level
@@ -448,25 +393,25 @@ int Lane::LuaErrorHandler(lua_State* L_)
        lua_getinfo(L_, _extended ? "Sln" : "Sl", &_ar);
        if (_extended) {
            lua_newtable(L_);                                                                      // L_: some_error {} {}
-            StackIndex const kIdxFrameTbl{ luaG_absindex(L_, kIdxTop) };
+            StackIndex const kIdxFrameTbl{ luaW_absindex(L_, kIdxTop) };
            lua_pushstring(L_, _ar.source);                                                        // L_: some_error {} {} source
-            luaG_setfield(L_, kIdxFrameTbl, std::string_view{ "source" });                         // L_: some_error {} {}
+            luaW_setfield(L_, kIdxFrameTbl, std::string_view{ "source" });                         // L_: some_error {} {}
            lua_pushinteger(L_, _ar.currentline);                                                  // L_: some_error {} {} currentline
-            luaG_setfield(L_, kIdxFrameTbl, std::string_view{ "currentline" });                    // L_: some_error {} {}
+            luaW_setfield(L_, kIdxFrameTbl, std::string_view{ "currentline" });                    // L_: some_error {} {}
            lua_pushstring(L_, _ar.name ? _ar.name : "<?>");                                       // L_: some_error {} {} name
-            luaG_setfield(L_, kIdxFrameTbl, std::string_view{ "name" });                           // L_: some_error {} {}
+            luaW_setfield(L_, kIdxFrameTbl, std::string_view{ "name" });                           // L_: some_error {} {}
            lua_pushstring(L_, _ar.namewhat);                                                      // L_: some_error {} {} namewhat
-            luaG_setfield(L_, kIdxFrameTbl, std::string_view{ "namewhat" });                       // L_: some_error {} {}
+            luaW_setfield(L_, kIdxFrameTbl, std::string_view{ "namewhat" });                       // L_: some_error {} {}
            lua_pushstring(L_, _ar.what);                                                          // L_: some_error {} {} what
-            luaG_setfield(L_, kIdxFrameTbl, std::string_view{ "what" });                           // L_: some_error {} {}
+            luaW_setfield(L_, kIdxFrameTbl, std::string_view{ "what" });                           // L_: some_error {} {}
        } else if (_ar.currentline > 0) {
-            luaG_pushstring(L_, "%s:%d", _ar.short_src, _ar.currentline);                          // L_: some_error {} "blah:blah"
+            luaW_pushstring(L_, "%s:%d", _ar.short_src, _ar.currentline);                          // L_: some_error {} "blah:blah"
        } else {
-            luaG_pushstring(L_, "%s:?", _ar.short_src);                                            // L_: some_error {} "blah"
+            luaW_pushstring(L_, "%s:?", _ar.short_src);                                            // L_: some_error {} "blah"
        }
        lua_rawseti(L_, kIdxTraceTbl, static_cast<lua_Integer>(_n));                               // L_: some_error {}
    }
@@ -489,6 +434,7 @@ static int PushStackTrace(lua_State* const L_, Lane::ErrorTraceLevel const error
    StackIndex const _top{ lua_gettop(L_) };
    switch (rc_) {
    case LuaError::OK: // no error, body return values are on the stack
+    case LuaError::YIELD:
        break;
    case LuaError::ERRRUN: // cancellation or a runtime error
@@ -502,7 +448,7 @@ static int PushStackTrace(lua_State* const L_, Lane::ErrorTraceLevel const error
            // For cancellation the error message is kCancelError, and a stack trace isn't placed
            // For other errors, the message can be whatever was thrown, and we should have a stack trace table
-            LUA_ASSERT(L_, luaG_type(L_, StackIndex{ 1 + stk_base_ }) == (kCancelError.equals(L_, stk_base_) ? LuaType::NIL : LuaType::TABLE));
+            LUA_ASSERT(L_, luaW_type(L_, StackIndex{ 1 + stk_base_ }) == (kCancelError.equals(L_, stk_base_) ? LuaType::NIL : LuaType::TABLE));
            // Just leaving the stack trace table on the stack is enough to get it through to the master.
        } else {
            // any kind of error can be thrown with error(), or through a lane/linda cancellation
@@ -514,7 +460,7 @@ static int PushStackTrace(lua_State* const L_, Lane::ErrorTraceLevel const error
    case LuaError::ERRERR: // error while running the error handler (if any, for example an out-of-memory condition)
    default:
        // the Lua core provides a string error message in those situations
-        LUA_ASSERT(L_, (lua_gettop(L_) == stk_base_) && (luaG_type(L_, stk_base_) == LuaType::STRING));
+        LUA_ASSERT(L_, (lua_gettop(L_) == stk_base_) && (luaW_type(L_, stk_base_) == LuaType::STRING));
        break;
    }
    return lua_gettop(L_) - _top; // either 0 or 1
@@ -563,7 +509,7 @@ static LuaError run_finalizers(Lane* const lane_, Lane::ErrorTraceLevel const er
        LUA_ASSERT(_L, lua_isfunction(_L, -1));
        if (lua_rc_ != LuaError::OK) { // we have <error>, [trace] on the thread stack
            LUA_ASSERT(_L, lane_->nresults == 1 || lane_->nresults == 2);
-            //std::string_view const _err_msg{ luaG_tostring(_L, 1) };
+            //std::string_view const _err_msg{ luaW_tostring(_L, 1) };
            if (lane_->isCoroutine()) {
                // transfer them on the main state
                lua_pushvalue(lane_->L, 1);
@@ -615,7 +561,7 @@ static LuaError run_finalizers(Lane* const lane_, Lane::ErrorTraceLevel const er
    if (lane_->isCoroutine()) {
        // only the coroutine thread should remain on the master state when we are done
-        LUA_ASSERT(_L, lua_gettop(_L) == 1 && luaG_type(_L, StackIndex{ 1 }) == LuaType::THREAD);
+        LUA_ASSERT(_L, lua_gettop(_L) == 1 && luaW_type(_L, StackIndex{ 1 }) == LuaType::THREAD);
    }
    return _rc;
@@ -711,7 +657,7 @@ static void lane_main(Lane* const lane_)
    LuaError _rc{ LuaError::ERRRUN };
    if (lane_->status.load(std::memory_order_acquire) == Lane::Pending) { // nothing wrong happened during preparation, we can work
        // At this point, the lane function and arguments are on the stack, possibly preceded by the error handler
-        int const _errorHandlerCount{ lane_->errorHandlerCount() };
+        int const _errorHandlerCount{ lane_->errorHandlerCount() }; // no error handler for coroutines, ever.
        int _nargs{ lua_gettop(_L) - 1 - _errorHandlerCount };
        {
            std::unique_lock _guard{ lane_->doneMutex };
@@ -724,27 +670,60 @@ static void lane_main(Lane* const lane_)
            lane_->nresults = lua_gettop(_L) - _errorHandlerCount;
        } else {
            // S and L are different: we run as a coroutine in Lua thread L created in state S
+            bool _shouldClose{ false };
            do {
                // starting with Lua 5.4, lua_resume can leave more stuff on the stack below the actual yielded values.
                // that's why we have lane_->nresults
-                _rc = luaG_resume(_L, nullptr, _nargs, &lane_->nresults);                          // L: eh? ... retvals|err...
+                _rc = luaW_resume(_L, nullptr, _nargs, &lane_->nresults);                          // L: ... retvals|err...
                if (_rc == LuaError::YIELD) {
-                    // change our status to suspended, and wait until someone wants us to resume
-                    std::unique_lock _guard{ lane_->doneMutex };
-                    lane_->status.store(Lane::Suspended, std::memory_order_release); // Running -> Suspended
-                    lane_->doneCondVar.notify_one();
-                    // wait until the user wants us to resume
-                    // TODO: do I update waiting_on or not, so that the lane can be woken by cancellation requests here?
-                    // lane_->waiting_on = &lane_->doneCondVar;
-                    lane_->doneCondVar.wait(_guard, [lane_]() { return lane_->status.load(std::memory_order_acquire) == Lane::Resuming; });
-                    // here lane_->doneMutex is locked again
-                    // lane_->waiting_on = nullptr;
-                    lane_->status.store(Lane::Running, std::memory_order_release); // Resuming -> Running
                    // on the stack we find the values pushed by lane:resume()
                    _nargs = lua_gettop(_L);
+                    if (std::unique_lock _guard{ lane_->doneMutex }; true) {
+                        // change our status to suspended, and wait until someone wants us to resume
+                        lane_->status.store(Lane::Suspended, std::memory_order_release); // Running -> Suspended
+                        lane_->doneCondVar.notify_one();
+                        // wait until the user wants us to resume
+                        // update waiting_on, so that the lane can be woken by cancellation requests here
+                        lane_->waiting_on = &lane_->doneCondVar;
+                        lane_->doneCondVar.wait(_guard,
+                            [lane_,&_shouldClose]()
+                            {
+                                auto const _status{ lane_->status.load(std::memory_order_acquire) };
+                                // wait interrupted because of a cancellation or join request means we have to abort the resume loop
+                                _shouldClose = (_status == Lane::Closing);
+                                return _shouldClose || (_status == Lane::Resuming) || (lane_->cancelRequest.load(std::memory_order_relaxed) != CancelRequest::None);
+                            }
+                        );
+                        // here lane_->doneMutex is locked again
+                        lane_->waiting_on = nullptr;
+                        lane_->status.store(Lane::Running, std::memory_order_release); // Resuming -> Running
+                    }
+                } else {
+                    _shouldClose = true;
                }
-            } while (_rc == LuaError::YIELD);
+            } while (!_shouldClose);
-            if (_rc != LuaError::OK) {                                                             // : err...
+            if (_rc == LuaError::YIELD) {
+#if LUA_VERSION_NUM >= 504
+                lua_State* const _S{ lane_->S };
+                STACK_CHECK_START_REL(_S, 0);
+                // lua_closethread cleans the stack, meaning we lose the yielded values! -> store
+                lua_xmove(_L, _S, lane_->nresults);
+                // lane is cancelled before completion (for example at Lanes shutdown), close everything
+                _rc = static_cast<LuaError>(lua_closethread(_L, nullptr));                         // L: ... retvals|err <close_err>
+                // then restore the yielded values
+                if (_rc == LuaError::OK) {
+                    lua_xmove(_S, _L, lane_->nresults);
+                } else {
+                    lua_pop(_S, lane_->nresults);
+                }
+                STACK_CHECK(_S, 0);
+#else // LUA_VERSION_NUM
+                // Lua prior to 5.4 do not have lua_closethread.
+                _rc = LuaError::OK;
+#endif // LUA_VERSION_NUM
+            }
+            if (_rc != LuaError::OK) { // an error occurred                                        // L: err...
                // for some reason, in my tests with Lua 5.4, when the coroutine raises an error, I have 3 copies of it on the stack
                // or false + the error message when running Lua 5.1
                // since the rest of our code wants only the error message, let us keep only the latter.
@@ -769,7 +748,7 @@ static void lane_main(Lane* const lane_)
        // in case of error and if it exists, fetch stack trace from registry and push it
        lane_->nresults += PushStackTrace(_L, lane_->errorTraceLevel, _rc, StackIndex{ 1 });       // L: retvals|error [trace]
-        DEBUGSPEW_CODE(DebugSpew(lane_->U) << "Lane " << _L << " body: " << GetErrcodeName(_rc) << " (" << (kCancelError.equals(_L, StackIndex{ 1 }) ? "cancelled" : luaG_typename(_L, StackIndex{ 1 })) << ")" << std::endl);
+        DEBUGSPEW_CODE(DebugSpew(lane_->U) << "Lane " << _L << " body: " << GetErrcodeName(_rc) << " (" << (kCancelError.equals(_L, StackIndex{ 1 }) ? "cancelled" : luaW_typename(_L, StackIndex{ 1 })) << ")" << std::endl);
        // Call finalizers, if the script has set them up.
        // If the lane is not a coroutine, there is only a regular state, so everything is the same whether we use S or L.
        // If the lane is a coroutine, this has to be done from the master state (S), not the thread (L), because we can't lua_pcall in a thread state
@@ -783,10 +762,12 @@ static void lane_main(Lane* const lane_)
        if (lane_->selfdestructRemove()) { // check and remove (under lock!)
            // We're a free-running thread and no-one is there to clean us up.
            lane_->closeState();
-            lane_->U->selfdestructMutex.lock();
-            // done with lua_close(), terminal shutdown sequence may proceed
+            // let's try not to crash if the lane didn't terminate gracefully and the Universe met its end
-            lane_->U->selfdestructingCount.fetch_sub(1, std::memory_order_release);
+            if (!lane_->flaggedAfterUniverseGC.load(std::memory_order_relaxed)) {
-            lane_->U->selfdestructMutex.unlock();
+                // done with lua_close(), terminal shutdown sequence may proceed
+                lane_->U->selfdestructingCount.fetch_sub(1, std::memory_order_release);
+            }
            // we destroy ourselves, therefore our thread member too, from inside the thread body
            // detach so that we don't try to join, as this doesn't seem a good idea
@@ -807,6 +788,8 @@ static void lane_main(Lane* const lane_)
 // #################################################################################################
 #if LUA_VERSION_NUM >= 504
+// __close(lane_ud, <err>)
 static LUAG_FUNC(lane_close)
 {
    [[maybe_unused]] Lane* const _lane{ ToLane(L_, StackIndex{ 1 }) };                             // L_: lane err|nil
@@ -814,12 +797,13 @@ static LUAG_FUNC(lane_close)
    lua_settop(L_, 1);                                                                             // L_: lane
    // no error if the lane body doesn't return a non-nil first value
-    luaG_pushstring(L_, "close");                                                                  // L_: lane "close"
+    luaW_pushstring(L_, "close");                                                                  // L_: lane "close"
    lua_pushcclosure(L_, LG_lane_join, 1);                                                         // L_: lane join()
    lua_insert(L_, 1);                                                                             // L_: join() lane
    lua_call(L_, 1, LUA_MULTRET);                                                                  // L_: join() results
    return lua_gettop(L_);
 }
 #endif // LUA_VERSION_NUM >= 504
 // #################################################################################################
@@ -843,9 +827,9 @@ static LUAG_FUNC(lane_gc)
    // if there a gc callback?
    lua_getiuservalue(L_, StackIndex{ 1 }, UserValueIndex{ 1 });                                   // L_: ud uservalue
    kLaneGC.pushKey(L_);                                                                           // L_: ud uservalue __gc
-    if (luaG_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) {                                       // L_: ud uservalue gc_cb|nil
+    if (luaW_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) {                                       // L_: ud uservalue gc_cb|nil
        lua_remove(L_, -2);                                                                        // L_: ud gc_cb|nil
-        luaG_pushstring(L_, _lane->getDebugName());                                                // L_: ud gc_cb name
+        luaW_pushstring(L_, _lane->getDebugName());                                                // L_: ud gc_cb name
        _have_gc_cb = true;
    } else {
        lua_pop(L_, 2);                                                                            // L_: ud
@@ -856,7 +840,7 @@ static LUAG_FUNC(lane_gc)
        // still running: will have to be cleaned up later
        _lane->selfdestructAdd();
        if (_have_gc_cb) {
-            luaG_pushstring(L_, "selfdestruct");                                                   // L_: ud gc_cb name status
+            luaW_pushstring(L_, "selfdestruct");                                                   // L_: ud gc_cb name status
            lua_call(L_, 2, 0);                                                                    // L_: ud
        }
        return 0;
@@ -871,7 +855,7 @@ static LUAG_FUNC(lane_gc)
    // do this after lane cleanup in case the callback triggers an error
    if (_have_gc_cb) {
-        luaG_pushstring(L_, "closed");                                                             // L_: ud gc_cb name status
+        luaW_pushstring(L_, "closed");                                                             // L_: ud gc_cb name status
        lua_call(L_, 2, 0);                                                                        // L_: ud
    }
    return 0;
@@ -916,7 +900,7 @@ void Lane::applyDebugName() const
 {
    if constexpr (HAVE_DECODA_SUPPORT()) {
        // to see VM name in Decoda debugger Virtual Machine window
-        luaG_pushstring(L, debugName);                                                             // L: ... "name"
+        luaW_pushstring(L, debugName);                                                             // L: ... "name"
        lua_setglobal(L, "decoda_name");                                                           // L: ...
    }
    // and finally set the OS thread name
@@ -941,7 +925,8 @@ CancelResult Lane::cancel(CancelOp const op_, std::chrono::time_point<std::chron
    // remember that lanes are not transferable: only one thread can cancel a lane, so no multithreading issue here
    // We can read status without locks, but not wait for it (if Posix no PTHREAD_TIMEDJOIN)
-    if (status.load(std::memory_order_acquire) >= Lane::Done) {
+    auto const _status{ status.load(std::memory_order_acquire) };
+    if (_status == Lane::Done || _status == Lane::Error || _status == Lane::Cancelled) {
        // say "ok" by default, including when lane is already done
        return CancelResult::Cancelled;
    }
@@ -968,14 +953,15 @@ CancelResult Lane::internalCancel(CancelRequest const rq_, std::chrono::time_poi
        // lane_->thread.get_stop_source().request_stop();
    }
    if (wakeLane_ == WakeLane::Yes) { // wake the thread so that execution returns from any pending linda operation if desired
-        if (status.load(std::memory_order_acquire) == Lane::Waiting) { // waiting_on is updated under control of status acquire/release semantics
+        auto const _status{ status.load(std::memory_order_acquire) };
+        if (_status == Lane::Waiting || _status == Lane::Suspended) { // waiting_on is updated under control of status acquire/release semantics
            if (std::condition_variable* const _waiting_on{ waiting_on }) {
                _waiting_on->notify_all();
            }
        }
    }
    // wait until the lane stops working with its state (either Suspended or Done+)
-    CancelResult const result{ waitForCompletion(until_) ? CancelResult::Cancelled : CancelResult::Timeout };
+    CancelResult const result{ waitForCompletion(until_, false) ? CancelResult::Cancelled : CancelResult::Timeout };
    return result;
 }
@@ -1027,7 +1013,7 @@ void Lane::PushMetatable(lua_State* const L_)
 {
    STACK_CHECK_START_REL(L_, 0);
    if (luaL_newmetatable(L_, kLaneMetatableName.data())) {                                        // L_: mt
-        luaG_registerlibfuncs(L_, local::sLaneFunctions);
+        luaW_registerlibfuncs(L_, local::sLaneFunctions);
        // cache error() and tostring()
        kCachedError.pushKey(L_);                                                                  // L_: mt kCachedError
        lua_getglobal(L_, "error");                                                                // L_: mt kCachedError error()
@@ -1036,7 +1022,7 @@ void Lane::PushMetatable(lua_State* const L_)
        lua_getglobal(L_, "tostring");                                                             // L_: mt kCachedTostring tostring()
        lua_rawset(L_, -3);                                                                        // L_: mt
        // hide the actual metatable from getmetatable()
-        luaG_pushstring(L_, kLaneMetatableName);                                                   // L_: mt "Lane"
+        luaW_pushstring(L_, kLaneMetatableName);                                                   // L_: mt "Lane"
        lua_setfield(L_, -2, "__metatable");                                                       // L_: mt
    }
    STACK_CHECK(L_, 1);
@@ -1049,7 +1035,7 @@ void Lane::pushStatusString(lua_State* const L_) const
    std::string_view const _str{ threadStatusString() };
    LUA_ASSERT(L_, !_str.empty());
-    luaG_pushstring(L_, _str);
+    luaW_pushstring(L_, _str);
 }
 // #################################################################################################
@@ -1108,12 +1094,88 @@ void Lane::pushIndexedResult(lua_State* const L_, int const key_) const
 // #################################################################################################
 [[nodiscard]]
+int Lane::pushStoredResults(lua_State* const L_) const
+{
+    STACK_CHECK_START_ABS(L_, 1); // should only have the lane UD on the stack
+    static constexpr StackIndex kIdxSelf{ 1 };
+    static constexpr UserValueIndex kUvResults{ 1 };
+    LUA_ASSERT(L_, ToLane(L_, kIdxSelf) == this);                                                  // L_: lane
+    lua_getiuservalue(L_, kIdxSelf, kUvResults);                                                   // L_: lane {uv}
+    lua_rawgeti(L_, kIdxTop, 0);                                                                   // L_: lane {uv} stored
+    int const _stored{ static_cast<int>(lua_tointeger(L_, kIdxTop)) };
+    lua_pop(L_, 1);                                                                                // L_: lane {uv}
+    int _ret{};
+    STACK_GROW(L_, std::max(3, _stored + 1));
+    switch (status.load(std::memory_order_acquire)) {
+    case Lane::Suspended:
+        raise_luaL_error(L_, "INTERNAL ERROR: SHOULD NEVER BE SUSPENDED HERE");
+        break;
+    case Lane::Done: // got regular return values
+        if (_stored > 0) {
+            for (int _i = 2; _i <= _stored; ++_i) {
+                lua_rawgeti(L_, 2, _i);                                                            // L_: lane {uv} results2...N
+            }
+            lua_rawgeti(L_, 2, 1);                                                                 // L_: lane {uv} results2...N result1
+            lua_replace(L_, 2);                                                                    // L_: lane results
+        } else {
+            lua_pop(L_, 1);                                                                        // L_: lane
+        }
+        // we precede the lane body returned values with boolean true
+        lua_pushboolean(L_, 1);                                                                    // L_: lane results true
+        lua_replace(L_, 1);                                                                        // L_: true results
+        _ret = _stored + 1;
+        STACK_CHECK(L_, _ret);
+        break;
+    case Lane::Error:
+        {
+            LUA_ASSERT(L_, _stored == 2 || _stored == 3); // contains nil error [trace]
+            lua_rawgeti(L_, 2, 2);                                                                 // L_: lane {uv} <error>
+            lua_rawgeti(L_, 2, 3);                                                                 // L_: lane {uv} <error> <trace>|nil
+            if (lua_isnil(L_, -1)) {
+                lua_replace(L_, 2);                                                                // L_: lane nil <error>
+            } else {
+                lua_rawgeti(L_, 2, 1);                                                             // L_: lane {uv} <error> <trace> nil
+                lua_replace(L_, 2);                                                                // L_: lane nil <error> <trace>
+            }
+            _ret = _stored; // 2 or 3
+            STACK_CHECK(L_, _ret + 1); // stack still contains the lane UD below
+        }
+        break;
+    case Lane::Cancelled:
+        {
+            LUA_ASSERT(L_, _stored == 2);
+            lua_rawgeti(L_, 2, 2);                                                                 // L_: lane {uv} cancel_error
+            lua_rawgeti(L_, 2, 1);                                                                 // L_: lane {uv} cancel_error nil
+            lua_replace(L_, -3);                                                                   // L_: lane nil cancel_error
+            LUA_ASSERT(L_, lua_isnil(L_, -2) && kCancelError.equals(L_, kIdxTop));
+            _ret = 2;
+            STACK_CHECK(L_, _ret + 1); // stack still contains the lane UD below
+        }
+        break;
+    default:
+        DEBUGSPEW_CODE(DebugSpew(nullptr) << "Unknown Lane status: " << static_cast<int>(_lane->status.load(std::memory_order_relaxed)) << std::endl);
+        LUA_ASSERT(L_, false);
+        _ret = 0;
+        STACK_CHECK(L_, _ret);
+    }
+    LUA_ASSERT(L_, lua_gettop(L_) >= _ret);
+    return _ret;
+}
+// #################################################################################################
+[[nodiscard]]
 std::string_view Lane::pushErrorTraceLevel(lua_State* L_) const
 {
    std::string_view const _str{ errorTraceLevelString() };
    LUA_ASSERT(L_, !_str.empty());
-    return luaG_pushstring(L_, _str);
+    return luaW_pushstring(L_, _str);
 }
 // #################################################################################################
@@ -1124,7 +1186,7 @@ void Lane::resetResultsStorage(lua_State* const L_, StackIndex const self_idx_)
 {
    STACK_GROW(L_, 4);
    STACK_CHECK_START_REL(L_, 0);
-    StackIndex const _self_idx{ luaG_absindex(L_, self_idx_) };
+    StackIndex const _self_idx{ luaW_absindex(L_, self_idx_) };
    LUA_ASSERT(L_, ToLane(L_, _self_idx) == this);                                                 // L_: ... self ...
    // create the new table
    lua_newtable(L_);                                                                              // L_: ... self ... {}
@@ -1158,7 +1220,7 @@ void Lane::securizeDebugName(lua_State* const L_)
    lua_newtable(L_);                                                                              // L_: lane ... {uv} {}
    {
        std::lock_guard<std::mutex> _guard{ debugNameMutex };
-        debugName = luaG_pushstring(L_, debugName);                                                // L_: lane ... {uv} {} name
+        debugName = luaW_pushstring(L_, debugName);                                                // L_: lane ... {uv} {} name
    }
    lua_rawset(L_, -3);                                                                            // L_: lane ... {uv}
    lua_pop(L_, 1);                                                                                // L_: lane
@@ -1167,11 +1229,11 @@ void Lane::securizeDebugName(lua_State* const L_)
 // #################################################################################################
-void Lane::startThread(int const priority_)
+void Lane::startThread(lua_State* const L_, int const priority_, NativePrioFlag native_)
 {
    thread = std::thread([this]() { lane_main(this); });
    if (priority_ != kThreadPrioDefault) {
-        THREAD_SET_PRIORITY(thread, priority_, U->sudo);
+        THREAD_SET_PRIORITY(L_, thread, priority_, native_, U->sudo);
    }
 }
@@ -1181,13 +1243,13 @@ void Lane::storeDebugName(std::string_view const& name_)
 {
    STACK_CHECK_START_REL(L, 0);
    // store a hidden reference in the registry to make sure the string is kept around even if a lane decides to manually change the "decoda_name" global...
-    kLaneNameRegKey.setValue(L, [name = name_](lua_State* L_) { luaG_pushstring(L_, name); });
+    kLaneNameRegKey.setValue(L, [name = name_](lua_State* L_) { luaW_pushstring(L_, name); });
    STACK_CHECK(L, 0);
    kLaneNameRegKey.pushValue(L);                                                                       // L: ... "name" ...
    // keep a direct view on the stored string
    {
        std::lock_guard<std::mutex> _guard{ debugNameMutex };
-        debugName = luaG_tostring(L, kIdxTop);
+        debugName = luaW_tostring(L, kIdxTop);
    }
    lua_pop(L, 1);
    STACK_CHECK(L, 0);
@@ -1207,20 +1269,21 @@ int Lane::storeResults(lua_State* const L_)
    lua_getiuservalue(L_, kIdxSelf, UserValueIndex{ 1 });                                          // L_: lane ... {uv}
    StackIndex const _tidx{ lua_gettop(L_) };
-    int _stored{};
+    // if the results were already stored from a previous indexing, just say how many values we have in store
-    if (nresults == 0) {
+    if (!L) {
        lua_rawgeti(L_, -1, 0);                                                                    // L_: lane ... {uv} nresults
-        _stored = static_cast<int>(lua_tointeger(L_, -1));
+        auto const _stored{ static_cast<int>(lua_tointeger(L_, -1)) };
        lua_pop(L_, 2);
        STACK_CHECK(L_, 0);
        return _stored;
    }
+    int _stored{};
    switch (status.load(std::memory_order_acquire)) {
    default:
        // this is an internal error, we probably never get here
        lua_settop(L_, 0);                                                                         // L_:
-        luaG_pushstring(L_, "Unexpected status: ");                                                // L_: "Unexpected status: "
+        luaW_pushstring(L_, "Unexpected status: ");                                                // L_: "Unexpected status: "
        pushStatusString(L_);                                                                      // L_: "Unexpected status: " "<status>"
        lua_concat(L_, 2);                                                                         // L_: "Unexpected status: <status>"
        raise_lua_error(L_);
@@ -1295,12 +1358,13 @@ int Lane::storeResults(lua_State* const L_)
 //---
 // str= thread_status( lane )
 //
-// "pending" -> | ("running" <-> "waiting") <-> "suspended" <-> "resuming" | -> "done"/"error"/"cancelled"
+// "pending" -> | ("running" <-> "waiting") <-> "suspended" <-> "resuming/closing" | -> "done"/"error"/"cancelled"
 // "pending"   not started yet
 // "running"   started, doing its work..
 // "suspended" returned from a lua_resume
 // "resuming"  told by its parent state to resume
+// "closing"   not observable from the outside: happens only inside a join()/indexation call to unblock a suspended coroutine Lane so that it can join properly
 // "waiting"   blocked in a send()/receive()
 // "done"      finished, results are there
 // "error"     finished at an error, error value is there
@@ -1311,7 +1375,7 @@ std::string_view Lane::threadStatusString() const
 {
    static constexpr std::string_view kStrs[] = {
        "pending",
-        "running", "suspended", "resuming",
+        "running", "suspended", "resuming", "closing",
        "waiting",
        "done", "error", "cancelled"
    };
@@ -1319,12 +1383,13 @@ std::string_view Lane::threadStatusString() const
    static_assert(1 == static_cast<std::underlying_type_t<Lane::Status>>(Running));
    static_assert(2 == static_cast<std::underlying_type_t<Lane::Status>>(Suspended));
    static_assert(3 == static_cast<std::underlying_type_t<Lane::Status>>(Resuming));
-    static_assert(4 == static_cast<std::underlying_type_t<Lane::Status>>(Waiting));
+    static_assert(4 == static_cast<std::underlying_type_t<Lane::Status>>(Closing));
-    static_assert(5 == static_cast<std::underlying_type_t<Lane::Status>>(Done));
+    static_assert(5 == static_cast<std::underlying_type_t<Lane::Status>>(Waiting));
-    static_assert(6 == static_cast<std::underlying_type_t<Lane::Status>>(Error));
+    static_assert(6 == static_cast<std::underlying_type_t<Lane::Status>>(Done));
-    static_assert(7 == static_cast<std::underlying_type_t<Lane::Status>>(Cancelled));
+    static_assert(7 == static_cast<std::underlying_type_t<Lane::Status>>(Error));
+    static_assert(8 == static_cast<std::underlying_type_t<Lane::Status>>(Cancelled));
    auto const _status{ static_cast<std::underlying_type_t<Lane::Status>>(status.load(std::memory_order_acquire)) };
-    if (_status < 0 || _status > 7) { // should never happen, but better safe than sorry
+    if (_status < 0 || _status > 8) { // should never happen, but better safe than sorry
        return "";
    }
    return kStrs[_status];
@@ -1332,17 +1397,52 @@ std::string_view Lane::threadStatusString() const
 // #################################################################################################
-bool Lane::waitForCompletion(std::chrono::time_point<std::chrono::steady_clock> until_)
+bool Lane::waitForCompletion(std::chrono::time_point<std::chrono::steady_clock> until_, bool const _acceptSuspended)
 {
    std::unique_lock _guard{ doneMutex };
    // std::stop_token token{ thread.get_stop_token() };
    // return doneCondVar.wait_until(lock, token, secs_, [this](){ return status >= Lane::Done; });
-    // wait until the lane stops working with its state (either Suspended or Done+)
+    // wait until the lane exits lane_main (which is the only place where status can become one of the 3 tested values)
-    return doneCondVar.wait_until(_guard, until_, [this]()
+    return doneCondVar.wait_until(_guard, until_, [this, suspended = _acceptSuspended ? Lane::Suspended : Lane::Done]() {
+        auto const _status{ status.load(std::memory_order_acquire) };
+        return _status == Lane::Done || _status == Lane::Error || _status == Lane::Cancelled || _status == suspended;
+    });
+}
+// #################################################################################################
+[[nodiscard]]
+bool Lane::waitForJoin(lua_State* const L_, std::chrono::time_point<std::chrono::steady_clock> until_)
+{
+    // wait until suspended or done
+    {
+        bool const _done{ !thread.joinable() || waitForCompletion(until_, true) };
+        if (!_done) {
+            lua_pushnil(L_);                                                                       // L_: lane nil
+            luaW_pushstring(L_, "timeout");                                                        // L_: lane nil "timeout"
+            return false;
+        }
+    }
+    // if lane is suspended, force the yield loop to break, and the termination of the thread
+    if (status.load(std::memory_order_acquire) == Lane::Suspended) {
+        LUA_ASSERT(L_, waiting_on == &doneCondVar);
+        status.store(Lane::Closing, std::memory_order_release);
+        doneCondVar.notify_all();
+        // wait until done
        {
-            auto const _status{ status.load(std::memory_order_acquire) };
+            bool const _done{ !thread.joinable() || waitForCompletion(until_, true) };
-            return _status == Lane::Suspended || _status >= Lane::Done;
+            if (!_done) {
+                lua_pushnil(L_);                                                                   // L_: lane nil
+                luaW_pushstring(L_, "timeout");                                                    // L_: lane nil "timeout"
+                return false;
+            }
        }
-    );
+        LUA_ASSERT(L_, status.load(std::memory_order_acquire) != Lane::Closing);
+    }
+    LUA_ASSERT(L_, status.load(std::memory_order_acquire) != Lane::Suspended);
+    return true;
 }
diff --git a/src/lane.hpp b/src/lane.hpp
index 5fe36b6..bd328b1 100644
--- a/src/lane.hpp
+++ b/src/lane.hpp
@@ -56,6 +56,7 @@ class Lane final
    /*
      Pending: The Lua VM hasn't done anything yet.
      Resuming: The user requested the lane to resume execution from Suspended state.
+      Closing: The user is joining the lane, specifically interrupting a suspended Lane.
      Suspended: returned from lua_resume, waiting for the client to request a lua_resume.
      Running, Suspended, Waiting: Thread is inside the Lua VM.
      Done, Error, Cancelled: Thread execution is outside the Lua VM. It can be lua_close()d.
@@ -66,6 +67,7 @@ class Lane final
        Running,
        Suspended,
        Resuming,
+        Closing,
        Waiting,
        Done,
        Error,
@@ -199,12 +201,14 @@ class Lane final
    static void PushMetatable(lua_State* L_);
    void pushStatusString(lua_State* L_) const;
    void pushIndexedResult(lua_State* L_, int key_) const;
+    [[nodiscard]]
+    int pushStoredResults(lua_State* L_) const;
    void resetResultsStorage(lua_State* L_, StackIndex self_idx_);
    void selfdestructAdd();
    [[nodiscard]]
    bool selfdestructRemove();
    void securizeDebugName(lua_State* L_);
-    void startThread(int priority_);
+    void startThread(lua_State* L_, int priority_, NativePrioFlag native_);
    void storeDebugName( std::string_view const& name_);
    [[nodiscard]]
    int storeResults(lua_State* L_);
@@ -212,7 +216,9 @@ class Lane final
    std::string_view threadStatusString() const;
    // wait until the lane stops working with its state (either Suspended or Done+)
    [[nodiscard]]
-    bool waitForCompletion(std::chrono::time_point<std::chrono::steady_clock> until_);
+    bool waitForCompletion(std::chrono::time_point<std::chrono::steady_clock> until_, bool const _acceptSuspended);
+    [[nodiscard]]
+    bool waitForJoin(lua_State* _L, std::chrono::time_point<std::chrono::steady_clock> until_);
 };
 // #################################################################################################
diff --git a/src/lanes.cpp b/src/lanes.cpp
index d1a353b..4373aee 100644
--- a/src/lanes.cpp
+++ b/src/lanes.cpp
@@ -137,13 +137,15 @@ LUAG_FUNC(set_singlethreaded)
 LUAG_FUNC(set_thread_priority)
 {
    lua_Integer const _prio{ luaL_checkinteger(L_, 1) };
+    NativePrioFlag const _native{ std::string_view{ "native" } == luaL_optstring(L_, 2, "mapped") };
    // public Lanes API accepts a generic range -3/+3
    // that will be remapped into the platform-specific scheduler priority scheme
    // On some platforms, -3 is equivalent to -2 and +3 to +2
-    if (_prio < kThreadPrioMin || _prio > kThreadPrioMax) {
+    if (!_native && (_prio < kThreadPrioMin || _prio > kThreadPrioMax)) {
        raise_luaL_error(L_, "priority out of range: %d..+%d (%d)", kThreadPrioMin, kThreadPrioMax, _prio);
    }
-    THREAD_SET_PRIORITY(static_cast<int>(_prio), Universe::Get(L_)->sudo);
+    THREAD_SET_PRIORITY(L_, static_cast<int>(_prio), _native, Universe::Get(L_)->sudo);
    return 0;
 }
@@ -155,7 +157,8 @@ LUAG_FUNC(set_thread_affinity)
    if (_affinity <= 0) {
        raise_luaL_error(L_, "invalid affinity (%d)", _affinity);
    }
-    THREAD_SET_AFFINITY(static_cast<unsigned int>(_affinity));
+    THREAD_SET_AFFINITY(L_, static_cast<unsigned int>(_affinity));
    return 0;
 }
@@ -170,17 +173,21 @@ LUAG_FUNC(sleep)
    lua_pushcfunction(L_, LG_linda_receive);                                                       // L_: duration|nil receive()
    STACK_CHECK_START_REL(L_, 0); // we pushed the function we intend to call, now prepare the arguments
    _U->timerLinda->push(L_);                                                                      // L_: duration|nil receive() timerLinda
-    if (luaG_tostring(L_, StackIndex{ 1 }) == "indefinitely") {
+    if (luaW_tostring(L_, StackIndex{ 1 }) == "indefinitely") {
        lua_pushnil(L_);                                                                           // L_: duration? receive() timerLinda nil
    } else if (lua_isnoneornil(L_, 1)) {
        lua_pushnumber(L_, 0);                                                                     // L_: duration? receive() timerLinda 0
    } else if (!lua_isnumber(L_, 1)) {
-        raise_luaL_argerror(L_, StackIndex{ 1 }, "invalid duration");
+        raise_luaL_argerror(L_, StackIndex{ 1 }, "duration must be a number");
    }
    else {
+        auto const _n{ lua_tonumber(L_, 1) };
+        if (_n < 0) {
+            raise_luaL_argerror(L_, StackIndex{ 1 }, "duration must be >= 0");
+        }
        lua_pushnumber(L_, lua_tonumber(L_, 1));                                                   // L_: duration? receive() timerLinda duration
    }
-    luaG_pushstring(L_, "ac100de1-a696-4619-b2f0-a26de9d58ab8");                                   // L_: duration? receive() timerLinda duration key
+    luaW_pushstring(L_, "ac100de1-a696-4619-b2f0-a26de9d58ab8");                                   // L_: duration? receive() timerLinda duration key
    STACK_CHECK(L_, 3); // 3 arguments ready
    lua_call(L_, 3, LUA_MULTRET); // timerLinda:receive(duration,key)                              // L_: duration? result...
    return lua_gettop(L_) - 1;
@@ -194,7 +201,7 @@ LUAG_FUNC(sleep)
 // upvalue[1]: _G.require
 LUAG_FUNC(require)
 {
-    std::string_view const _name{ luaG_tostring(L_, StackIndex{ 1 }) };                            // L_: "name" ...
+    std::string_view const _name{ luaW_tostring(L_, StackIndex{ 1 }) };                            // L_: "name" ...
    int const _nargs{ lua_gettop(L_) };
    DEBUGSPEW_CODE(Universe * _U{ Universe::Get(L_) });
    STACK_CHECK_START_REL(L_, 0);
@@ -220,8 +227,8 @@ int lanes_register(lua_State* const L_)
    if (!_U) {
        raise_luaL_error(L_, "Lanes is not ready");
    }
-    std::string_view const _name{ luaG_checkstring(L_, StackIndex{ 1 }) };
+    std::string_view const _name{ luaW_checkstring(L_, StackIndex{ 1 }) };
-    LuaType const _mod_type{ luaG_type(L_, StackIndex{ 2 }) };
+    LuaType const _mod_type{ luaW_type(L_, StackIndex{ 2 }) };
    // ignore extra arguments, just in case
    lua_settop(L_, 2);
    luaL_argcheck(L_, (_mod_type == LuaType::TABLE) || (_mod_type == LuaType::FUNCTION), 2, "unexpected module type");
@@ -236,9 +243,26 @@ int lanes_register(lua_State* const L_)
 // #################################################################################################
+LUAG_FUNC(thread_priority_range)
+{
+    NativePrioFlag const _native{ std::string_view{ "native" } == luaL_optstring(L_, 1, "mapped") };
+    if (_native) {
+        auto const [_prio_min, _prio_max] = THREAD_NATIVE_PRIOS();
+        lua_pushinteger(L_, _prio_min);
+        lua_pushinteger(L_, _prio_max);
+    } else {
+        lua_pushinteger(L_, kThreadPrioMin);
+        lua_pushinteger(L_, kThreadPrioMax);
+    }
+    return 2;
+}
+// #################################################################################################
 //--- [] means can be nil
 // lane_ud = lane_new( function
 //                   , [libs_str]
+//                   , [prio_is_native_bool]
 //                   , [priority_int]
 //                   , [globals_tbl]
 //                   , [package_tbl]
@@ -255,15 +279,16 @@ LUAG_FUNC(lane_new)
 {
    static constexpr StackIndex kFuncIdx{ 1 };
    static constexpr StackIndex kLibsIdx{ 2 };
-    static constexpr StackIndex kPrioIdx{ 3 };
+    static constexpr StackIndex kPrinIdx{ 3 };
-    static constexpr StackIndex kGlobIdx{ 4 };
+    static constexpr StackIndex kPrioIdx{ 4 };
-    static constexpr StackIndex kPackIdx{ 5 };
+    static constexpr StackIndex kGlobIdx{ 5 };
-    static constexpr StackIndex kRequIdx{ 6 };
+    static constexpr StackIndex kPackIdx{ 6 };
-    static constexpr StackIndex kGcCbIdx{ 7 };
+    static constexpr StackIndex kRequIdx{ 7 };
-    static constexpr StackIndex kNameIdx{ 8 };
+    static constexpr StackIndex kGcCbIdx{ 8 };
-    static constexpr StackIndex kErTlIdx{ 9 };
+    static constexpr StackIndex kNameIdx{ 9 };
-    static constexpr StackIndex kAsCoro{ 10 };
+    static constexpr StackIndex kErTlIdx{ 10 };
-    static constexpr StackIndex kFixedArgsIdx{ 10 };
+    static constexpr StackIndex kAsCoro{ 11 };
+    static constexpr StackIndex kFixedArgsIdx{ 11 };
    int const _nargs{ lua_gettop(L_) - kFixedArgsIdx };
    LUA_ASSERT(L_, _nargs >= 0);
@@ -271,7 +296,7 @@ LUAG_FUNC(lane_new)
    Universe* const _U{ Universe::Get(L_) };
    DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: setup" << std::endl);
-    std::optional<std::string_view> _libs_str{ lua_isnil(L_, kLibsIdx) ? std::nullopt : std::make_optional(luaG_tostring(L_, kLibsIdx)) };
+    std::optional<std::string_view> _libs_str{ lua_isnil(L_, kLibsIdx) ? std::nullopt : std::make_optional(luaW_tostring(L_, kLibsIdx)) };
    lua_State* const _S{ state::NewLaneState(_U, SourceState{ L_ }, _libs_str) };                 // L_: [fixed] ...                                L2:
    STACK_CHECK_START_REL(_S, 0);
@@ -333,7 +358,7 @@ LUAG_FUNC(lane_new)
            DEBUGSPEW_CODE(DebugSpew(lane->U) << "lane_new: preparing lane userdata" << std::endl);
            STACK_CHECK_START_REL(L, 0);
            // a Lane full userdata needs a single uservalue
-            Lane** const _ud{ luaG_newuserdatauv<Lane*>(L, UserValueCount{ 1 }) };                 // L: ... lane
+            Lane** const _ud{ luaW_newuserdatauv<Lane*>(L, UserValueCount{ 1 }) };                 // L: ... lane
            *_ud = lane; // don't forget to store the pointer in the userdata!
            // Set metatable for the userdata
@@ -357,25 +382,25 @@ LUAG_FUNC(lane_new)
            lua_setiuservalue(L, StackIndex{ -2 }, UserValueIndex{ 1 });                           // L: ... lane
            StackIndex const _name_idx{ lua_isnoneornil(L, kNameIdx) ? kIdxNone : kNameIdx };
-            std::string_view _debugName{ (_name_idx > 0) ? luaG_tostring(L, _name_idx) : std::string_view{} };
+            std::string_view _debugName{ (_name_idx > 0) ? luaW_tostring(L, _name_idx) : std::string_view{} };
            if (!_debugName.empty())
            {
                if (_debugName == "auto") {
-                    if (luaG_type(L, kFuncIdx) == LuaType::STRING) {
+                    if (luaW_type(L, kFuncIdx) == LuaType::STRING) {
                        lua_Debug _ar;
                        if (lua_getstack(L, 2, &_ar) == 0) { // 0 is here, 1 is lanes.gen, 2 is its caller
                            lua_getstack(L, 1, &_ar); // level 2 may not exist with LuaJIT, try again with level 1
                        }
                        lua_getinfo(L, "Sl", &_ar);
-                        luaG_pushstring(L, "%s:%d", _ar.short_src, _ar.currentline);               // L: ... lane "<name>"
+                        luaW_pushstring(L, "%s:%d", _ar.short_src, _ar.currentline);               // L: ... lane "<name>"
                    } else {
                        lua_Debug _ar;
                        lua_pushvalue(L, kFuncIdx);                                                // L: ... lane func
                        lua_getinfo(L, ">S", &_ar);                                                // L: ... lane
-                        luaG_pushstring(L, "%s:%d", _ar.short_src, _ar.linedefined);               // L: ... lane "<name>"
+                        luaW_pushstring(L, "%s:%d", _ar.short_src, _ar.linedefined);               // L: ... lane "<name>"
                    }
                    lua_replace(L, _name_idx);                                                     // L: ... lane
-                    _debugName = luaG_tostring(L, _name_idx);
+                    _debugName = luaW_tostring(L, _name_idx);
                }
                lane->storeDebugName(_debugName);
            }
@@ -400,21 +425,22 @@ LUAG_FUNC(lane_new)
    // public Lanes API accepts a generic range -3/+3
    // that will be remapped into the platform-specific scheduler priority scheme
    // On some platforms, -3 is equivalent to -2 and +3 to +2
-    int const _priority{
+    auto const [_priority, _native] {
        std::invoke([L = L_]() {
+            NativePrioFlag const _native{ static_cast<bool>(lua_toboolean(L, kPrinIdx)) };
            StackIndex const _prio_idx{ lua_isnoneornil(L, kPrioIdx) ? kIdxNone : kPrioIdx };
-            if (_prio_idx == 0) {
+            if (_prio_idx == kIdxNone) {
-                return kThreadPrioDefault;
+                return std::make_pair(kThreadPrioDefault, _native);
            }
            int const _priority{ static_cast<int>(lua_tointeger(L, _prio_idx)) };
-            if ((_priority < kThreadPrioMin || _priority > kThreadPrioMax)) {
+            if (!_native && (_priority < kThreadPrioMin || _priority > kThreadPrioMax)) {
                raise_luaL_error(L, "Priority out of range: %d..+%d (%d)", kThreadPrioMin, kThreadPrioMax, _priority);
            }
-            return _priority;
+            return std::make_pair(_priority, _native);
        })
    };
-    _lane->startThread(_priority);
+    _lane->startThread(L_, _priority, _native);
    STACK_GROW(_L2, _nargs + 3);
    STACK_GROW(L_, 3);
@@ -439,17 +465,17 @@ LUAG_FUNC(lane_new)
        DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: process 'required' list" << std::endl);
        DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U });
        // should not happen, was checked in lanes.lua before calling lane_new()
-        if (luaG_type(L_, _required_idx) != LuaType::TABLE) {
+        if (luaW_type(L_, _required_idx) != LuaType::TABLE) {
            raise_luaL_error(L_, "expected required module list as a table, got %s", luaL_typename(L_, _required_idx));
        }
        lua_pushnil(L_);                                                                           // L_: [fixed] args... nil                        L2:
        while (lua_next(L_, _required_idx) != 0) {                                                 // L_: [fixed] args... n "modname"                L2:
-            if (luaG_type(L_, kIdxTop) != LuaType::STRING || luaG_type(L_, StackIndex{ -2 }) != LuaType::NUMBER || lua_tonumber(L_, -2) != _nbRequired) {
+            if (luaW_type(L_, kIdxTop) != LuaType::STRING || luaW_type(L_, StackIndex{ -2 }) != LuaType::NUMBER || lua_tonumber(L_, -2) != _nbRequired) {
                raise_luaL_error(L_, "required module list should be a list of strings");
            } else {
                // require the module in the target state, and populate the lookup table there too
-                std::string_view const _name{ luaG_tostring(L_, kIdxTop) };
+                std::string_view const _name{ luaW_tostring(L_, kIdxTop) };
                DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: require '" << _name << "'" << std::endl);
                // require the module in the target lane
@@ -458,7 +484,7 @@ LUAG_FUNC(lane_new)
                    lua_pop(_L2, 1);                                                               // L_: [fixed] args... n "modname"                L2:
                    raise_luaL_error(L_, "cannot pre-require modules without loading 'package' library first");
                } else {
-                    luaG_pushstring(_L2, _name);                                                   // L_: [fixed] args... n "modname"                L2: require() name
+                    luaW_pushstring(_L2, _name);                                                   // L_: [fixed] args... n "modname"                L2: require() name
                    LuaError const _rc{ lua_pcall(_L2, 1, 1, 0) };                                 // L_: [fixed] args... n "modname"                L2: ret/errcode
                    if (_rc != LuaError::OK) {
                        // propagate error to main state if any
@@ -493,7 +519,7 @@ LUAG_FUNC(lane_new)
        lua_pushnil(L_);                                                                           // L_: [fixed] args... nil                        L2:
        // Lua 5.2 wants us to push the globals table on the stack
        InterCopyContext _c{ _U, DestState{ _L2 }, SourceState{ L_ }, {}, {}, {}, {}, {} };
-        luaG_pushglobaltable(_L2);                                                                 // L_: [fixed] args... nil                        L2: _G
+        luaW_pushglobaltable(_L2);                                                                 // L_: [fixed] args... nil                        L2: _G
        while (lua_next(L_, _globals_idx)) {                                                       // L_: [fixed] args... k v                        L2: _G
            std::ignore = _c.interCopy(2);                                                         // L_: [fixed] args... k v                        L2: _G k v
            // assign it in L2's globals table
@@ -507,7 +533,7 @@ LUAG_FUNC(lane_new)
    // Lane main function
    [[maybe_unused]] int const _errorHandlerCount{ _lane->pushErrorHandler() };                    // L_: [fixed] args...                            L2: eh?
-    LuaType const _func_type{ luaG_type(L_, kFuncIdx) };
+    LuaType const _func_type{ luaW_type(L_, kFuncIdx) };
    if (_func_type == LuaType::FUNCTION) {
        DEBUGSPEW_CODE(DebugSpew(_U) << "lane_new: transfer lane body" << std::endl);
        DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U });
@@ -524,7 +550,7 @@ LUAG_FUNC(lane_new)
            raise_luaL_error(L_, "error when parsing lane function code");
        }
    } else {
-        raise_luaL_error(L_, "Expected function, got %s", luaG_typename(L_, _func_type).data());
+        raise_luaL_error(L_, "Expected function, got %s", luaW_typename(L_, _func_type).data());
    }
    STACK_CHECK(L_, 0);
    STACK_CHECK(_L2, _errorHandlerCount + 1);
@@ -612,7 +638,7 @@ LUAG_FUNC(wakeup_conv)
    STACK_CHECK_START_REL(L_, 0);
    auto _readInteger = [L = L_](std::string_view const& name_) {
-        std::ignore = luaG_getfield(L, StackIndex{ 1 }, name_);
+        std::ignore = luaW_getfield(L, StackIndex{ 1 }, name_);
        lua_Integer const val{ lua_tointeger(L, -1) };
        lua_pop(L, 1);
        return static_cast<int>(val);
@@ -628,7 +654,7 @@ LUAG_FUNC(wakeup_conv)
    // If Lua table has '.isdst' we trust that. If it does not, we'll let
    // 'mktime' decide on whether the time is within DST or not (value -1).
    //
-    int const _isdst{ (luaG_getfield(L_, StackIndex{ 1 }, "isdst") == LuaType::BOOLEAN) ? lua_toboolean(L_, -1) : -1 };
+    int const _isdst{ (luaW_getfield(L_, StackIndex{ 1 }, "isdst") == LuaType::BOOLEAN) ? lua_toboolean(L_, -1) : -1 };
    lua_pop(L_, 1);
    STACK_CHECK(L_, 0);
@@ -658,6 +684,7 @@ namespace {
            { Universe::kFinally, Universe::InitializeFinalizer },
            { "linda", LG_linda },
            { "nameof", LG_nameof },
+            { "thread_priority_range", LG_thread_priority_range },
            { "now_secs", LG_now_secs },
            { "register", lanes_register },
            { "set_singlethreaded", LG_set_singlethreaded },
@@ -692,8 +719,8 @@ LUAG_FUNC(configure)
    Universe* _U{ Universe::Get(L_) };
    bool const _from_master_state{ _U == nullptr };
-    std::string_view const _name{ luaG_checkstring(L_, StackIndex{ lua_upvalueindex(1) }) };
+    std::string_view const _name{ luaW_checkstring(L_, StackIndex{ lua_upvalueindex(1) }) };
-    LUA_ASSERT(L_, luaG_type(L_, StackIndex{ 1 }) == LuaType::TABLE);
+    LUA_ASSERT(L_, luaW_type(L_, StackIndex{ 1 }) == LuaType::TABLE);
    STACK_GROW(L_, 4);
    STACK_CHECK_START_ABS(L_, 1);                                                                  // L_: settings
@@ -703,7 +730,7 @@ LUAG_FUNC(configure)
    if (_U == nullptr) {
        // store a hidden reference in the registry to make sure the string is kept around even if a lane decides to manually change the "decoda_name" global...
-        kLaneNameRegKey.setValue(L_, [](lua_State* L_) { luaG_pushstring(L_, "main"); });
+        kLaneNameRegKey.setValue(L_, [](lua_State* L_) { luaW_pushstring(L_, "main"); });
        // create the universe
        _U = Universe::Create(L_);                                                                 // L_: settings universe
@@ -719,7 +746,7 @@ LUAG_FUNC(configure)
    lua_pushnil(L_);                                                                               // L_: settings M nil
    lua_setfield(L_, -2, "configure");                                                             // L_: settings M
    // add functions to the module's table
-    luaG_registerlibfuncs(L_, local::sLanesFunctions);
+    luaW_registerlibfuncs(L_, local::sLanesFunctions);
    // register core.threads() only if settings say it should be available
    if (_U->tracker.isActive()) {
@@ -744,7 +771,7 @@ LUAG_FUNC(configure)
    lua_pushcclosure(L_, LG_require, 1);                                                           // L_: settings M lanes.require
    lua_setfield(L_, -2, "require");                                                               // L_: settings M
-    luaG_pushstring(
+    luaW_pushstring(
        L_,
        "%d.%d.%d",
        LANES_VERSION_MAJOR,
@@ -753,9 +780,6 @@ LUAG_FUNC(configure)
    );                                                                                             // L_: settings M VERSION
    lua_setfield(L_, -2, "version");                                                               // L_: settings M
-    lua_pushinteger(L_, kThreadPrioMax);                                                           // L_: settings M kThreadPrioMax
-    lua_setfield(L_, -2, "max_prio");                                                              // L_: settings M
    kCancelError.pushKey(L_);                                                                      // L_: settings M kCancelError
    lua_setfield(L_, -2, "cancel_error");                                                          // L_: settings M
@@ -779,7 +803,7 @@ LUAG_FUNC(configure)
        // don't do this when called during the initialization of a new lane,
        // because we will do it after on_state_create() is called,
        // and we don't want to skip _G because of caching in case globals are created then
-        luaG_pushglobaltable(L_);                                                                  // L_: settings M _G
+        luaW_pushglobaltable(L_);                                                                  // L_: settings M _G
        tools::PopulateFuncLookupTable(L_, kIdxTop, {});
        lua_pop(L_, 1);                                                                            // L_: settings M
    }
@@ -859,10 +883,10 @@ LANES_API int luaopen_lanes_core(lua_State* const L_)
    // Prevent PUC-Lua/LuaJIT mismatch. Hopefully this works for MoonJIT too
    if constexpr (LUAJIT_FLAVOR() == 0) {
-        if (luaG_getmodule(L_, LUA_JITLIBNAME) != LuaType::NIL)
+        if (luaW_getmodule(L_, LUA_JITLIBNAME) != LuaType::NIL)
            raise_luaL_error(L_, "Lanes is built for PUC-Lua, don't run from LuaJIT");
    } else {
-        if (luaG_getmodule(L_, LUA_JITLIBNAME) == LuaType::NIL)
+        if (luaW_getmodule(L_, LUA_JITLIBNAME) == LuaType::NIL)
            raise_luaL_error(L_, "Lanes is built for LuaJIT, don't run from PUC-Lua");
    }
    lua_pop(L_, 1);                                                                                // L_:
diff --git a/src/lanes.lua b/src/lanes.lua
index 3ee959c..c5b3315 100644
--- a/src/lanes.lua
+++ b/src/lanes.lua
@@ -280,6 +280,10 @@ local opt_validators =
        local tv = type(v_)
        return (tv == "string") and v_ or raise_option_error("name", tv, v_)
    end,
+    native_priority = function(v_)
+        local tv = type(v_)
+        return (tv == "number") and v_ or raise_option_error("native_priority", tv, v_)
+    end,
    package = function(v_)
        local tv = type(v_)
        return (tv == "table") and v_ or raise_option_error("package", tv, v_)
@@ -295,7 +299,7 @@ local opt_validators =
 }
 -- #############################################################################################
-- ##################################### lanes.gen() ###########################################
+-- ################################### lanes.gen/coro() ########################################
 -- #############################################################################################
 local process_gen_opt = function(...)
@@ -367,9 +371,16 @@ local process_gen_opt = function(...)
            opt[k] = validator(v)
        end
    end
+    -- special case: can't have priority and native_priority at the same time
+    if opt.priority and opt.native_priority then
+        error "priority and native_priority cannot be specified together"
+    end
    return func, libs, opt
 end -- process_gen_opt
+-- #################################################################################################
 -- lane_h[1..n]: lane results, same as via 'lane_h:join()'
 -- lane_h[0]:    can be read to make sure a thread has finished (gives the number of available results)
 -- lane_h[negative]:   error message, without propagating the error
@@ -408,25 +419,28 @@ end -- process_gen_opt
 -- Calling with a function argument ('lane_func') ends the string/table
 -- modifiers, and prepares a lane generator.
-- receives a sequence of strings and tables, plus a function
+local make_generator = function(is_coro_, ...)
-local gen = function(...)
    local func, libs, opt = process_gen_opt(...)
    local core_lane_new = assert(core.lane_new)
-    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
+    local prio_is_native = opt.native_priority and true or false
+    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority or opt.native_priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
    return function(...)
        -- must pass functions args last else they will be truncated to the first one
-        return core_lane_new(func, libs, priority, globals, package, required, gc_cb, name, error_trace_level, false, ...)
+        return core_lane_new(func, libs, prio_is_native, priority, globals, package, required, gc_cb, name, error_trace_level, is_coro_, ...)
    end
+end -- make_generator
+-- #################################################################################################
+-- receives a sequence of strings and tables, plus a function
+local gen = function(...)
+    return make_generator(false, ...)
 end -- gen()
+-- #################################################################################################
 local coro = function(...)
-    local func, libs, opt = process_gen_opt(...)
+    return make_generator(true, ...)
-    local core_lane_new = assert(core.lane_new)
-    local priority, globals, package, required, gc_cb, name, error_trace_level = opt.priority, opt.globals, opt.package or package, opt.required, opt.gc_cb, opt.name, error_trace_levels[opt.error_trace_level]
-    return function(...)
-        -- must pass functions args last else they will be truncated to the first one
-        return core_lane_new(func, libs, priority, globals, package, required, gc_cb, name, error_trace_level, true, ...)
-    end
 end -- coro()
 -- #################################################################################################
@@ -656,7 +670,8 @@ local configure_timers = function()
                end
            end
        end -- timer_body()
-        timer_lane = gen("lanes_core,table", { name = "LanesTimer", package = {}, priority = core.max_prio }, timer_body)()
+        local min_prio, max_prio = core.thread_priority_range()
+        timer_lane = gen("lanes_core,table", { name = "LanesTimer", package = {}, priority = max_prio }, timer_body)()
    end -- first_time
    -----
@@ -876,6 +891,7 @@ local configure = function(settings_)
    lanes.set_thread_affinity = core.set_thread_affinity
    lanes.set_thread_priority = core.set_thread_priority
    lanes.sleep = core.sleep
+    lanes.thread_priority_range = core.thread_priority_range
    lanes.threads = core.threads or function() error "lane tracking is not available" end -- core.threads isn't registered if settings.track_lanes is false
    lanes.gen = gen
diff --git a/src/lanesconf.h b/src/lanesconf.h
index 0afd493..07f1d52 100644
--- a/src/lanesconf.h
+++ b/src/lanesconf.h
@@ -42,12 +42,12 @@
 #endif // __cplusplus
 #endif // (defined PLATFORM_WIN32) || (defined PLATFORM_POCKETPC)
-// kind of MSVC-specific
+// LANES_DEBUG has to be provided externally (makefile, vcproj, whatever)
-#ifdef _DEBUG
+#ifdef LANES_DEBUG
 #define HAVE_LUA_ASSERT() 1
-#else // NDEBUG
+#else // LANES_DEBUG
 #define HAVE_LUA_ASSERT() 0
-#endif // NDEBUG
+#endif // LANES_DEBUG
 #define USE_DEBUG_SPEW() 0
 #define HAVE_DECODA_SUPPORT() 0
diff --git a/src/linda.cpp b/src/linda.cpp
index fa28385..1f4b19d 100644
--- a/src/linda.cpp
+++ b/src/linda.cpp
@@ -47,7 +47,7 @@ namespace {
    {
        STACK_CHECK_START_REL(L_, 0);
        for (StackIndex const _i : std::ranges::iota_view{ start_, StackIndex{ end_ + 1 } }) {
-            LuaType const _t{ luaG_type(L_, _i) };
+            LuaType const _t{ luaW_type(L_, _i) };
            switch (_t) {
            case LuaType::BOOLEAN:
            case LuaType::NUMBER:
@@ -109,13 +109,13 @@ namespace {
    {
        Linda* const _linda{ ToLinda<OPT>(L_, idx_) };
        if (_linda != nullptr) {
-            luaG_pushstring(L_, "Linda: ");
+            luaW_pushstring(L_, "Linda: ");
            std::string_view const _lindaName{ _linda->getName() };
            if (!_lindaName.empty()) {
-                luaG_pushstring(L_, _lindaName);
+                luaW_pushstring(L_, _lindaName);
            } else {
                // obfuscate the pointer so that we can't read the value with our eyes out of a script
-                luaG_pushstring(L_, "%p", _linda->obfuscated());
+                luaW_pushstring(L_, "%p", _linda->obfuscated());
            }
            lua_concat(L_, 2);
            return 1;
@@ -132,7 +132,7 @@ namespace {
        StackIndex _key_i{ 2 }; // index of first slot, if timeout not there
        std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-        if (luaG_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
+        if (luaW_type(L_, StackIndex{ 2 }) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
            lua_Duration const _duration{ lua_tonumber(L_, 2) };
            if (_duration.count() >= 0.0) {
                _until = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(_duration);
@@ -147,6 +147,42 @@ namespace {
    }
    // #############################################################################################
+    static bool WaitInternal([[maybe_unused]] lua_State* const L_, Lane* const lane_, Linda* const linda_, Keeper* const keeper_, std::condition_variable& waitingOn_, std::chrono::time_point<std::chrono::steady_clock> until_)
+    {
+        Lane::Status _prev_status{ Lane::Error }; // prevent 'might be used uninitialized' warnings
+        if (lane_ != nullptr) {
+            // change status of lane to "waiting"
+            _prev_status = lane_->status.load(std::memory_order_acquire); // Running, most likely
+            LUA_ASSERT(L_, _prev_status == Lane::Running); // but check, just in case
+            LUA_ASSERT(L_, lane_->waiting_on == nullptr);
+            lane_->waiting_on = &waitingOn_;
+            lane_->status.store(Lane::Waiting, std::memory_order_release);
+        }
+        // wait until the final target date by small increments, interrupting regularly so that we can check for cancel requests,
+        // in case some timing issue caused a cancel request to be issued, and the condvar signalled, before we actually wait for it
+        auto const [_forceTryAgain, _until_check_cancel] = std::invoke([until_, wakePeriod = linda_->getWakePeriod()] {
+            auto _until_check_cancel{ std::chrono::time_point<std::chrono::steady_clock>::max() };
+            if (wakePeriod.count() > 0.0f) {
+                _until_check_cancel = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(wakePeriod);
+            }
+            bool const _forceTryAgain{ _until_check_cancel < until_ };
+            return std::make_tuple(_forceTryAgain, _forceTryAgain ? _until_check_cancel : until_);
+        });
+        // operation can't complete: wake when it is signalled to be possible, or when timeout is reached
+        std::unique_lock<std::mutex> _guard{ keeper_->mutex, std::adopt_lock };
+        std::cv_status const _status{ waitingOn_.wait_until(_guard, _until_check_cancel) };
+        _guard.release(); // we don't want to unlock the mutex on exit!
+        bool const _try_again{ _forceTryAgain || (_status == std::cv_status::no_timeout) }; // detect spurious wakeups
+        if (lane_ != nullptr) {
+            lane_->waiting_on = nullptr;
+            lane_->status.store(_prev_status, std::memory_order_release);
+        }
+        return _try_again;
+    }
+    // #############################################################################################
    // the implementation for linda:receive() and linda:receive_batched()
    static int ReceiveInternal(lua_State* const L_, bool const batched_)
@@ -201,6 +237,7 @@ namespace {
            _cancel = (_cancel != CancelRequest::None)
                ? _cancel
                : ((_linda->cancelStatus == Linda::Cancelled) ? CancelRequest::Soft : CancelRequest::None);
            // if user wants to cancel, or looped because of a timeout, the call returns without sending anything
            if (!_try_again || _cancel != CancelRequest::None) {
                _pushed.emplace(0);
@@ -227,38 +264,7 @@ namespace {
            }
            // nothing received, wait until timeout or signalled that we should try again
-            {
+            _try_again = WaitInternal(L_, _lane, _linda, _keeper, _linda->writeHappened, _until);
-                Lane::Status _prev_status{ Lane::Error }; // prevent 'might be used uninitialized' warnings
-                if (_lane != nullptr) {
-                    // change status of lane to "waiting"
-                    _prev_status = _lane->status.load(std::memory_order_acquire); // Running, most likely
-                    LUA_ASSERT(L_, _prev_status == Lane::Running); // but check, just in case
-                    LUA_ASSERT(L_, _lane->waiting_on == nullptr);
-                    _lane->waiting_on = &_linda->writeHappened;
-                    _lane->status.store(Lane::Waiting, std::memory_order_release);
-                }
-                // wait until the final target date by small increments, interrupting regularly so that we can check for cancel requests,
-                // in case some timing issue caused a cancel request to be issued, and the condvar signalled, before we actually wait for it
-                auto const [_forceTryAgain, _until_check_cancel] = std::invoke([_until, wakePeriod = _linda->getWakePeriod()] {
-                    auto _until_check_cancel{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-                    if (wakePeriod.count() > 0.0f) {
-                        _until_check_cancel = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(wakePeriod);
-                    }
-                    bool const _forceTryAgain{ _until_check_cancel < _until };
-                    return std::make_tuple(_forceTryAgain, _forceTryAgain ? _until_check_cancel : _until);
-                });
-                // not enough data to read: wakeup when data was sent, or when timeout is reached
-                std::unique_lock<std::mutex> _guard{ _keeper->mutex, std::adopt_lock };
-                std::cv_status const _status{ _linda->writeHappened.wait_until(_guard, _until_check_cancel) };
-                _guard.release(); // we don't want to unlock the mutex on exit!
-                _try_again = _forceTryAgain || (_status == std::cv_status::no_timeout); // detect spurious wakeups
-                if (_lane != nullptr) {
-                    _lane->waiting_on = nullptr;
-                    _lane->status.store(_prev_status, std::memory_order_release);
-                }
-            }
        }
        STACK_CHECK(_K, 0);
@@ -273,7 +279,7 @@ namespace {
                if (_nbPushed == 0) {
                    // not enough data in the linda slot to fulfill the request, return nil, "timeout"
                    lua_pushnil(L_);
-                    luaG_pushstring(L_, "timeout");
+                    luaW_pushstring(L_, "timeout");
                    return 2;
                }
                return _nbPushed;
@@ -332,6 +338,7 @@ Keeper* Linda::acquireKeeper() const
    Keeper* const _keeper{ whichKeeper() };
    if (_keeper) {
        _keeper->mutex.lock();
+        keeperOperationCount.fetch_add(1, std::memory_order_seq_cst);
    }
    return _keeper;
 }
@@ -344,16 +351,16 @@ Linda* Linda::CreateTimerLinda(lua_State* const L_)
    // Initialize 'timerLinda'; a common Linda object shared by all states
    lua_pushcfunction(L_, LG_linda);                                                               // L_: lanes.linda
    lua_createtable(L_, 0, 3);                                                                     // L_: lanes.linda {}
-    luaG_pushstring(L_, "lanes-timer");                                                            // L_: lanes.linda {} "lanes-timer"
+    luaW_pushstring(L_, "lanes-timer");                                                            // L_: lanes.linda {} "lanes-timer"
-    luaG_setfield(L_, StackIndex{ -2 }, std::string_view{ "name" });                               // L_: lanes.linda { .name="lanes-timer" }
+    luaW_setfield(L_, StackIndex{ -2 }, std::string_view{ "name" });                               // L_: lanes.linda { .name="lanes-timer" }
    lua_pushinteger(L_, 0);                                                                        // L_: lanes.linda { .name="lanes-timer" } 0
-    luaG_setfield(L_, StackIndex{ -2 }, std::string_view{ "group" });                              // L_: lanes.linda { .name="lanes-timer" .group = 0 }
+    luaW_setfield(L_, StackIndex{ -2 }, std::string_view{ "group" });                              // L_: lanes.linda { .name="lanes-timer" .group = 0 }
    // note that wake_period is not set (will default to the value in the universe)
    lua_call(L_, 1, 1);                                                                            // L_: linda
    STACK_CHECK(L_, 1);
    // Proxy userdata contents is only a 'DeepPrelude*' pointer
-    auto const _timerLinda{ *luaG_tofulluserdata<Linda*>(L_, kIdxTop) };
+    auto const _timerLinda{ *luaW_tofulluserdata<Linda*>(L_, kIdxTop) };
    // increment refcount so that this linda remains alive as long as the universe exists.
    _timerLinda->refcount.fetch_add(1, std::memory_order_relaxed);
    lua_pop(L_, 1);                                                                                // L_:
@@ -416,7 +423,6 @@ int Linda::ProtectedCall(lua_State* const L_, lua_CFunction const f_)
    // doing LindaFactory::deleteDeepObjectInternal -> keeper_call(clear)
    lua_gc(L_, LUA_GCSTOP, 0);
-    LUA_ASSERT_CODE(auto const _koip{ _linda->startKeeperOperation(L_) });
    // if we didn't do anything wrong, the keeper stack should be clean
    LUA_ASSERT(L_, lua_gettop(_K) == 0);
@@ -424,7 +430,7 @@ int Linda::ProtectedCall(lua_State* const L_, lua_CFunction const f_)
    lua_pushcfunction(L_, f_);
    lua_insert(L_, 1);
    // do a protected call
-    LuaError const _rc{ lua_pcall(L_, lua_gettop(L_) - 1, LUA_MULTRET, 0) };
+    LuaError const _rc{ ToLuaError(lua_pcall(L_, lua_gettop(L_) - 1, LUA_MULTRET, 0)) };
    // whatever happens, the keeper state stack must be empty when we are done
    lua_settop(_K, 0);
@@ -446,7 +452,7 @@ int Linda::ProtectedCall(lua_State* const L_, lua_CFunction const f_)
 void Linda::pushCancelString(lua_State* L_) const
 {
-    luaG_pushstring(L_, cancelStatus == Status::Cancelled ? "cancelled" : "active");
+    luaW_pushstring(L_, cancelStatus == Status::Cancelled ? "cancelled" : "active");
 }
 // #################################################################################################
@@ -455,6 +461,7 @@ void Linda::releaseKeeper(Keeper* const keeper_) const
 {
    if (keeper_) { // can be nullptr if we tried to acquire during shutdown
        assert(keeper_ == whichKeeper());
+        keeperOperationCount.fetch_sub(1, std::memory_order_seq_cst);
        keeper_->mutex.unlock();
    }
 }
@@ -498,7 +505,7 @@ void Linda::setName(std::string_view const& name_)
 LUAG_FUNC(linda_cancel)
 {
    Linda* const _linda{ ToLinda<false>(L_, StackIndex{ 1 }) };
-    std::string_view const _who{ luaG_optstring(L_, StackIndex{ 2 }, "both") };
+    std::string_view const _who{ luaW_optstring(L_, StackIndex{ 2 }, "both") };
    // make sure we got 2 arguments: the linda and the cancellation mode
    luaL_argcheck(L_, lua_gettop(L_) <= 2, 2, "wrong number of arguments");
@@ -586,13 +593,13 @@ static int linda_index_string(lua_State* L_)
    Linda* const _linda{ ToLinda<false>(L_, kIdxSelf) };
    LUA_ASSERT(L_, lua_gettop(L_) == 2);                                                           // L_: linda "key"
-    std::string_view const _keystr{ luaG_tostring(L_, kIdxKey) };
+    std::string_view const _keystr{ luaW_tostring(L_, kIdxKey) };
    lua_settop(L_, 2); // keep only our original arguments on the stack
    // look in metatable first
    lua_getmetatable(L_, kIdxSelf);                                                                // L_: linda "key" mt
    lua_replace(L_, -3);                                                                           // L_: mt "key"
-    if (luaG_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) { // found something?                   // L_: mt value
+    if (luaW_rawget(L_, StackIndex{ -2 }) != LuaType::NIL) { // found something?                   // L_: mt value
        return 1; // done
    }
@@ -612,12 +619,12 @@ static LUAG_FUNC(linda_index)
    static constexpr StackIndex kIdxKey{ 2 };
    LUA_ASSERT(L_, lua_gettop(L_) == 2);
-    switch (luaG_type(L_, kIdxKey)) {
+    switch (luaW_type(L_, kIdxKey)) {
    case LuaType::STRING:
        return linda_index_string(L_); // stack modification is undefined, returned value is at the top
    default: // unknown key
-        raise_luaL_error(L_, "Unsupported linda indexing key type %s", luaG_typename(L_, kIdxKey).data());
+        raise_luaL_error(L_, "Unsupported linda indexing key type %s", luaW_typename(L_, kIdxKey).data());
    }
 }
@@ -760,7 +767,7 @@ LUAG_FUNC(linda_limit)
            int const _nargs{ lua_gettop(L_) };
            luaL_argcheck(L_, _nargs == 2 || _nargs == 3, 2, "wrong number of arguments");
            // make sure we got a numeric limit, or "unlimited", (or nothing)
-            bool const _unlimited{ luaG_tostring(L_, StackIndex{ 3 }) == "unlimited" };
+            bool const _unlimited{ luaW_tostring(L_, StackIndex{ 3 }) == "unlimited" };
            LindaLimit const _val{ _unlimited ? std::numeric_limits<LindaLimit::type>::max() : static_cast<LindaLimit::type>(luaL_optinteger(L_, 3, 0)) };
            if (_val < 0) {
                raise_luaL_argerror(L_, StackIndex{ 3 }, "limit must be >= 0");
@@ -771,23 +778,23 @@ LUAG_FUNC(linda_limit)
            KeeperCallResult _pushed;
            if (_linda->cancelStatus == Linda::Active) {
                if (_unlimited) {
-                    LUA_ASSERT(L_, lua_gettop(L_) == 3 && luaG_tostring(L_, StackIndex{ 3 }) == "unlimited");
+                    LUA_ASSERT(L_, lua_gettop(L_) == 3 && luaW_tostring(L_, StackIndex{ 3 }) == "unlimited");
                    // inside the Keeper, unlimited is signified with a -1 limit (can't use nil because of nil kNilSentinel conversions!)
                    lua_pop(L_, 1);                                                                // L_: linda slot
                    lua_pushinteger(L_, -1);                                                       // L_: linda slot nil
                }
                Keeper* const _keeper{ _linda->whichKeeper() };
                _pushed = keeper_call(_keeper->K, KEEPER_API(limit), L_, _linda, StackIndex{ 2 });
-                LUA_ASSERT(L_, _pushed.has_value() && (_pushed.value() == 2) && luaG_type(L_, kIdxTop) == LuaType::STRING);
+                LUA_ASSERT(L_, _pushed.has_value() && (_pushed.value() == 2) && luaW_type(L_, kIdxTop) == LuaType::STRING);
                if (_nargs == 3) { // 3 args: setting the limit
                    // changing the limit: no error, boolean value saying if we should wake blocked writer threads
-                    LUA_ASSERT(L_, luaG_type(L_, StackIndex{ -2 }) == LuaType::BOOLEAN);           // L_: bool string
+                    LUA_ASSERT(L_, luaW_type(L_, StackIndex{ -2 }) == LuaType::BOOLEAN);           // L_: bool string
                    if (lua_toboolean(L_, -2)) {
                        _linda->readHappened.notify_all(); // To be done from within the 'K' locking area
                    }
                } else { // 2 args: reading the limit
                    // reading the limit: a number >=0 or "unlimited"
-                    LUA_ASSERT(L_, luaG_type(L_, StackIndex{ -2 }) == LuaType::NUMBER || luaG_tostring(L_, StackIndex{ -2 }) == "unlimited");
+                    LUA_ASSERT(L_, luaW_type(L_, StackIndex{ -2 }) == LuaType::NUMBER || luaW_tostring(L_, StackIndex{ -2 }) == "unlimited");
                }
            } else { // linda is cancelled
                // do nothing and return nil,lanes.cancel_error
@@ -843,7 +850,7 @@ LUAG_FUNC(linda_restrict)
            int const _nargs{ lua_gettop(L_) };
            luaL_argcheck(L_, _nargs == 2 || _nargs == 3, 2, "wrong number of arguments");
            // make sure we got a known restrict mode, (or nothing)
-            std::string_view const _mode{ luaG_tostring(L_, StackIndex{ 3 }) };
+            std::string_view const _mode{ luaW_tostring(L_, StackIndex{ 3 }) };
            if (!_mode.empty() && (_mode != "none" && _mode != "set/get" && _mode != "send/receive")) {
                raise_luaL_argerror(L_, StackIndex{ 3 }, "unknown restrict mode");
            }
@@ -855,7 +862,7 @@ LUAG_FUNC(linda_restrict)
                Keeper* const _keeper{ _linda->whichKeeper() };
                _pushed = keeper_call(_keeper->K, KEEPER_API(restrict), L_, _linda, StackIndex{ 2 });
                // we should get a single return value: the string describing the previous restrict mode
-                LUA_ASSERT(L_, _pushed.has_value() && (_pushed.value() == 1) && luaG_type(L_, kIdxTop) == LuaType::STRING);
+                LUA_ASSERT(L_, _pushed.has_value() && (_pushed.value() == 1) && luaW_type(L_, kIdxTop) == LuaType::STRING);
            } else { // linda is cancelled
                // do nothing and return nil,lanes.cancel_error
                lua_pushnil(L_);
@@ -916,6 +923,7 @@ LUAG_FUNC(linda_send)
                _cancel = (_cancel != CancelRequest::None)
                    ? _cancel
                    : ((_linda->cancelStatus == Linda::Cancelled) ? CancelRequest::Soft : CancelRequest::None);
                // if user wants to cancel, or looped because of a timeout, the call returns without sending anything
                if (!_try_again || _cancel != CancelRequest::None) {
                    _pushed.emplace(0);
@@ -948,38 +956,7 @@ LUAG_FUNC(linda_send)
                }
                // storage limit hit, wait until timeout or signalled that we should try again
-                {
+                _try_again = WaitInternal(L_, _lane, _linda, _keeper, _linda->readHappened, _until);
-                    Lane::Status _prev_status{ Lane::Error }; // prevent 'might be used uninitialized' warnings
-                    if (_lane != nullptr) {
-                        // change status of lane to "waiting"
-                        _prev_status = _lane->status.load(std::memory_order_acquire); // Running, most likely
-                        LUA_ASSERT(L_, _prev_status == Lane::Running); // but check, just in case
-                        LUA_ASSERT(L_, _lane->waiting_on == nullptr);
-                        _lane->waiting_on = &_linda->readHappened;
-                        _lane->status.store(Lane::Waiting, std::memory_order_release);
-                    }
-                    // wait until the final target date by small increments, interrupting regularly so that we can check for cancel requests,
-                    // in case some timing issue caused a cancel request to be issued, and the condvar signalled, before we actually wait for it
-                    auto const [_forceTryAgain, _until_check_cancel] = std::invoke([_until, wakePeriod = _linda->getWakePeriod()] {
-                        auto _until_check_cancel{ std::chrono::time_point<std::chrono::steady_clock>::max() };
-                        if (wakePeriod.count() > 0.0f) {
-                            _until_check_cancel = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(wakePeriod);
-                        }
-                        bool const _forceTryAgain{ _until_check_cancel < _until };
-                        return std::make_tuple(_forceTryAgain, _forceTryAgain ? _until_check_cancel : _until);
-                    });
-                    // could not send because no room: wait until some data was read before trying again, or until timeout is reached
-                    std::unique_lock<std::mutex> _guard{ _keeper->mutex, std::adopt_lock };
-                    std::cv_status const status{ _linda->readHappened.wait_until(_guard, _until_check_cancel) };
-                    _guard.release(); // we don't want to unlock the mutex on exit!
-                    _try_again = _forceTryAgain || (status == std::cv_status::no_timeout); // detect spurious wakeups
-                    if (_lane != nullptr) {
-                        _lane->waiting_on = nullptr;
-                        _lane->status.store(_prev_status, std::memory_order_release);
-                    }
-                }
            }
            STACK_CHECK(_K, 0);
@@ -1005,7 +982,7 @@ LUAG_FUNC(linda_send)
                } else {
                    // not enough room in the Linda slot to fulfill the request, return nil, "timeout"
                    lua_pushnil(L_);
-                    luaG_pushstring(L_, "timeout");
+                    luaW_pushstring(L_, "timeout");
                    return 2;
                }
            }
@@ -1040,7 +1017,7 @@ LUAG_FUNC(linda_set)
                    if (kRestrictedChannel.equals(L_, kIdxTop)) {
                        raise_luaL_error(L_, "Key is restricted");
                    }
-                    LUA_ASSERT(L_, _pushed.value() == 2 && luaG_type(L_, kIdxTop) == LuaType::STRING && luaG_type(L_, StackIndex{ -2 }) == LuaType::BOOLEAN);
+                    LUA_ASSERT(L_, _pushed.value() == 2 && luaW_type(L_, kIdxTop) == LuaType::STRING && luaW_type(L_, StackIndex{ -2 }) == LuaType::BOOLEAN);
                    if (_has_data) {
                        // we put some data in the slot, tell readers that they should wake
@@ -1102,7 +1079,7 @@ LUAG_FUNC(linda_towatch)
 LUAG_FUNC(linda_wake)
 {
    Linda* const _linda{ ToLinda<false>(L_, StackIndex{ 1 }) };
-    std::string_view const _who{ luaG_optstring(L_, StackIndex{ 2 }, "both") };
+    std::string_view const _who{ luaW_optstring(L_, StackIndex{ 2 }, "both") };
    // make sure we got 2 arguments: the linda and the wake targets
    luaL_argcheck(L_, lua_gettop(L_) <= 2, 2, "wrong number of arguments");
@@ -1178,8 +1155,8 @@ LUAG_FUNC(linda)
        if (lua_isnil(L_, kIdxTop)) {
            lua_pop(L_, 1);
            lua_pushnumber(L_, _U->lindaWakePeriod.count());
-        } else if (luaG_type(L_, kIdxTop) == LuaType::STRING) {
+        } else if (luaW_type(L_, kIdxTop) == LuaType::STRING) {
-            if (luaG_tostring(L_, kIdxTop) != "never") {
+            if (luaW_tostring(L_, kIdxTop) != "never") {
                luaL_argerror(L_, 1, "invalid wake_period");
            } else {
                lua_pop(L_, 1);
@@ -1201,7 +1178,7 @@ LUAG_FUNC(linda)
 #if LUA_VERSION_NUM >= 504 // to-be-closed support starts with Lua 5.4
        lua_getfield(L_, 1, "close_handler");                                                      // L_: {} wake_period group close_handler
-        LuaType const _handlerType{ luaG_type(L_, kIdxTop) };
+        LuaType const _handlerType{ luaW_type(L_, kIdxTop) };
        if (_handlerType == LuaType::NIL) {
            lua_pop(L_, 1);                                                                        // L_: {} wake_period group
        } else if (_handlerType == LuaType::USERDATA || _handlerType == LuaType::TABLE) {
@@ -1212,7 +1189,7 @@ LUAG_FUNC(linda)
        }
 #endif // LUA_VERSION_NUM >= 504
-        auto const _nameType{ luaG_getfield(L_, StackIndex{ 1 }, "name") };                        // L_: {} wake_period group [close_handler] name
+        auto const _nameType{ luaW_getfield(L_, StackIndex{ 1 }, "name") };                        // L_: {} wake_period group [close_handler] name
        luaL_argcheck(L_, _nameType == LuaType::NIL || _nameType == LuaType::STRING, 1, "name is not a string");
        lua_replace(L_, 1);                                                                        // L_: name wake_period group [close_handler]
    }
diff --git a/src/linda.hpp b/src/linda.hpp
index cff30e5..f02c46e 100644
--- a/src/linda.hpp
+++ b/src/linda.hpp
@@ -14,26 +14,6 @@ class Linda final
 : public DeepPrelude // Deep userdata MUST start with this header
 {
    public:
-    class [[nodiscard]] KeeperOperationInProgress final
-    {
-        private:
-        Linda& linda;
-        lua_State* const L{}; // just here for inspection while debugging
-        public:
-        KeeperOperationInProgress(Linda& linda_, lua_State* const L_)
-        : linda{ linda_ }
-        , L{ L_ }
-        {
-            [[maybe_unused]] UnusedInt const _prev{ linda.keeperOperationCount.fetch_add(1, std::memory_order_seq_cst) };
-        }
-        public:
-        ~KeeperOperationInProgress()
-        {
-            [[maybe_unused]] UnusedInt const _prev{ linda.keeperOperationCount.fetch_sub(1, std::memory_order_seq_cst) };
-        }
-    };
    enum class [[nodiscard]] Status
    {
@@ -51,7 +31,7 @@ class Linda final
    // depending on the name length, it is either embedded inside the Linda, or allocated separately
    std::variant<std::string_view, EmbeddedName> nameVariant{};
    // counts the keeper operations in progress
-    std::atomic<int> keeperOperationCount{};
+    mutable std::atomic<int> keeperOperationCount{};
    lua_Duration wakePeriod{};
    public:
@@ -110,7 +90,5 @@ class Linda final
    static int ProtectedCall(lua_State* L_, lua_CFunction f_);
    void pushCancelString(lua_State* L_) const;
    [[nodiscard]]
-    KeeperOperationInProgress startKeeperOperation(lua_State* const L_) { return KeeperOperationInProgress{ *this, L_ }; };
-    [[nodiscard]]
    Keeper* whichKeeper() const { return U->keepers.getKeeper(keeperIndex); }
 };
diff --git a/src/lindafactory.cpp b/src/lindafactory.cpp
index 4eab0c1..483037f 100644
--- a/src/lindafactory.cpp
+++ b/src/lindafactory.cpp
@@ -47,22 +47,22 @@ void LindaFactory::createMetatable(lua_State* L_) const
    lua_newtable(L_);                                                                              // L_: mt
    // protect metatable from external access
-    luaG_pushstring(L_, kLindaMetatableName);                                                      // L_: mt "<name>"
+    luaW_pushstring(L_, kLindaMetatableName);                                                      // L_: mt "<name>"
    lua_setfield(L_, -2, "__metatable");                                                           // L_: mt
    // the linda functions
-    luaG_registerlibfuncs(L_, mLindaMT);
+    luaW_registerlibfuncs(L_, mLindaMT);
    kNilSentinel.pushKey(L_);                                                                      // L_: mt kNilSentinel
    lua_setfield(L_, -2, "null");                                                                  // L_: mt
    // if the metatable contains __index, leave it as is
-    if (luaG_getfield(L_, kIdxTop, kIndex) != LuaType::NIL) {                                      // L_: mt __index
+    if (luaW_getfield(L_, kIdxTop, kIndex) != LuaType::NIL) {                                      // L_: mt __index
        lua_pop(L_, 1);                                                                            // L_: mt __index
    } else {
        // metatable is its own index
        lua_pushvalue(L_, kIdxTop);                                                                // L_: mt mt
-        luaG_setfield(L_, StackIndex{ -2 }, kIndex);                                               // L_: mt
+        luaW_setfield(L_, StackIndex{ -2 }, kIndex);                                               // L_: mt
    }
    STACK_CHECK(L_, 1);
@@ -110,7 +110,7 @@ DeepPrelude* LindaFactory::newDeepObjectInternal(lua_State* const L_) const
 {
    STACK_CHECK_START_REL(L_, 0);
    // we always expect name, wake_period, group at the bottom of the stack (either can be nil). any extra stuff we ignore and keep unmodified
-    std::string_view _linda_name{ luaG_tostring(L_, StackIndex{ 1 }) };
+    std::string_view _linda_name{ luaW_tostring(L_, StackIndex{ 1 }) };
    auto const _wake_period{ static_cast<lua_Duration>(lua_tonumber(L_, 2)) };
    LindaGroup const _linda_group{ static_cast<int>(lua_tointeger(L_, 3)) };
@@ -119,12 +119,12 @@ DeepPrelude* LindaFactory::newDeepObjectInternal(lua_State* const L_) const
        lua_Debug _ar;
        if (lua_getstack(L_, 1, &_ar) == 1) { // 1 because we want the name of the function that called lanes.linda (where we currently are)
            lua_getinfo(L_, "Sln", &_ar);
-            _linda_name = luaG_pushstring(L_, "%s:%d", _ar.short_src, _ar.currentline);
+            _linda_name = luaW_pushstring(L_, "%s:%d", _ar.short_src, _ar.currentline);
        } else {
-            _linda_name = luaG_pushstring(L_, "<unresolved>");
+            _linda_name = luaW_pushstring(L_, "<unresolved>");
        }
        // since the name is not empty, it is at slot 1, and we can replace "auto" with the result, just in case
-        LUA_ASSERT(L_, luaG_tostring(L_, StackIndex{ 1 }) == "auto");
+        LUA_ASSERT(L_, luaW_tostring(L_, StackIndex{ 1 }) == "auto");
        lua_replace(L_, 1);
    }
diff --git a/src/nameof.cpp b/src/nameof.cpp
index f236f73..992569b 100644
--- a/src/nameof.cpp
+++ b/src/nameof.cpp
@@ -52,25 +52,25 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
    static constexpr auto _pushNameOnFQN = [](lua_State* const L_) {
        STACK_CHECK_START_REL(L_, 0);
        lua_pushvalue(L_, -2);                                                                     // L_: o "r" {c} {fqn} ... k v k
-        auto const _keyType{ luaG_type(L_, kIdxTop) };
+        auto const _keyType{ luaW_type(L_, kIdxTop) };
        if (_keyType != LuaType::STRING) {
            lua_pop(L_, 1);                                                                        // L_: o "r" {c} {fqn} ... k v
-            luaG_pushstring(L_, "<%s>", luaG_typename(L_, _keyType).data());                       // L_: o "r" {c} {fqn} ... k v "<type of k>"
+            luaW_pushstring(L_, "<%s>", luaW_typename(L_, _keyType).data());                       // L_: o "r" {c} {fqn} ... k v "<type of k>"
        } else {
            // decorate the key string with something that tells us the type of the value
-            switch (luaG_type(L_, StackIndex{ -2 })) {
+            switch (luaW_type(L_, StackIndex{ -2 })) {
            default:
                LUA_ASSERT(L_, false); // there is something wrong if we end up here
-                luaG_pushstring(L_, "??");                                                         // L_: o "r" {c} {fqn} ... k v "k" "??"
+                luaW_pushstring(L_, "??");                                                         // L_: o "r" {c} {fqn} ... k v "k" "??"
                break;
            case LuaType::FUNCTION:
-                luaG_pushstring(L_, "()");                                                         // L_: o "r" {c} {fqn} ... k v "k" "()"
+                luaW_pushstring(L_, "()");                                                         // L_: o "r" {c} {fqn} ... k v "k" "()"
                break;
            case LuaType::TABLE:
-                luaG_pushstring(L_, "[]");                                                         // L_: o "r" {c} {fqn} ... k v "k" "[]"
+                luaW_pushstring(L_, "[]");                                                         // L_: o "r" {c} {fqn} ... k v "k" "[]"
                break;
            case LuaType::USERDATA:
-                luaG_pushstring(L_, "<>");                                                         // L_: o "r" {c} {fqn} ... k v "k" "<>"
+                luaW_pushstring(L_, "<>");                                                         // L_: o "r" {c} {fqn} ... k v "k" "<>"
                break;
            }
            lua_concat(L_, 2);                                                                     // L_: o "r" {c} {fqn} ... k v "k??"
@@ -92,7 +92,7 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
    static constexpr auto _recurseThenPop = [](lua_State* const L_, FqnLength const shortest_) -> FqnLength {
        STACK_CHECK_START_REL(L_, 0);                                                              // L_: o "r" {c} {fqn} ... <>
        FqnLength r_{ shortest_ };
-        auto const _type{ luaG_type(L_, kIdxTop) };
+        auto const _type{ luaW_type(L_, kIdxTop) };
        if (_type == LuaType::TABLE || _type == LuaType::USERDATA || _type == LuaType::FUNCTION) {
            r_ = DiscoverObjectNameRecur(L_, shortest_);
            STACK_CHECK(L_, 0);
@@ -113,7 +113,7 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
        STACK_CHECK_START_REL(L_, 0);                                                              // L_: o "r" {c} {fqn} ... k v
        // filter out uninteresting values
-        auto const _valType{ luaG_type(L_, kIdxTop) };
+        auto const _valType{ luaW_type(L_, kIdxTop) };
        if (_valType == LuaType::NIL || _valType == LuaType::BOOLEAN || _valType == LuaType::LIGHTUSERDATA || _valType == LuaType::NUMBER || _valType == LuaType::STRING) {
            lua_pop(L_, 1);                                                                        // L_: o "r" {c} {fqn} ... k
            return _r;
@@ -177,7 +177,7 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
        UserValueIndex _uvi{ 0 };
        while (lua_getiuservalue(L_, kIdxTop, ++_uvi) != LUA_TNONE) {                              // L_: o "r" {c} {fqn} ... U uv
-            luaG_pushstring(L_, "<uv:%d>", _uvi);                                                  // L_: o "r" {c} {fqn} ... U uv name
+            luaW_pushstring(L_, "<uv:%d>", _uvi);                                                  // L_: o "r" {c} {fqn} ... U uv name
            lua_insert(L_, -2);                                                                    // L_: o "r" {c} {fqn} ... U name uv
            r_ = _processKeyValue(L_, r_);                                                         // L_: o "r" {c} {fqn} ... U name
            lua_pop(L_, 1);                                                                        // L_: o "r" {c} {fqn} ... U
@@ -200,7 +200,7 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
                _upname = "<C>";
            }
-            luaG_pushstring(L_, "upvalue:%s", _upname);                                            // L_: o "r" {c} {fqn} ... F up name
+            luaW_pushstring(L_, "upvalue:%s", _upname);                                            // L_: o "r" {c} {fqn} ... F up name
            lua_insert(L_, -2);                                                                    // L_: o "r" {c} {fqn} ... F name up
            r_ = _processKeyValue(L_, r_);                                                         // L_: o "r" {c} {fqn} ... F name
            lua_pop(L_, 1);                                                                        // L_: o "r" {c} {fqn} ... F
@@ -213,7 +213,7 @@ FqnLength DiscoverObjectNameRecur(lua_State* const L_, FqnLength const shortest_
    STACK_GROW(L_, 2);
    STACK_CHECK_START_REL(L_, 0);
    // stack top contains the location to search in (table, function, userdata)
-    [[maybe_unused]] auto const _typeWhere{ luaG_type(L_, kIdxTop) };
+    [[maybe_unused]] auto const _typeWhere{ luaW_type(L_, kIdxTop) };
    LUA_ASSERT(L_, _typeWhere == LuaType::TABLE || _typeWhere == LuaType::USERDATA || _typeWhere == LuaType::FUNCTION);
    lua_pushvalue(L_, kIdxTop);                                                                    // L_: o "r" {c} {fqn} ... <> <>
    lua_rawget(L_, kCache);                                                                        // L_: o "r" {c} {fqn} ... <> nil/N
@@ -263,12 +263,12 @@ LUAG_FUNC(nameof)
    // nil, boolean, light userdata, number and string aren't identifiable
    static constexpr auto _isIdentifiable = [](lua_State* const L_) {
-        auto const _valType{ luaG_type(L_, kIdxTop) };
+        auto const _valType{ luaW_type(L_, kIdxTop) };
        return _valType == LuaType::TABLE || _valType == LuaType::FUNCTION || _valType == LuaType::USERDATA || _valType == LuaType::THREAD;
    };
    if (!_isIdentifiable(L_)) {
-        luaG_pushstring(L_, luaG_typename(L_, kIdxTop));                                           // L_: o "type"
+        luaW_pushstring(L_, luaW_typename(L_, kIdxTop));                                           // L_: o "type"
        lua_insert(L_, -2);                                                                        // L_: "type" o
        return 2;
    }
@@ -282,15 +282,15 @@ LUAG_FUNC(nameof)
    // push a table whose contents are strings that, when concatenated, produce unique name
    lua_newtable(L_);                                                                              // L_: o nil {c} {fqn}
    // {fqn}[1] = "_G"
-    luaG_pushstring(L_, LUA_GNAME);                                                                // L_: o nil {c} {fqn} "_G"
+    luaW_pushstring(L_, LUA_GNAME);                                                                // L_: o nil {c} {fqn} "_G"
    lua_rawseti(L_, -2, 1);                                                                        // L_: o nil {c} {fqn}
    // this is where we start the search
-    luaG_pushglobaltable(L_);                                                                      // L_: o nil {c} {fqn} _G
+    luaW_pushglobaltable(L_);                                                                      // L_: o nil {c} {fqn} _G
    auto const _foundInG{ DiscoverObjectNameRecur(L_, FqnLength{ std::numeric_limits<FqnLength::type>::max() }) };
    if (lua_isnil(L_, 2)) { // try again with registry, just in case...
        LUA_ASSERT(L_, _foundInG == std::numeric_limits<FqnLength::type>::max());
        lua_pop(L_, 1);                                                                            // L_: o nil {c} {fqn}
-        luaG_pushstring(L_, "_R");                                                                 // L_: o nil {c} {fqn} "_R"
+        luaW_pushstring(L_, "_R");                                                                 // L_: o nil {c} {fqn} "_R"
        lua_rawseti(L_, -2, 1);                                                                    // L_: o nil {c} {fqn}
        lua_pushvalue(L_, kIdxRegistry);                                                           // L_: o nil {c} {fqn} _R
        [[maybe_unused]] auto const _foundInR{ DiscoverObjectNameRecur(L_, FqnLength{ std::numeric_limits<FqnLength::type>::max() }) };
diff --git a/src/state.cpp b/src/state.cpp
index fc7f5ef..2f64194 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -166,7 +166,7 @@ namespace state {
        };
        if (_L == nullptr) {
-            raise_luaL_error(from_, "luaG_newstate() failed while creating state; out of memory");
+            raise_luaL_error(from_, "luaW_newstate() failed while creating state; out of memory");
        }
        return _L;
    }
@@ -202,11 +202,11 @@ namespace state {
        // neither libs (not even 'base') nor special init func: we are done
        if (!libs_.has_value() && std::holds_alternative<std::nullptr_t>(U_->onStateCreateFunc)) {
-            DEBUGSPEW_CODE(DebugSpew(U_) << "luaG_newstate(nullptr)" << std::endl);
+            DEBUGSPEW_CODE(DebugSpew(U_) << "luaW_newstate(nullptr)" << std::endl);
            return _L;
        }
-        DEBUGSPEW_CODE(DebugSpew(U_) << "luaG_newstate()" << std::endl);
+        DEBUGSPEW_CODE(DebugSpew(U_) << "luaW_newstate()" << std::endl);
        DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ U_ });
        // copy settings (for example because it may contain a Lua on_state_create function)
@@ -239,7 +239,7 @@ namespace state {
                    lua_pop(_L, 1);
                } else {
                    lua_pushcfunction(_L, luaopen_base);
-                    luaG_pushstring(_L, "");
+                    luaW_pushstring(_L, "");
                    lua_call(_L, 1, 0);
                }
            }
@@ -274,7 +274,7 @@ namespace state {
        STACK_CHECK(_L, 0);
        // after all this, register everything we find in our name<->function database
-        luaG_pushglobaltable(_L);                                                                  // L: _G
+        luaW_pushglobaltable(_L);                                                                  // L: _G
        tools::PopulateFuncLookupTable(_L, kIdxTop, {});
        lua_pop(_L, 1);                                                                            // L:
        STACK_CHECK(_L, 0);
@@ -286,19 +286,19 @@ namespace state {
            kLookupRegKey.pushValue(_L);                                                           // L: {}
            lua_pushnil(_L);                                                                       // L: {} nil
            while (lua_next(_L, -2)) {                                                             // L: {} k v
-                luaG_pushstring(_L, "[");                                                          // L: {} k v "["
+                luaW_pushstring(_L, "[");                                                          // L: {} k v "["
                lua_getglobal(_L, "tostring");                                                     // L: {} k v "[" tostring
                lua_pushvalue(_L, -4);                                                             // L: {} k v "[" tostring k
                lua_call(_L, 1, 1);                                                                // L: {} k v "[" 'k'
-                luaG_pushstring(_L, "] = ");                                                       // L: {} k v "[" 'k' "] = "
+                luaW_pushstring(_L, "] = ");                                                       // L: {} k v "[" 'k' "] = "
                lua_getglobal(_L, "tostring");                                                     // L: {} k v "[" 'k' "] = " tostring
                lua_pushvalue(_L, -5);                                                             // L: {} k v "[" 'k' "] = " tostring v
                lua_call(_L, 1, 1);                                                                // L: {} k v "[" 'k' "] = " 'v'
                lua_concat(_L, 4);                                                                 // L: {} k v "[k] = v"
-                DEBUGSPEW_CODE(DebugSpew(U_) << luaG_tostring(_L, kIdxTop) << std::endl);
+                DEBUGSPEW_CODE(DebugSpew(U_) << luaW_tostring(_L, kIdxTop) << std::endl);
                lua_pop(_L, 2);                                                                    // L: {} k
            } // lua_next()                                                                        // L: {}
            lua_pop(_L, 1);                                                                        // L:
@@ -317,7 +317,7 @@ namespace state {
        lua_newtable(L_);                                                                          // L_: out
        for (luaL_Reg const& _entry : local::sLibs) {
            lua_pushboolean(L_, 1);                                                                // L_: out true
-            luaG_setfield(L_, StackIndex{ -2 }, std::string_view{ _entry.name });                  // out[name] = true            // L_: out
+            luaW_setfield(L_, StackIndex{ -2 }, std::string_view{ _entry.name });                  // out[name] = true            // L_: out
        }
        STACK_CHECK(L_, 1);
        return 1;
diff --git a/src/threading.cpp b/src/threading.cpp
index 3435075..4b27bed 100644
--- a/src/threading.cpp
+++ b/src/threading.cpp
@@ -49,6 +49,7 @@ THE SOFTWARE.
 #endif // __linux__
+#include "compat.hpp"
 #include "threading.hpp"
 #if !defined(PLATFORM_XBOX) && !defined(PLATFORM_WIN32) && !defined(PLATFORM_POCKETPC)
@@ -82,25 +83,42 @@ THE SOFTWARE.
 #pragma warning(disable : 4054)
 #endif
+static constexpr std::string_view StripFuncName(std::string_view const& where_)
+{
+    std::string_view funcname_{ where_ };
+    auto _args_pos{ funcname_.find_first_of('(') };
+    funcname_ = funcname_.substr(0, _args_pos);
+    auto _name_pos{ funcname_.find_last_of(' ') };
+    funcname_.remove_prefix(_name_pos + 1);
+    return funcname_;
+}
 /*
 * FAIL is for unexpected API return values - essentially programming
 * error in _this_ code.
 */
 #if HAVE_WIN32
-static void FAIL(char const* funcname_, DWORD const rc_)
+template <typename F, typename... ARGS>
+void Win32Invoke(lua_State* const L_, std::string_view const& where_, F& f_, ARGS... args_)
 {
+    auto const _ret{ std::invoke(f_, std::forward<ARGS>(args_)...) };
+    if (!_ret) {
+        auto const _rc{ GetLastError() };
+        std::string_view const _funcname{ StripFuncName(where_) };
 #if defined(PLATFORM_XBOX)
-    fprintf(stderr, "%s() failed! (%d)\n", funcname_, rc_);
+        luaW_pushstring(L_, "%s() failed with code %d", _funcname.data(), _rc);
-#else  // PLATFORM_XBOX
+#else // PLATFORM_XBOX
-    char buf[256];
+        char _buf[256];
-    FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, rc_, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, 256, nullptr);
+        FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, _rc, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), _buf, 256, nullptr);
-    fprintf(stderr, "%s() failed! [GetLastError() -> %lu] '%s'", funcname_, rc_, buf);
+        luaW_pushstring(L_, "%s() failed with code %d '%s'", _funcname.data(), _rc, _buf);
 #endif // PLATFORM_XBOX
-#ifdef _MSC_VER
+        raise_lua_error(L_);
-    __debugbreak(); // give a chance to the debugger!
+    }
-#endif              // _MSC_VER
-    abort();
 }
 #endif // HAVE_WIN32
 /*---=== Threading ===---*/
@@ -121,33 +139,35 @@ static int const gs_prio_remap[] = {
 // #################################################################################################
-void THREAD_SET_PRIORITY(int prio_, [[maybe_unused]] bool sudo_)
+std::pair<int, int> THREAD_NATIVE_PRIOS()
 {
-    // prio range [-3,+3] was checked by the caller
+    return std::make_pair(THREAD_PRIORITY_IDLE, THREAD_PRIORITY_TIME_CRITICAL);
-    if (!SetThreadPriority(GetCurrentThread(), gs_prio_remap[prio_ + 3])) {
-        FAIL("THREAD_SET_PRIORITY", GetLastError());
-    }
 }
 // #################################################################################################
-void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, [[maybe_unused]] bool sudo_)
+[[nodiscard]]
+void THREAD_SET_PRIORITY(lua_State* const L_, int const prio_, NativePrioFlag const native_, [[maybe_unused]] SudoFlag const sudo_)
 {
-    // prio range [-3,+3] was checked by the caller
+    // mapped prio range [-3,+3] was checked by the caller
-    // for some reason when building for mingw, native_handle() is an unsigned long long, but HANDLE is a void*
+    return Win32Invoke(L_, std::source_location::current().function_name(), SetThreadPriority, GetCurrentThread(), native_ ? prio_ : gs_prio_remap[prio_ + 3]);
-    // -> need a strong cast to make g++ happy
-    if (!SetThreadPriority(thread_.native_handle(), gs_prio_remap[prio_ + 3])) {
-        FAIL("THREAD_SET_PRIORITY", GetLastError());
-    }
 }
 // #################################################################################################
-void THREAD_SET_AFFINITY(unsigned int aff_)
+[[nodiscard]]
+void THREAD_SET_PRIORITY(lua_State* const L_, std::thread& thread_, int const prio_, NativePrioFlag const native_, [[maybe_unused]] SudoFlag const sudo_)
 {
-    if (!SetThreadAffinityMask(GetCurrentThread(), aff_)) {
+    // mapped prio range [-3,+3] was checked by the caller
-        FAIL("THREAD_SET_AFFINITY", GetLastError());
+    return Win32Invoke(L_, std::source_location::current().function_name(), SetThreadPriority, thread_.native_handle(), native_ ? prio_ : gs_prio_remap[prio_ + 3]);
-    }
+}
+// #################################################################################################
+[[nodiscard]]
+void THREAD_SET_AFFINITY(lua_State* const L_, unsigned int aff_)
+{
+    return Win32Invoke(L_, std::source_location::current().function_name(), SetThreadAffinityMask, GetCurrentThread(), aff_);
 }
 // #################################################################################################
@@ -215,24 +235,24 @@ static int pthread_attr_setschedpolicy(pthread_attr_t* attr, int policy)
 #endif // pthread_attr_setschedpolicy()
 #endif // defined(__MINGW32__) || defined(__MINGW64__)
-static void _PT_FAIL(int rc, const char* name, const char* file, int line)
+template <typename F, typename... ARGS>
+void PthreadInvoke(lua_State* const L_, std::string_view const& where_, F& f_, ARGS... args_)
 {
-    const char* why = (rc == EINVAL) ? "EINVAL" 
+    auto const _rc{ std::invoke(f_, std::forward<ARGS>(args_)...) };
-        : (rc == EBUSY)              ? "EBUSY"
+    if (_rc) {
-        : (rc == EPERM)              ? "EPERM"
+        std::string_view const _funcname{ StripFuncName(where_) };
-        : (rc == ENOMEM)             ? "ENOMEM"
-        : (rc == ESRCH)              ? "ESRCH"
+        char const* _why = (_rc == EINVAL) ? "EINVAL"
-        : (rc == ENOTSUP)            ? "ENOTSUP"
+            : (_rc == EBUSY)              ? "EBUSY"
-                                     : "<UNKNOWN>";
+            : (_rc == EPERM)              ? "EPERM"
-    fprintf(stderr, "%s %d: %s failed, %d %s\n", file, line, name, rc, why);
+            : (_rc == ENOMEM)             ? "ENOMEM"
-    abort();
+            : (_rc == ESRCH)              ? "ESRCH"
-}
+            : (_rc == ENOTSUP)            ? "ENOTSUP"
-#define PT_CALL(call) \
+                                          : "<UNKNOWN>";
-    { \
-        int rc = call; \
+        raise_luaL_error(L_, "%s() failed with code %s", _funcname.data(), _why);
-        if (rc != 0) \
-            _PT_FAIL(rc, #call, __FILE__, __LINE__); \
    }
+}
 // array of 7 thread priority values, hand-tuned by platform so that we offer a uniform [-3,+3] public priority range
 static int const gs_prio_remap[] = {
@@ -336,8 +356,8 @@ static int const gs_prio_remap[] = {
 //
 #define _PRIO_MODE SCHED_OTHER
 #define _PRIO_SCOPE PTHREAD_SCOPE_PROCESS
-#define _PRIO_HI 31
+#define _PRIO_HI 15
-#define _PRIO_0 15
+#define _PRIO_0 7
 #define _PRIO_LO 1
 #else
 #error "Unknown OS: not implemented!"
@@ -357,7 +377,18 @@ static int const gs_prio_remap[] = {
 #endif // _PRIO_0
 };
-void THREAD_SET_PRIORITY(int prio_, [[maybe_unused]] bool sudo_)
+// #################################################################################################
+std::pair<int, int> THREAD_NATIVE_PRIOS()
+{
+    int const _prio_min{ sched_get_priority_min(_PRIO_MODE) };
+    int const _prio_max{ sched_get_priority_max(_PRIO_MODE) };
+    return std::make_pair(_prio_min, _prio_max);
+}
+// #################################################################################################
+void THREAD_SET_PRIORITY(lua_State* const L_, int const prio_, NativePrioFlag const native_, [[maybe_unused]] SudoFlag const sudo_)
 {
 #ifdef PLATFORM_LINUX
    if (!sudo_) // only root-privileged process can change priorities
@@ -366,13 +397,13 @@ void THREAD_SET_PRIORITY(int prio_, [[maybe_unused]] bool sudo_)
    struct sched_param sp;
    // prio range [-3,+3] was checked by the caller
-    sp.sched_priority = gs_prio_remap[prio_ + 3];
+    sp.sched_priority = native_ ? prio_ : gs_prio_remap[prio_ + 3];
-    PT_CALL(pthread_setschedparam(pthread_self(), _PRIO_MODE, &sp));
+    PthreadInvoke(L_, std::source_location::current().function_name(), pthread_setschedparam, pthread_self(), _PRIO_MODE, &sp);
 }
 // #################################################################################################
-void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, [[maybe_unused]] bool sudo_)
+void THREAD_SET_PRIORITY(lua_State* const L_, std::thread& thread_, int const prio_, NativePrioFlag const native_, [[maybe_unused]] SudoFlag const sudo_)
 {
 #ifdef PLATFORM_LINUX
    if (!sudo_) // only root-privileged process can change priorities
@@ -381,28 +412,26 @@ void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, [[maybe_unused]] bool
    struct sched_param sp;
    // prio range [-3,+3] was checked by the caller
-    sp.sched_priority = gs_prio_remap[prio_ + 3];
+    sp.sched_priority = native_ ? prio_ : gs_prio_remap[prio_ + 3];
-    PT_CALL(pthread_setschedparam(thread_.native_handle(), _PRIO_MODE, &sp));
+    PthreadInvoke(L_, std::source_location::current().function_name(), pthread_setschedparam, thread_.native_handle(), _PRIO_MODE, &sp);
 }
 // #################################################################################################
 #ifdef __PROSPERO__
-void THREAD_SET_AFFINITY(unsigned int aff_)
+void THREAD_SET_AFFINITY(lua_State* const L_, unsigned int aff_)
 {
-    scePthreadSetaffinity(scePthreadSelf(), aff_);
+    PthreadInvoke(L_, std::source_location::current().function_name(), scePthreadSetaffinity, scePthreadSelf(), aff_);
 }
 #else // __PROSPERO__
-void THREAD_SET_AFFINITY(unsigned int aff_)
+void THREAD_SET_AFFINITY(lua_State* const L_, unsigned int aff_)
 {
 #if HAVE_WIN32 // "hybrid": Win32 API is available, and pthread too
    // since pthread_setaffinity_np can be missing (for example mingw), use win32 api instead
-    if (!SetThreadAffinityMask(GetCurrentThread(), aff_)) {
+    Win32Invoke(L_, std::source_location::current().function_name(), SetThreadAffinityMask, GetCurrentThread(), aff_);
-        FAIL("THREAD_SET_AFFINITY", GetLastError());
-    }
 #else // pure pthread
    int bit = 0;
 #ifdef __NetBSD__
@@ -422,12 +451,13 @@ void THREAD_SET_AFFINITY(unsigned int aff_)
        aff_ >>= 1;
    }
 #ifdef __ANDROID__
-    PT_CALL(sched_setaffinity(pthread_self(), sizeof(cpu_set_t), &cpuset));
+    
+    PthreadInvoke(L_, std::source_location::current().function_name(), sched_setaffinity, pthread_self(), sizeof(cpu_set_t), &cpuset);
 #elif defined(__NetBSD__)
-    PT_CALL(pthread_setaffinity_np(pthread_self(), cpuset_size(cpuset), cpuset));
+    PthreadInvoke(L_, std::source_location::current().function_name(), pthread_setaffinity_np, pthread_self(), cpuset_size(cpuset), cpuset);
    cpuset_destroy(cpuset);
 #else
-    PT_CALL(pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &cpuset));
+    PthreadInvoke(L_, std::source_location::current().function_name(), pthread_setaffinity_np, pthread_self(), sizeof(cpu_set_t), &cpuset);
 #endif
 #endif // PLATFORM_MINGW
 }
@@ -447,7 +477,7 @@ void THREAD_SETNAME(std::string_view const& name_)
 void THREAD_SETNAME(std::string_view const& name_)
 {
-    // exact API to set the thread name is platform-dependant
+    // exact API to set the thread name is platform-dependent
    // if you need to fix the build, or if you know how to fill a hole, tell me (bnt.germain@gmail.com) so that I can submit the fix in github.
 #if defined PLATFORM_MINGW
    pthread_setname_np(pthread_self(), name_.data());
diff --git a/src/threading.hpp b/src/threading.hpp
index 912c28f..07c1ab3 100644
--- a/src/threading.hpp
+++ b/src/threading.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "platform.h"
+#include "unique.hpp"
 #define THREADAPI_WINDOWS 1
 #define THREADAPI_PTHREAD 2
@@ -73,8 +74,15 @@ static constexpr int kThreadPrioMax{ +3 };
 // #################################################################################################
 // #################################################################################################
+DECLARE_UNIQUE_TYPE(SudoFlag, bool);
+DECLARE_UNIQUE_TYPE(NativePrioFlag, bool);
+std::pair<int, int> THREAD_NATIVE_PRIOS();
 void THREAD_SETNAME(std::string_view const& name_);
-void THREAD_SET_PRIORITY(int prio_, bool sudo_);
-void THREAD_SET_AFFINITY(unsigned int aff_);
-void THREAD_SET_PRIORITY(std::thread& thread_, int prio_, bool sudo_);
+void THREAD_SET_PRIORITY(lua_State* L_, int prio_, NativePrioFlag native_, SudoFlag sudo_);
+void THREAD_SET_AFFINITY(lua_State* L_, unsigned int aff_);
+void THREAD_SET_PRIORITY(lua_State* L_, std::thread& thread_, int prio_, NativePrioFlag native_, SudoFlag sudo_);
diff --git a/src/tools.cpp b/src/tools.cpp
index cbfefb0..cd1c593 100644
--- a/src/tools.cpp
+++ b/src/tools.cpp
@@ -45,13 +45,29 @@ static constexpr RegistryUniqueKey kLookupCacheRegKey{ 0x9BF75F84E54B691Bull };
 // #################################################################################################
-static constexpr int kWriterReturnCode{ 666 };
+namespace {
-[[nodiscard]]
+    namespace local {
-static int dummy_writer([[maybe_unused]] lua_State* const L_, [[maybe_unused]] void const* p_, [[maybe_unused]] size_t sz_, [[maybe_unused]] void* ud_)
+        static int buf_writer([[maybe_unused]] lua_State* const L_, void const* b_, size_t size_, void* ud_)
-{
+        {
-    // always fail with this code
+            auto* const _B{ static_cast<luaL_Buffer*>(ud_) };
-    return kWriterReturnCode;
+            if (b_ && size_) {
-}
+                luaL_addlstring(_B, static_cast<char const*>(b_), size_);
+            }
+            return 0;
+        }
+        static constexpr int kWriterReturnCode{ 666 };
+        [[nodiscard]]
+        static int dummy_writer([[maybe_unused]] lua_State* const L_, [[maybe_unused]] void const* p_, [[maybe_unused]] size_t sz_, [[maybe_unused]] void* ud_)
+        {
+            // always fail with this code
+            return kWriterReturnCode;
+        }
+    } // namespace local
+} // namespace
+// #################################################################################################
 /*
 * differentiation between C, bytecode and JIT-fast functions
@@ -59,30 +75,28 @@ static int dummy_writer([[maybe_unused]] lua_State* const L_, [[maybe_unused]] v
 *                   +-------------------+------------+----------+
 *                   |      bytecode     | C function | JIT-fast |
 * +-----------------+-------------------+------------+----------+
- * | lua_topointer   |                   |            |          |
+ * | lua_tocfunction |      nullptr      |  <some p>  |  nullptr |
 * +-----------------+-------------------+------------+----------+
- * | lua_tocfunction |      nullptr      |            |  nullptr |
+ * | luaW_dump       | kWriterReturnCode |  1         |  1       |
- * +-----------------+-------------------+------------+----------+
- * | luaG_dump       | kWriterReturnCode |  1         |  1       |
 * +-----------------+-------------------+------------+----------+
 */
 [[nodiscard]]
-FuncSubType luaG_getfuncsubtype(lua_State* const L_, StackIndex const i_)
+FuncSubType luaW_getfuncsubtype(lua_State* const L_, StackIndex const i_)
 {
    if (lua_tocfunction(L_, i_)) { // nullptr for LuaJIT-fast && bytecode functions
        return FuncSubType::Native;
    }
-    // luaG_dump expects the function at the top of the stack
+    // luaW_dump expects the function at the top of the stack
-    int const _popCount{ (luaG_absindex(L_, i_) == lua_gettop(L_)) ? 0 : (lua_pushvalue(L_, i_), 1) };
+    int const _popCount{ (luaW_absindex(L_, i_) == lua_gettop(L_)) ? 0 : (lua_pushvalue(L_, i_), 1) };
    // here we either have a Lua bytecode or a LuaJIT-compiled function
-    int const _dumpres{ luaG_dump(L_, dummy_writer, nullptr, 0) };
+    int const _dumpres{ luaW_dump(L_, local::dummy_writer, nullptr, 0) };
    if (_popCount > 0) {
        lua_pop(L_, _popCount);
    }
-    if (_dumpres == kWriterReturnCode) {
+    if (_dumpres == local::kWriterReturnCode) {
-        // anytime we get kWriterReturnCode, this means that luaG_dump() attempted a dump
+        // anytime we get kWriterReturnCode, this means that luaW_dump() attempted a dump
        return FuncSubType::Bytecode;
    }
    // we didn't try to dump, therefore this is a LuaJIT-fast function
@@ -92,7 +106,6 @@ FuncSubType luaG_getfuncsubtype(lua_State* const L_, StackIndex const i_)
 // #################################################################################################
 namespace tools {
    // inspired from tconcat() in ltablib.c
    [[nodiscard]]
    std::string_view PushFQN(lua_State* const L_, StackIndex const t_)
@@ -115,9 +128,23 @@ namespace tools {
        // &b is popped at that point (-> replaced by the result)
        luaL_pushresult(&_b);                                                                      // L_: ... {} ... "<result>"
        STACK_CHECK(L_, 1);
-        return luaG_tostring(L_, kIdxTop);
+        return luaW_tostring(L_, kIdxTop);
    }
+    // #############################################################################################
+    void PushFunctionBytecode(SourceState const L1_, DestState const L2_, int const strip_)
+    {
+        luaL_Buffer B{};
+        STACK_CHECK_START_REL(L1_, 0);
+        STACK_CHECK_START_REL(L2_, 0);
+        STACK_GROW(L2_, 2);
+        luaL_buffinit(L2_, &B);                                                                    // L1_: ... f                                     L2_: ... <B stuff>
+        luaW_dump(L1_, local::buf_writer, &B, strip_);
+        luaL_pushresult(&B);                                                                       //                                                L2_: ... "<bytecode>"
+        STACK_CHECK(L2_, 1);
+        STACK_CHECK(L1_, 0);
+    }
 } // namespace tools
 // #################################################################################################
@@ -145,10 +172,10 @@ static void update_lookup_entry(lua_State* const L_, StackIndex const ctxBase_,
    // first, raise an error if the function is already known
    lua_pushvalue(L_, -1);                                                                         // L_: ... {bfc} k o o
    lua_rawget(L_, _dest);                                                                         // L_: ... {bfc} k o name?
-    std::string_view const _prevName{ luaG_tostring(L_, kIdxTop) }; // nullptr if we got nil (first encounter of this object)
+    std::string_view const _prevName{ luaW_tostring(L_, kIdxTop) }; // nullptr if we got nil (first encounter of this object)
    // push name in fqn stack (note that concatenation will crash if name is a not string or a number)
    lua_pushvalue(L_, -3);                                                                         // L_: ... {bfc} k o name? k
-    LUA_ASSERT(L_, luaG_type(L_, kIdxTop) == LuaType::NUMBER || luaG_type(L_, kIdxTop) == LuaType::STRING);
+    LUA_ASSERT(L_, luaW_type(L_, kIdxTop) == LuaType::NUMBER || luaW_type(L_, kIdxTop) == LuaType::STRING);
    TableIndex const _deeper{ depth_ + 1 };
    lua_rawseti(L_, _fqn, _deeper);                                                                // L_: ... {bfc} k o name?
    // generate name
@@ -161,7 +188,7 @@ static void update_lookup_entry(lua_State* const L_, StackIndex const ctxBase_,
    // Therefore, when we encounter an object for which a name was previously registered, we need to select a single name
    // based on some sorting order so that we end up with the same name in all databases whatever order the table walk yielded
    if (!_prevName.empty() && ((_prevName.size() < _newName.size()) || (_prevName <= _newName))) {
-        DEBUGSPEW_CODE(DebugSpew(_U) << luaG_typename(L_, StackIndex{ -3 }) << " '" << _newName << "' remains named '" << _prevName << "'" << std::endl);
+        DEBUGSPEW_CODE(DebugSpew(_U) << luaW_typename(L_, StackIndex{ -3 }) << " '" << _newName << "' remains named '" << _prevName << "'" << std::endl);
        // the previous name is 'smaller' than the one we just generated: keep it!
        lua_pop(L_, 3);                                                                            // L_: ... {bfc} k
    } else {
@@ -175,7 +202,7 @@ static void update_lookup_entry(lua_State* const L_, StackIndex const ctxBase_,
        } else {
            lua_remove(L_, -2);                                                                    // L_: ... {bfc} k o "f.q.n"
        }
-        DEBUGSPEW_CODE(DebugSpew(_U) << luaG_typename(L_, StackIndex{ -2 }) << " '" << _newName << "'" << std::endl);
+        DEBUGSPEW_CODE(DebugSpew(_U) << luaW_typename(L_, StackIndex{ -2 }) << " '" << _newName << "'" << std::endl);
        // prepare the stack for database feed
        lua_pushvalue(L_, -1);                                                                     // L_: ... {bfc} k o "f.q.n" "f.q.n"
        lua_pushvalue(L_, -3);                                                                     // L_: ... {bfc} k o "f.q.n" "f.q.n" o
@@ -210,7 +237,7 @@ static void populate_lookup_table_recur(lua_State* const L_, StackIndex const db
    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: ... {i_}
    // if object is a userdata, replace it by its metatable
-    if (luaG_type(L_, i_) == LuaType::USERDATA) {
+    if (luaW_type(L_, i_) == LuaType::USERDATA) {
        lua_getmetatable(L_, i_);                                                                  // L_: ... {i_} mt
        lua_replace(L_, i_);                                                                       // L_: ... {i_}
    }
@@ -239,7 +266,7 @@ static void populate_lookup_table_recur(lua_State* const L_, StackIndex const db
    lua_pushnil(L_);                                                                               // L_: ... {i_} {bfc} nil
    while (lua_next(L_, i_) != 0) {                                                                // L_: ... {i_} {bfc} k v
        // just for debug, not actually needed
-        // std::string_view const _key{ (luaG_type(L_, -2) == LuaType::STRING) ? luaG_tostring(L_, -2) : "not a string" };
+        // std::string_view const _key{ (luaW_type(L_, -2) == LuaType::STRING) ? luaW_tostring(L_, -2) : "not a string" };
        // subtable: process it recursively
        if (lua_istable(L_, kIdxTop)) {                                                            // L_: ... {i_} {bfc} k {}
            // increment visit count to make sure we will actually scan it at this recursive level
@@ -256,11 +283,11 @@ static void populate_lookup_table_recur(lua_State* const L_, StackIndex const db
            lua_rawset(L_, _breadthFirstCache);                                                    // L_: ... {i_} {bfc} k {}
            // generate a name, and if we already had one name, keep whichever is the shorter
            update_lookup_entry(L_, dbIdx_, depth_);                                               // L_: ... {i_} {bfc} k
-        } else if (lua_isfunction(L_, kIdxTop) && (luaG_getfuncsubtype(L_, kIdxTop) != FuncSubType::Bytecode)) {
+        } else if (lua_isfunction(L_, kIdxTop) && (luaW_getfuncsubtype(L_, kIdxTop) != FuncSubType::Bytecode)) {
            // generate a name, and if we already had one name, keep whichever is the shorter
            // this pops the function from the stack
            update_lookup_entry(L_, dbIdx_, depth_);                                               // L_: ... {i_} {bfc} k
-        } else if (luaG_type(L_, kIdxTop) == LuaType::USERDATA) {
+        } else if (luaW_type(L_, kIdxTop) == LuaType::USERDATA) {
            // generate a name, and if we already had one name, keep whichever is the shorter
            // this pops the userdata from the stack
            update_lookup_entry(L_, dbIdx_, depth_);                                               // L_: ... {i_} {bfc} k
@@ -273,13 +300,13 @@ static void populate_lookup_table_recur(lua_State* const L_, StackIndex const db
    TableIndex const _deeper{ depth_ + 1 };
    lua_pushnil(L_);                                                                               // L_: ... {i_} {bfc} nil
    while (lua_next(L_, _breadthFirstCache) != 0) {                                                // L_: ... {i_} {bfc} k {}
-        DEBUGSPEW_CODE(std::string_view const _key{ (luaG_type(L_, StackIndex{ -2 }) == LuaType::STRING) ? luaG_tostring(L_, StackIndex{ -2 }) : std::string_view{ "<not a string>" } });
+        DEBUGSPEW_CODE(std::string_view const _key{ (luaW_type(L_, StackIndex{ -2 }) == LuaType::STRING) ? luaW_tostring(L_, StackIndex{ -2 }) : std::string_view{ "<not a string>" } });
        DEBUGSPEW_CODE(DebugSpew(_U) << "table '"<< _key <<"'" << std::endl);
        DEBUGSPEW_CODE(DebugSpewIndentScope _scope2{ _U });
        // un-visit this table in case we do need to process it
        lua_pushvalue(L_, -1);                                                                     // L_: ... {i_} {bfc} k {} {}
        lua_rawget(L_, _cache);                                                                    // L_: ... {i_} {bfc} k {} n
-        LUA_ASSERT(L_, luaG_type(L_, kIdxTop) == LuaType::NUMBER);
+        LUA_ASSERT(L_, luaW_type(L_, kIdxTop) == LuaType::NUMBER);
        _visit_count = lua_tointeger(L_, -1) - 1;
        lua_pop(L_, 1);                                                                            // L_: ... {i_} {bfc} k {}
        lua_pushvalue(L_, -1);                                                                     // L_: ... {i_} {bfc} k {} {}
@@ -312,7 +339,7 @@ namespace tools {
    // create a "fully.qualified.name" <-> function equivalence database
    void PopulateFuncLookupTable(lua_State* const L_, StackIndex const i_, std::string_view const& name_)
    {
-        StackIndex const _in_base{ luaG_absindex(L_, i_) };
+        StackIndex const _in_base{ luaW_absindex(L_, i_) };
        DEBUGSPEW_CODE(Universe* _U = Universe::Get(L_));
        std::string_view _name{ name_.empty() ? std::string_view{} : name_ };
        DEBUGSPEW_CODE(DebugSpew(_U) << L_ << ": PopulateFuncLookupTable('" << _name << "')" << std::endl);
@@ -323,24 +350,24 @@ namespace tools {
        StackIndex const _dbIdx{ lua_gettop(L_) };
        STACK_CHECK(L_, 1);
        LUA_ASSERT(L_, lua_istable(L_, -1));
-        LuaType const _moduleType{ luaG_type(L_, _in_base) };
+        LuaType const _moduleType{ luaW_type(L_, _in_base) };
        if ((_moduleType == LuaType::FUNCTION) || (_moduleType == LuaType::USERDATA)) { // for example when a module is a simple function
            if (_name.empty()) {
                _name = "nullptr";
            }
            lua_pushvalue(L_, _in_base);                                                           // L_: {} f
-            luaG_pushstring(L_, _name);                                                            // L_: {} f name_
+            luaW_pushstring(L_, _name);                                                            // L_: {} f name_
            lua_rawset(L_, -3);                                                                    // L_: {}
-            luaG_pushstring(L_, _name);                                                            // L_: {} name_
+            luaW_pushstring(L_, _name);                                                            // L_: {} name_
            lua_pushvalue(L_, _in_base);                                                           // L_: {} name_ f
            lua_rawset(L_, -3);                                                                    // L_: {}
            lua_pop(L_, 1);                                                                        // L_:
-        } else if (luaG_type(L_, _in_base) == LuaType::TABLE) {
+        } else if (luaW_type(L_, _in_base) == LuaType::TABLE) {
            lua_newtable(L_);                                                                      // L_: {} {fqn}
            TableIndex _startDepth{ 0 };
            if (!_name.empty()) {
                STACK_CHECK(L_, 2);
-                luaG_pushstring(L_, _name);                                                        // L_: {} {fqn} "name"
+                luaW_pushstring(L_, _name);                                                        // L_: {} {fqn} "name"
                // generate a name, and if we already had one name, keep whichever is the shorter
                lua_pushvalue(L_, _in_base);                                                       // L_: {} {fqn} "name" t
                update_lookup_entry(L_, _dbIdx, _startDepth);                                      // L_: {} {fqn} "name"
@@ -355,7 +382,7 @@ namespace tools {
            lua_pop(L_, 3);                                                                        // L_:
        } else {
            lua_pop(L_, 1);                                                                        // L_:
-            raise_luaL_error(L_, "unsupported module type %s", luaG_typename(L_, _in_base).data());
+            raise_luaL_error(L_, "unsupported module type %s", luaW_typename(L_, _in_base).data());
        }
        STACK_CHECK(L_, 0);
    }
@@ -373,7 +400,7 @@ namespace tools {
            +[](lua_State* L_)
            {
                int const _args{ lua_gettop(L_) };                                                 // L_: args...
-                //[[maybe_unused]] std::string_view const _modname{ luaG_checkstring(L_, 1) };
+                //[[maybe_unused]] std::string_view const _modname{ luaW_checkstring(L_, 1) };
                STACK_GROW(L_, 1);
diff --git a/src/tools.hpp b/src/tools.hpp
index 420b5f8..c555344 100644
--- a/src/tools.hpp
+++ b/src/tools.hpp
@@ -21,7 +21,7 @@ enum class [[nodiscard]] FuncSubType
 };
 [[nodiscard]]
-FuncSubType luaG_getfuncsubtype(lua_State* L_, StackIndex i_);
+FuncSubType luaW_getfuncsubtype(lua_State* L_, StackIndex i_);
 // #################################################################################################
@@ -37,5 +37,6 @@ namespace tools {
    void PopulateFuncLookupTable(lua_State* L_, StackIndex i_, std::string_view const& name_);
    [[nodiscard]]
    std::string_view PushFQN(lua_State* L_, StackIndex t_);
+    void PushFunctionBytecode(SourceState L1_, DestState L2_, int strip_);
    void SerializeRequire(lua_State* L_);
 } // namespace tools
diff --git a/src/tracker.cpp b/src/tracker.cpp
index 8b06522..34866dd 100644
--- a/src/tracker.cpp
+++ b/src/tracker.cpp
@@ -96,7 +96,7 @@ int LaneTracker::pushThreadsTable(lua_State* L_) const
        while (_lane != TRACKING_END) {
            // insert a { name='<name>', status='<status>' } tuple, so that several lanes with the same name can't clobber each other
            lua_createtable(L_, 0, 2);                                                             // L_: {} {}
-            luaG_pushstring(L_, _lane->getDebugName());                                            // L_: {} {} "name"
+            luaW_pushstring(L_, _lane->getDebugName());                                            // L_: {} {} "name"
            lua_setfield(L_, -2, "name");                                                          // L_: {} {}
            _lane->pushStatusString(L_);                                                           // L_: {} {} "<status>"
            lua_setfield(L_, -2, "status");                                                        // L_: {} {}
diff --git a/src/uniquekey.hpp b/src/uniquekey.hpp
index 4c9eb58..ace21c4 100644
--- a/src/uniquekey.hpp
+++ b/src/uniquekey.hpp
@@ -80,7 +80,7 @@ class RegistryUniqueKey final
        STACK_GROW(L_, 1);
        STACK_CHECK_START_REL(L_, 0);
        pushValue(L_);                                                                             // L_: ... {}|nil
-        T* const value{ luaG_tolightuserdata<T>(L_, kIdxTop) };
+        T* const value{ luaW_tolightuserdata<T>(L_, kIdxTop) };
        lua_pop(L_, 1);                                                                            // L_: ...
        STACK_CHECK(L_, 0);
        return value;
@@ -125,8 +125,8 @@ class RegistryUniqueKey final
            if (!mode_.empty()) {
                STACK_GROW(L_, 3);
                lua_createtable(L_, 0, 1);                                                         // L_: {} mt
-                luaG_pushstring(L_, "__mode");                                                     // L_: {} mt "__mode"
+                luaW_pushstring(L_, "__mode");                                                     // L_: {} mt "__mode"
-                luaG_pushstring(L_, mode_);                                                        // L_: {} mt "__mode" mode
+                luaW_pushstring(L_, mode_);                                                        // L_: {} mt "__mode" mode
                lua_rawset(L_, -3);                                                                // L_: {} mt
                lua_setmetatable(L_, -2);                                                          // L_: {}
            }
diff --git a/src/universe.cpp b/src/universe.cpp
index 335f056..4db036b 100644
--- a/src/universe.cpp
+++ b/src/universe.cpp
@@ -51,6 +51,16 @@ static constexpr RegistryUniqueKey kUniverseFullRegKey{ 0x1C2D76870DD9DD9Full };
 // #################################################################################################
+[[nodiscard]]
+void* ProtectedAllocator::Protected_lua_Alloc(void* const ud_, void* const ptr_, size_t const osize_, size_t const nsize_)
+{
+    ProtectedAllocator* const _allocator{ static_cast<ProtectedAllocator*>(ud_) };
+    std::lock_guard<std::mutex> _guard{ _allocator->mutex };
+    return _allocator->alloc(ptr_, osize_, nsize_);
+}
+// #################################################################################################
 Universe::Universe()
 {
    //---
@@ -101,18 +111,18 @@ void Universe::callOnStateCreate(lua_State* const L_, lua_State* const from_, Lo
        }
        kConfigRegKey.pushValue(L_);                                                               // L_: config
        STACK_CHECK(L_, 1);
-        LuaType const _funcType{ luaG_getfield(L_, kIdxTop, kOnStateCreate) };                     // L_: config on_state_create()
+        LuaType const _funcType{ luaW_getfield(L_, kIdxTop, kOnStateCreate) };                     // L_: config on_state_create()
        if (_funcType != LuaType::FUNCTION) {
-            raise_luaL_error(L_, "INTERNAL ERROR: %s is a %s, not a function", kOnStateCreate.data(), luaG_typename(L_, _funcType).data());
+            raise_luaL_error(L_, "INTERNAL ERROR: %s is a %s, not a function", kOnStateCreate.data(), luaW_typename(L_, _funcType).data());
        }
        lua_remove(L_, -2);                                                                        // L_: on_state_create()
    }
    STACK_CHECK(L_, 1);
    // capture error and raise it in caller state
    std::string_view const _stateType{ mode_ == LookupMode::LaneBody ? "lane" : "keeper" };
-    luaG_pushstring(L_, _stateType);                                                               // L_: on_state_create() "<type>"
+    luaW_pushstring(L_, _stateType);                                                               // L_: on_state_create() "<type>"
    if (lua_pcall(L_, 1, 0, 0) != LUA_OK) {
-        raise_luaL_error(from_, "%s failed in %s: \"%s\"", kOnStateCreate.data(), _stateType.data(), lua_isstring(L_, -1) ? luaG_tostring(L_, kIdxTop).data() : luaG_typename(L_, kIdxTop).data());
+        raise_luaL_error(from_, "%s failed in %s: \"%s\"", kOnStateCreate.data(), _stateType.data(), lua_isstring(L_, -1) ? luaW_tostring(L_, kIdxTop).data() : luaW_typename(L_, kIdxTop).data());
    }
    STACK_CHECK(L_, 0);
 }
@@ -127,14 +137,14 @@ Universe* Universe::Create(lua_State* const L_)
    static constexpr StackIndex kIdxSettings{ 1 };
    LUA_ASSERT(L_, lua_gettop(L_) == 1 && lua_istable(L_, 1));
    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: settings
-    std::ignore = luaG_getfield(L_, kIdxSettings, "nb_user_keepers");                              // L_: settings nb_user_keepers
+    std::ignore = luaW_getfield(L_, kIdxSettings, "nb_user_keepers");                              // L_: settings nb_user_keepers
    int const _nbUserKeepers{ static_cast<int>(lua_tointeger(L_, -1)) + 1};
    lua_pop(L_, 1);                                                                                // L_: settings
    if (_nbUserKeepers < 1) {
        raise_luaL_error(L_, "Bad number of additional keepers (%d)", _nbUserKeepers);
    }
    STACK_CHECK(L_, 0);
-    std::ignore = luaG_getfield(L_, kIdxSettings, "keepers_gc_threshold");                         // L_: settings keepers_gc_threshold
+    std::ignore = luaW_getfield(L_, kIdxSettings, "keepers_gc_threshold");                         // L_: settings keepers_gc_threshold
    int const _keepers_gc_threshold{ static_cast<int>(lua_tointeger(L_, -1)) };
    lua_pop(L_, 1);                                                                                // L_: settings
    STACK_CHECK(L_, 0);
@@ -147,30 +157,30 @@ Universe* Universe::Create(lua_State* const L_)
    DEBUGSPEW_CODE(DebugSpewIndentScope _scope{ _U });
    lua_createtable(L_, 0, 1);                                                                     // L_: settings universe {mt}
-    std::ignore = luaG_getfield(L_, kIdxSettings, "shutdown_timeout");                             // L_: settings universe {mt} shutdown_timeout
+    std::ignore = luaW_getfield(L_, kIdxSettings, "shutdown_timeout");                             // L_: settings universe {mt} shutdown_timeout
    lua_pushcclosure(L_, UniverseGC, 1);                                                           // L_: settings universe {mt} UniverseGC
    lua_setfield(L_, -2, "__gc");                                                                  // L_: settings universe {mt}
    lua_setmetatable(L_, -2);                                                                      // L_: settings universe
    lua_pop(L_, 1);                                                                                // L_: settings
-    std::ignore = luaG_getfield(L_, kIdxSettings, "linda_wake_period");                            // L_: settings linda_wake_period
+    std::ignore = luaW_getfield(L_, kIdxSettings, "linda_wake_period");                            // L_: settings linda_wake_period
-    if (luaG_type(L_, kIdxTop) == LuaType::NUMBER) {
+    if (luaW_type(L_, kIdxTop) == LuaType::NUMBER) {
        _U->lindaWakePeriod = lua_Duration{ lua_tonumber(L_, kIdxTop) };
    } else {
-        LUA_ASSERT(L_, luaG_tostring(L_, kIdxTop) == "never");
+        LUA_ASSERT(L_, luaW_tostring(L_, kIdxTop) == "never");
    }
    lua_pop(L_, 1);                                                                                // L_: settings
-    std::ignore = luaG_getfield(L_, kIdxSettings, "strip_functions");                              // L_: settings strip_functions
+    std::ignore = luaW_getfield(L_, kIdxSettings, "strip_functions");                              // L_: settings strip_functions
    _U->stripFunctions = lua_toboolean(L_, -1) ? true : false;
    lua_pop(L_, 1);                                                                                // L_: settings
-    std::ignore = luaG_getfield(L_, kIdxSettings, "verbose_errors");                               // L_: settings verbose_errors
+    std::ignore = luaW_getfield(L_, kIdxSettings, "verbose_errors");                               // L_: settings verbose_errors
    _U->verboseErrors = lua_toboolean(L_, -1) ? true : false;
    lua_pop(L_, 1);                                                                                // L_: settings
    // tracking
-    std::ignore = luaG_getfield(L_, kIdxSettings, "track_lanes");                                  // L_: settings track_lanes
+    std::ignore = luaW_getfield(L_, kIdxSettings, "track_lanes");                                  // L_: settings track_lanes
    if (lua_toboolean(L_, -1)) {
        _U->tracker.activate();
    }
@@ -178,8 +188,8 @@ Universe* Universe::Create(lua_State* const L_)
    // Linked chains handling
    _U->selfdestructFirst = SELFDESTRUCT_END;
-    _U->initializeAllocatorFunction(L_);
+    _U->initializeAllocatorFunction(L_); // this can raise an error
-    _U->initializeOnStateCreate(L_);
+    _U->initializeOnStateCreate(L_); // this can raise an error
    _U->keepers.initialize(*_U, L_, static_cast<size_t>(_nbUserKeepers), _keepers_gc_threshold);
    STACK_CHECK(L_, 0);
@@ -207,7 +217,7 @@ static void* libc_lua_Alloc([[maybe_unused]] void* const ud_, [[maybe_unused]] v
 // #################################################################################################
 [[nodiscard]]
-static int luaG_provide_protected_allocator(lua_State* const L_)
+static int luaW_provide_protected_allocator(lua_State* const L_)
 {
    Universe* const _U{ Universe::Get(L_) };
    // push a new full userdata on the stack, giving access to the universe's protected allocator
@@ -217,9 +227,9 @@ static int luaG_provide_protected_allocator(lua_State* const L_)
 // #################################################################################################
+// already called under protection of selfdestructMutex
 void Universe::flagDanglingLanes() const
 {
-    std::lock_guard<std::mutex> _guard{ selfdestructMutex };
    Lane* _lane{ selfdestructFirst };
    while (_lane != SELFDESTRUCT_END) {
        _lane->flaggedAfterUniverseGC.store(true, std::memory_order_relaxed);
@@ -235,17 +245,17 @@ void Universe::initializeAllocatorFunction(lua_State* const L_)
    // start by just grabbing whatever allocator was provided to the master state
    protectedAllocator.initFrom(L_);
    STACK_CHECK_START_REL(L_, 1);                                                                  // L_: settings
-    switch (luaG_getfield(L_, kIdxTop, "allocator")) {                                             // L_: settings allocator|nil|"protected"
+    switch (luaW_getfield(L_, kIdxTop, "allocator")) {                                             // L_: settings allocator|nil|"protected"
    case LuaType::NIL:
        // nothing else to do
        break;
    case LuaType::STRING:
-        LUA_ASSERT(L_, luaG_tostring(L_, kIdxTop) == "protected");
+        LUA_ASSERT(L_, luaW_tostring(L_, kIdxTop) == "protected");
        // set the original allocator to call from inside protection by the mutex
        protectedAllocator.installIn(L_);
        // before a state is created, this function will be called to obtain the allocator
-        provideAllocator = luaG_provide_protected_allocator;
+        provideAllocator = luaW_provide_protected_allocator;
        break;
    case LuaType::FUNCTION:
@@ -266,14 +276,14 @@ void Universe::initializeAllocatorFunction(lua_State* const L_)
        break;
    default: // should be filtered out in lanes.lua
-        raise_luaL_error(L_, "Bad config.allocator type %s", luaG_typename(L_, kIdxTop).data());
+        raise_luaL_error(L_, "Bad config.allocator type %s", luaW_typename(L_, kIdxTop).data());
    }
    lua_pop(L_, 1);                                                                                // L_: settings
    STACK_CHECK(L_, 1);
-    std::ignore = luaG_getfield(L_, kIdxTop, "internal_allocator");                                // L_: settings "libc"|"allocator"
+    std::ignore = luaW_getfield(L_, kIdxTop, "internal_allocator");                                // L_: settings "libc"|"allocator"
    LUA_ASSERT(L_, lua_isstring(L_, kIdxTop)); // should be the case due to lanes.lua parameter validation
-    std::string_view const _allocator{ luaG_tostring(L_, kIdxTop) };
+    std::string_view const _allocator{ luaW_tostring(L_, kIdxTop) };
    // use whatever the provider provides. This performs validation of what provideAllocator is giving
    // we do this even if _allocator == "libc", to have the validation part
    internalAllocator = resolveAndValidateAllocator(L_, "internal");
@@ -295,7 +305,7 @@ int Universe::InitializeFinalizer(lua_State* const L_)
    // make sure we are only called from the Master Lua State!
    kUniverseFullRegKey.pushValue(L_);                                                             // L_: f U
-    if (luaG_type(L_, kIdxTop) != LuaType::USERDATA) {
+    if (luaW_type(L_, kIdxTop) != LuaType::USERDATA) {
        raise_luaL_error(L_, "lanes.%s called from inside a lane", kFinally);
    }
    lua_pop(L_, 1);                                                                                // L_: f
@@ -311,8 +321,8 @@ int Universe::InitializeFinalizer(lua_State* const L_)
 void Universe::initializeOnStateCreate(lua_State* const L_)
 {
    STACK_CHECK_START_REL(L_, 0);                                                                  // L_: settings
-    if (luaG_getfield(L_, kIdxTop, kOnStateCreate) != LuaType::NIL) {                              // L_: settings on_state_create|nil
+    if (luaW_getfield(L_, kIdxTop, kOnStateCreate) != LuaType::NIL) {                              // L_: settings on_state_create|nil
-        LUA_ASSERT(L_, luaG_type(L_, kIdxTop) == LuaType::FUNCTION); // ensured by lanes.lua parameter validation
+        LUA_ASSERT(L_, luaW_type(L_, kIdxTop) == LuaType::FUNCTION); // ensured by lanes.lua parameter validation
        // store C function pointer in an internal variable
        lua_CFunction const _func{ lua_tocfunction(L_, -1) };                                      // L_: settings on_state_create
        if (_func) {
@@ -325,7 +335,7 @@ void Universe::initializeOnStateCreate(lua_State* const L_)
            // remove this C function from the config table so that it doesn't cause problems
            // when we transfer the config table in newly created Lua states
            lua_pushnil(L_);                                                                       // L_: settings on_state_create nil
-            luaG_setfield(L_, StackIndex{ -3 }, kOnStateCreate);                                   // L_: settings on_state_create
+            luaW_setfield(L_, StackIndex{ -3 }, kOnStateCreate);                                   // L_: settings on_state_create
        } else {
            // the function is still in the config table. we indicate this with the uintptr_t alternative (actual value is irrelevant)
            onStateCreateFunc.emplace<uintptr_t>(std::bit_cast<uintptr_t>(kOnStateCreate.data()));
@@ -348,7 +358,7 @@ lanes::AllocatorDefinition Universe::resolveAndValidateAllocator(lua_State* cons
    STACK_CHECK_START_REL(L_, 0); // here, we have a function we can call to obtain an allocator
    lua_pushcclosure(L_, provideAllocator, 0);                                                     // L_: provideAllocator()
-    luaG_pushstring(L_, hint_);                                                                    // L_: provideAllocator() "<hint>"
+    luaW_pushstring(L_, hint_);                                                                    // L_: provideAllocator() "<hint>"
    lua_call(L_, 1, 1);                                                                            // L_: result
    // make sure we have a valid AllocatorDefinition on the stack (an error is raised instead if it is not the case)
    _ret = lanes::AllocatorDefinition::Validated(L_, kIdxTop);
@@ -423,7 +433,7 @@ int Universe::UniverseGC(lua_State* const L_)
 {
    lua_Duration const _shutdown_timeout{ lua_tonumber(L_, lua_upvalueindex(1)) };
    STACK_CHECK_START_ABS(L_, 1);
-    Universe* const _U{ luaG_tofulluserdata<Universe>(L_, StackIndex{ 1 }) };                      // L_: U
+    Universe* const _U{ luaW_tofulluserdata<Universe>(L_, StackIndex{ 1 }) };                      // L_: U
    // attempt to terminate all lanes with increasingly stronger cancel methods
    bool const _allLanesTerminated{ 
@@ -437,7 +447,7 @@ int Universe::UniverseGC(lua_State* const L_)
    if (!lua_isnil(L_, -1)) {
        lua_pushboolean(L_, _allLanesTerminated);                                                  // L_: U finalizer bool
        // no protection. Lua rules for errors in finalizers apply normally:
-        // Lua 5.4: error is propagated in the warn system
+        // Lua 5.4+: error is propagated in the warn system
        // older: error is swallowed
        lua_call(L_, 1, 1);                                                                        // L_: U msg?
        // phew, no error in finalizer, since we reached that point
@@ -446,24 +456,31 @@ int Universe::UniverseGC(lua_State* const L_)
    if (lua_isnil(L_, kIdxTop)) {
        lua_pop(L_, 1);                                                                            // L_: U
        // no finalizer, or it returned no value: push some default message on the stack, in case it is necessary
-        luaG_pushstring(L_, "uncooperative lanes detected at shutdown");                           // L_: U "msg"
+        luaW_pushstring(L_, "uncooperative lanes detected at shutdown");                           // L_: U "msg"
    }
    STACK_CHECK(L_, 2);
-    // now, all remaining lanes are flagged. if they crash because we remove keepers and the Universe from under them, it is their fault
+    {
-    bool const _detectedUncooperativeLanes{ _U->selfdestructFirst != SELFDESTRUCT_END };
+        std::lock_guard<std::mutex> _guard{ _U->selfdestructMutex };
-    if (_detectedUncooperativeLanes) {
+        // now, all remaining lanes are flagged. if they crash because we remove keepers and the Universe from under them, it is their fault
-        _U->flagDanglingLanes();
+        bool const _detectedUncooperativeLanes{ _U->selfdestructFirst != SELFDESTRUCT_END };
-        if (luaG_tostring(L_, kIdxTop) == "freeze") {
+        if (_detectedUncooperativeLanes) {
-            std::this_thread::sleep_until(std::chrono::time_point<std::chrono::steady_clock>::max());
+            _U->flagDanglingLanes();
+            if (luaW_tostring(L_, kIdxTop) == "freeze") {
+                std::this_thread::sleep_until(std::chrono::time_point<std::chrono::steady_clock>::max());
+            } else {
+                // take the value returned by the finalizer (or our default message) and throw it as an error
+                // since we are inside Lua's GCTM, it will be propagated through the warning system (Lua 5.4) or swallowed silently
+                // IMPORTANT: lua_error() is used here instead of the wrapper raise_lua_error() to circumvent what looks like a MSVC compiler bug
+                // that manifests as a crash inside ntdll!longjmp() function, in optimized builds only
+                lua_error(L_);
+            }
        } else {
-            // take the value returned by the finalizer (or our default message) and throw it as an error
+            // we didn't use the error message, let's keep a clean stack
-            // since we are inside Lua's GCTM, it will be propagated through the warning system (Lua 5.4) or swallowed silently
+            lua_pop(L_, 1); // L_: U
-            // IMPORTANT: lua_error() is used here instead of the wrapper raise_lua_error() to circumvent what looks like a MSVC compiler bug
-            // that manifests as a crash inside ntdll!longjmp() function, in optimized builds only
-            lua_error(L_);
        }
    }
+    STACK_CHECK(L_, 1);
    // ---------------------------------------------------------
    // we don't reach that point if some lanes are still running
@@ -472,7 +489,9 @@ int Universe::UniverseGC(lua_State* const L_)
    // no need to mutex-protect this as all lanes in the universe are gone at that point
    Linda::DeleteTimerLinda(L_, std::exchange(_U->timerLinda, nullptr), PK);
-    _U->keepers.close();
+    if (!_U->keepers.close()) {
+        raise_luaL_error(L_, "INTERNAL ERROR: Keepers closed more than once");
+    }
    // remove the protected allocator, if any
    _U->protectedAllocator.removeFrom(L_);
diff --git a/src/universe.hpp b/src/universe.hpp
index 0c5e659..f781e92 100644
--- a/src/universe.hpp
+++ b/src/universe.hpp
@@ -4,6 +4,7 @@
 #include "cancel.hpp"
 #include "keeper.hpp"
 #include "lanesconf.h"
+#include "threading.hpp"
 #include "tracker.hpp"
 #include "uniquekey.hpp"
@@ -27,12 +28,7 @@ class ProtectedAllocator final
    std::mutex mutex;
    [[nodiscard]]
-    static void* protected_lua_Alloc(void* const ud_, void* const ptr_, size_t const osize_, size_t const nsize_)
+    static void* Protected_lua_Alloc(void* const ud_, void* const ptr_, size_t const osize_, size_t const nsize_);
-    {
-        ProtectedAllocator* const allocator{ static_cast<ProtectedAllocator*>(ud_) };
-        std::lock_guard<std::mutex> guard{ allocator->mutex };
-        return allocator->alloc(ptr_, osize_, nsize_);
-    }
    public:
    // we are not like our base class: we can't be created inside a full userdata (or we would have to install a metatable and __gc handler to destroy ourselves properly)
@@ -42,13 +38,13 @@ class ProtectedAllocator final
    AllocatorDefinition makeDefinition()
    {
-        return AllocatorDefinition{ protected_lua_Alloc, this };
+        return AllocatorDefinition{ Protected_lua_Alloc, this };
    }
    void installIn(lua_State* const L_) const
    {
        // install our replacement allocator function (this is a C function, we need to deconst ourselves)
-        lua_setallocf(L_, protected_lua_Alloc, static_cast<void*>(const_cast<ProtectedAllocator*>(this)));
+        lua_setallocf(L_, Protected_lua_Alloc, static_cast<void*>(const_cast<ProtectedAllocator*>(this)));
    }
    void removeFrom(lua_State* const L_) const
@@ -75,9 +71,9 @@ class Universe final
 #ifdef PLATFORM_LINUX
    // Linux needs to check, whether it's been run as root
-    bool const sudo{ geteuid() == 0 };
+    SudoFlag const sudo{ geteuid() == 0 };
 #else
-    bool const sudo{ false };
+    SudoFlag const sudo{ false };
 #endif // PLATFORM_LINUX
    // for verbose errors
@@ -132,7 +128,7 @@ class Universe final
    public:
    [[nodiscard]]
-    static void* operator new([[maybe_unused]] size_t const size_, lua_State* const L_) noexcept { return luaG_newuserdatauv<Universe>(L_, UserValueCount{ 0 }); };
+    static void* operator new([[maybe_unused]] size_t const size_, lua_State* const L_) noexcept { return luaW_newuserdatauv<Universe>(L_, UserValueCount{ 0 }); };
    // can't actually delete the operator because the compiler generates stack unwinding code that could call it in case of exception
    static void operator delete([[maybe_unused]] void* const p_, [[maybe_unused]] lua_State* const L_) {} // nothing to do, as nothing is allocated independently
diff --git a/tests/appendud.lua b/tests/appendud.lua
index f6f99c1..2a8c8ce 100644
--- a/tests/appendud.lua
+++ b/tests/appendud.lua
@@ -49,7 +49,7 @@ assert(not err)
 -- test
 -- print("t:join()")
 a,b,c = t[1],t[2],t[3]    -- Need to explicitly wait for the thread, since 'ipairs()' does not
--a,b,c = t:join()    -- Need to explicitly wait for the thread, since 'ipairs()' does not
+--r,a,b,c = t:join()    -- Need to explicitly wait for the thread, since 'ipairs()' does not
            -- value the '__index' metamethod (wouldn't it be cool if it did..?)
 print(a,b,c)
diff --git a/tests/basic.lua b/tests/basic.lua
index 9aaad97..f393175 100644
--- a/tests/basic.lua
+++ b/tests/basic.lua
@@ -507,19 +507,20 @@ local S = lanes.gen("table", { name = 'auto', gc_cb = gc_cb },
    return (unpack or table.unpack)(aux)
 end)
-h= S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
+h = S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
 -- wait a bit so that the lane has a chance to set its debug name
 SLEEP(0.5)
 print("joining with '" .. h:get_threadname() .. "'")
-local a,b,c,d= h:join()
+local r,a,b,c,d= h:join()
 if h.status == "error" then
-    print(h:get_threadname(), "error: " , a, b, c, d)
+    print(h:get_threadname(), "error: " , r, a, b, c, d)
 else
-    print(h:get_threadname(), a,b,c,d)
+    print(h:get_threadname(), r,a,b,c,d)
-    assert(a==14)
+    assert(r == true)
-    assert(b==13)
+    assert(a == 14)
-    assert(c==12)
+    assert(b == 13)
-    assert(d==nil)
+    assert(c == 12)
+    assert(d == nil)
 end
 local nameof_type, nameof_name = lanes.nameof(print)
diff --git a/tests/error.lua b/tests/error.lua
index 28cfff1..76ceea4 100644
--- a/tests/error.lua
+++ b/tests/error.lua
@@ -173,8 +173,7 @@ local do_error_catching_test = function(error_reporting_mode_, error_value_, fin
    local h = start_lane(error_reporting_mode_, error_value_, finalizer_, finalizer_error_value_)
    local ret,err,stack= h:join()   -- wait for the lane (no automatic error propagation)
    WR("Processing results for {", error_reporting_mode_, error_value_, finalizer_, finalizer_error_value_, "}")
-    if err then
+    if ret == nil then
-        assert(ret == nil)
        assert(error_reporting_mode_ == "minimal" or type(stack)=="table") -- only true if lane was configured with error_trace_level ~= "minimal"
        if err == error_value_ then
            WR("Lane regular error: ", err)
@@ -198,8 +197,8 @@ local do_error_catching_test = function(error_reporting_mode_, error_value_, fin
            end
        end
    else -- no error
-        assert(ret == "success")
+        assert(ret == true and err == "success")
-        WR("No error in lane: ", ret)
+        WR("No error in lane: ", err, ret)
    end
    WR "TEST OK"
 end
diff --git a/tests/finalizer.lua b/tests/finalizer.lua
index ac5ce8b..9fa12dc 100644
--- a/tests/finalizer.lua
+++ b/tests/finalizer.lua
@@ -77,8 +77,8 @@ local do_test = function(error_)
    local h = lgen(error_)
-    local _,err,stack = h:join()   -- wait for the lane (no automatic error propagation)
+    local r,err,stack = h:join()   -- wait for the lane (no automatic error propagation)
-    if err then
+    if not r then
        assert(stack, "no stack trace on error, check 'error_trace_level'")
        io.stderr:write( "Lane error: "..tostring(err).."\n" )
        io.stderr:write( "\t", table.concat(stack,"\t\n"), "\n" )
diff --git a/tests/func_is_string.lua b/tests/func_is_string.lua
index 5de4c60..3c91603 100644
--- a/tests/func_is_string.lua
+++ b/tests/func_is_string.lua
@@ -21,16 +21,17 @@ end
 local options = {globals = { b = 666 }}
-local gen1 = lanes.gen("*", { name = 'auto' }, "return true, dofile('fibonacci.lua')")
+local gen1 = lanes.gen("*", { name = 'auto' }, "return true, error('bob')")
-local gen2 = lanes.gen(options, { name = 'auto' }, "return b")
 fibLane = gen1()
 lanes.sleep(0.1)
 print(fibLane, fibLane.status)
-local _status, _err = fibLane:join()
+local _r, _err, _stk = fibLane:join()
-print(_status, _err)
+assert(_r == nil, "got " .. tostring(_r) .. " " .. tostring(_err) .. " " .. tostring(_stk))
-retLane1, retLane2 = gen2(), gen2()
+local gen2 = lanes.gen(options, { name = 'auto' }, "return b")
+local retLane1, retLane2 = gen2(), gen2()
 print( retLane1[1], retLane2[1])
-print "TEST OK"
-\ No newline at end of file
+assert(retLane1[1] == 666 and retLane2[1] == 666)
+print "TEST OK"
diff --git a/tests/irayo_closure.lua b/tests/irayo_closure.lua
index 705b85e..40c586d 100644
--- a/tests/irayo_closure.lua
+++ b/tests/irayo_closure.lua
@@ -5,7 +5,7 @@
 "Another issue I've noticed is trying to pass a table with a function
 that uses closures in it as a global variable into a new lane.  This
 causes a segmentation fault and it appears to be related to the
-luaG_inter_move function near line 835-836 or so in lanes.c, but I
+luaW_inter_move function near line 835-836 or so in lanes.c, but I
 haven't investigated further.
 e.g. { globals = { data = 1, func = function() useclosurehere() end } }"
 ]]
diff --git a/tests/launchtest.lua b/tests/launchtest.lua
index 57411e1..cdd6ffc 100644
--- a/tests/launchtest.lua
+++ b/tests/launchtest.lua
@@ -69,8 +69,8 @@ else
    io.stderr:write( N.." lanes launched.\n" )
    
    for i=1,N do
-        local rc= t[i]:join()
+        local r,rc = t[i]:join()
-        assert( rc==i )
+        assert( r == true and rc == i )
    end
    io.stderr:write( N.." lanes finished.\n" )
diff --git a/tests/linda_perf.lua b/tests/linda_perf.lua
index 83b8921..e68d552 100644
--- a/tests/linda_perf.lua
+++ b/tests/linda_perf.lua
@@ -56,7 +56,7 @@ local eater = function( l, loop)
        -- print "loop is over"
        key, val = l:receive( "done")
        print("eater: done ("..val..")")
-        return true
+        return "ate everything"
 end
 -- #################################################################################################
@@ -74,7 +74,7 @@ local gobbler = function( l, loop, batch)
        print "loop is over"
        key, val = l:receive( "done")
        print("gobbler: done ("..val..")")
-        return true
+        return "gobbled everything"
 end
 -- #################################################################################################
@@ -123,7 +123,8 @@ local function ziva1( preloop, loop, batch)
                end
        end
        l:send( "done" ,"are you happy?")
-        lane:join()
+        local r, ret = lane:join()
+        assert(r == true and type(ret) == "string", "got " .. tostring(r) .. " " .. tostring(ret))
        return lanes.now_secs() - t1
 end
diff --git a/tests/perftest.lua b/tests/perftest.lua
index fe43cca..35e164d 100644
--- a/tests/perftest.lua
+++ b/tests/perftest.lua
@@ -175,9 +175,9 @@ else
    -- Make sure all lanes finished
    --
    for i=1,N do
-        local tmp= t[i]:join()
+        local r, tmp = t[i]:join()
        -- this assert will trigger if you change M to values below 1000 in order to solve C stack overflow
-        assert( type(tmp)=="table" and tmp[1]==2 and tmp[168]==997 )
+        assert( r == true and type(tmp) == "table" and tmp[1] == 2 and tmp[168] == 997 )
    end
 end
diff --git a/tests/pingpong.lua b/tests/pingpong.lua
index 06c0903..1ed5b9a 100644
--- a/tests/pingpong.lua
+++ b/tests/pingpong.lua
@@ -21,13 +21,15 @@ local pingpong = function(name, qr, qs, start)
        q:send(qs, val)
        count = count + 1
    end
-    return true
+    return "ping!"
 end
 -- pingpong("L1", '0', '1', true)
 local t1, err1 = lanes.gen("*", { name = 'auto' }, pingpong)("L1", 'a', 'b', true)
 local t2, err2 = lanes.gen("*", { name = 'auto' }, pingpong)("L2", 'b', 'a', false)
-t1:join()
+local r1, ret1 = t1:join()
-t2:join()
+assert(r1 == true and ret1 == "ping!")
+local r2, ret2 = t2:join()
+assert(r2 == true and ret2 == "ping!")
 print "TEST OK"
diff --git a/tests/rupval.lua b/tests/rupval.lua
index ad5ad9d..c6743b3 100644
--- a/tests/rupval.lua
+++ b/tests/rupval.lua
@@ -26,17 +26,17 @@ end
 local g = lanes.gen( "base", { name = 'auto' }, a)
 local l = g(7)
-local r = l:join()
+local _, r = l:join()
 assert(r == y)
 print(r)
 local l = g(8)
-local r = l:join()
+local _, r = l:join()
 assert(r == z)
 print(r)
 local l = g(9)
-local r = l:join()
+local _, r = l:join()
 assert(r == x)
 print(r)
diff --git a/tests/tobeclosed.lua b/tests/tobeclosed.lua
index 447b936..fd157e2 100644
--- a/tests/tobeclosed.lua
+++ b/tests/tobeclosed.lua
@@ -106,7 +106,7 @@ do
        local _count, l_out <close> = l:get("trip")
        -- linda from arguments
        local l_arg <close> = l_arg_
-        return true
+        return "done"
    end
    local close_handler_f = function(linda_, err_)
@@ -118,7 +118,8 @@ do
    l:set("trip", l_in)
    do
-    lanes.gen("*", { name = 'auto' }, lane_body)(l_in):join()
+        local r, ret = lanes.gen("*", { name = 'auto' }, lane_body)(l_in):join()
+        assert(r == true and ret == "done")
    end
    local _count, _closed = l_in:get("closed")
    assert(_count == 1 and _closed == 2)
diff --git a/unit_tests/UnitTests.vcxproj b/unit_tests/UnitTests.vcxproj
index 8c22653..2093063 100644
--- a/unit_tests/UnitTests.vcxproj
+++ b/unit_tests/UnitTests.vcxproj
@@ -45,6 +45,30 @@
      <Configuration>Debug 5.4</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Prospero">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|Win32">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug 5.5|x64">
+      <Configuration>Debug 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Prospero">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Prospero</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|Win32">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release 5.5|x64">
+      <Configuration>Release 5.5</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release LuaJIT|Prospero">
      <Configuration>Release LuaJIT</Configuration>
      <Platform>Prospero</Platform>
@@ -125,7 +149,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{aed7f42f-139a-46ba-80fe-16e062ea1345}</ProjectGuid>
    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.22621.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
@@ -143,6 +167,9 @@
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|x64'">
    <UseDebugLibraries>true</UseDebugLibraries>
  </PropertyGroup>
@@ -159,6 +186,11 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">
    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
@@ -204,11 +236,21 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">
    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
@@ -255,13 +297,37 @@
    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <OutDir>$(SolutionDir)_LuaVersions\$(PlatformName)\$(Configuration)\</OutDir>
+    <IntDir>$(SolutionDir)_Tmp\$(ProjectName)\$(PlatformName)\$(Configuration)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
  <ItemDefinitionGroup />
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -280,7 +346,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -299,7 +365,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -318,7 +384,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -337,7 +403,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -356,7 +422,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -375,7 +441,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -394,7 +460,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -413,7 +479,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -432,7 +498,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -448,6 +514,27 @@
      </IgnoreSpecificDefaultLibraries>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua55.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -469,7 +556,7 @@
      </IgnoreSpecificDefaultLibraries>
    </Link>
  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
@@ -477,6 +564,27 @@
      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Debug;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Debug</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -494,7 +602,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -555,7 +663,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -575,7 +683,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -636,7 +744,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -656,7 +764,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -717,7 +825,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -738,7 +846,7 @@
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
      <WarningLevel>Level3</WarningLevel>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -800,7 +908,26 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>LANES_DEBUG;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <LanguageStandard>stdcpp20</LanguageStandard>
@@ -819,7 +946,7 @@
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
-      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <LanguageStandard>stdcpp20</LanguageStandard>
      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
@@ -833,6 +960,24 @@
      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>LANES_DEBUG;X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)/_LuaVersions/$(PlatformName)/$(ConfigurationName)/include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalLibraryDirectories>$(SolutionDir)_LuaVersions\$(PlatformName)\$(ConfigurationName)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua55.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">
    <ClCompile>
      <PrecompiledHeader>Use</PrecompiledHeader>
@@ -852,6 +997,25 @@
      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">
+    <ClCompile>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeaderFile>_pch.hpp</PrecompiledHeaderFile>
+      <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <LanguageStandard>stdcpp20</LanguageStandard>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\Lua54\include;$(SolutionDir)..</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\..\..\Lua54\bin\$(Platform)\Release;$(SolutionDir)..\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.7\lib\native\v140\windesktop\msvcstl\static\rt-dyn\x64\Release</AdditionalLibraryDirectories>
+      <AdditionalDependencies>lua54.lib;$(CoreLibraryDependencies);%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\src\compat.hpp" />
    <ClInclude Include="..\src\deep.hpp" />
@@ -864,11 +1028,13 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader>
@@ -876,7 +1042,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader>
@@ -886,7 +1054,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader>
@@ -897,11 +1067,13 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|Win32'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">NotUsing</PrecompiledHeader>
@@ -909,7 +1081,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.1|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.1|Prospero'">NotUsing</PrecompiledHeader>
@@ -919,7 +1093,9 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.2|x64'">NotUsing</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Prospero'">NotUsing</PrecompiledHeader>
@@ -934,6 +1110,7 @@
    <ClCompile Include="init_and_shutdown.cpp" />
    <ClCompile Include="_pch.cpp">
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.2|Win32'">Create</PrecompiledHeader>
@@ -943,8 +1120,11 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Win32'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.5|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.3|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug 5.3|Prospero'">Create</PrecompiledHeader>
@@ -962,15 +1142,28 @@
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release LuaJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release MoonJIT|Prospero'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|x64'">Create</PrecompiledHeader>
      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.4|Prospero'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release 5.5|Prospero'">Create</PrecompiledHeader>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <None Include="..\.runsettings" />
+    <None Include="scripts\coro\cancelling_suspended.lua" />
+    <None Include="scripts\coro\collect_yielded_lane.lua" />
+    <None Include="scripts\coro\join_suspended.lua" />
+    <None Include="scripts\coro\linda_in_close_handler.lua" />
+    <None Include="scripts\coro\regular_function.lua" />
+    <None Include="scripts\coro\resume_basics.lua" />
+    <None Include="scripts\coro\yielding_in_non_coro_errors.lua" />
+    <None Include="scripts\lane\body_is_a_c_function.lua" />
    <None Include="scripts\lane\tasking_cancelling_with_hook.lua" />
+    <None Include="scripts\linda\send_receive_func_and_string.lua" />
    <None Include="scripts\linda\wake_period.lua" />
+    <None Include="scripts\misc\deeptest.lua" />
+    <None Include="scripts\_utils54.lua" />
    <None Include="UnitTests.makefile" />
-    <None Include="scripts\coro\basics.lua" />
+    <None Include="scripts\coro\index_suspended.lua" />
    <None Include="scripts\coro\error_handling.lua" />
    <None Include="scripts\lane\cooperative_shutdown.lua" />
    <None Include="scripts\lane\stdlib_naming.lua" />
diff --git a/unit_tests/UnitTests.vcxproj.filters b/unit_tests/UnitTests.vcxproj.filters
index ce8cb58..df82447 100644
--- a/unit_tests/UnitTests.vcxproj.filters
+++ b/unit_tests/UnitTests.vcxproj.filters
@@ -54,6 +54,9 @@
    <Filter Include="Make">
      <UniqueIdentifier>{c62af5d9-9161-4ca1-9b58-6837e2907e35}</UniqueIdentifier>
    </Filter>
+    <Filter Include="Scripts\misc">
+      <UniqueIdentifier>{1fbb1341-2f93-4eaa-924c-1df79e083704}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <None Include="scripts\linda\send_receive.lua">
@@ -95,7 +98,7 @@
    <None Include="scripts\lane\tasking_join_test.lua">
      <Filter>Scripts\lane</Filter>
    </None>
-    <None Include="scripts\coro\basics.lua">
+    <None Include="scripts\coro\index_suspended.lua">
      <Filter>Scripts\coro</Filter>
    </None>
    <None Include="scripts\coro\error_handling.lua">
@@ -119,5 +122,38 @@
    <None Include="scripts\linda\wake_period.lua">
      <Filter>Scripts\linda</Filter>
    </None>
+    <None Include="scripts\coro\collect_yielded_lane.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\lane\body_is_a_c_function.lua">
+      <Filter>Scripts\lane</Filter>
+    </None>
+    <None Include="scripts\coro\regular_function.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\yielding_in_non_coro_errors.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\resume_basics.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\join_suspended.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\_utils54.lua">
+      <Filter>Scripts</Filter>
+    </None>
+    <None Include="scripts\coro\linda_in_close_handler.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\coro\cancelling_suspended.lua">
+      <Filter>Scripts\coro</Filter>
+    </None>
+    <None Include="scripts\linda\send_receive_func_and_string.lua">
+      <Filter>Scripts\linda</Filter>
+    </None>
+    <None Include="scripts\misc\deeptest.lua">
+      <Filter>Scripts\misc</Filter>
+    </None>
  </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/unit_tests/deep_tests.cpp b/unit_tests/deep_tests.cpp
index e21072c..f18ff81 100644
--- a/unit_tests/deep_tests.cpp
+++ b/unit_tests/deep_tests.cpp
@@ -92,4 +92,13 @@ TEST_CASE("misc.deep_userdata.example")
            " assert(due.get_deep_count() == 0)"
        );
    }
-}
-\ No newline at end of file
+}
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION) \
+    TEST_CASE("scripted_tests." #DIR "." #FILE) \
+    { \
+        FileRunner _runner(R"(.\unit_tests\scripts)"); \
+        _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
+    }
+MAKE_TEST_CASE(misc, deeptest, AssertNoLuaError)
diff --git a/unit_tests/embedded_tests.cpp b/unit_tests/embedded_tests.cpp
index 04a8f87..388548d 100644
--- a/unit_tests/embedded_tests.cpp
+++ b/unit_tests/embedded_tests.cpp
@@ -139,13 +139,13 @@ namespace
 // #################################################################################################
-TEST_CASE("lanes.embedding.with default allocator")
+TEST_CASE("lanes.embedding.with_default_allocator")
 {
    local::EmbeddedLuaState S;
    // ---------------------------------------------------------------------------------------------
-    SECTION("single state")
+    SECTION("single_state")
    {
        // this sends data in a linda. current contents:
        // key: short string
@@ -172,7 +172,7 @@ TEST_CASE("lanes.embedding.with default allocator")
    // ---------------------------------------------------------------------------------------------
-    SECTION("manual registration")
+    SECTION("manual_registration")
    {
        S.requireSuccess("require 'lanes'.configure{with_timers = false}");
@@ -192,7 +192,7 @@ TEST_CASE("lanes.embedding.with default allocator")
        // try again after manual registration
        lua_pushcfunction(S, S.get_lanes_register());                                              // S: lanes_register
-        luaG_pushstring(S, LUA_IOLIBNAME);                                                         // S: lanes_register "io"
+        luaW_pushstring(S, LUA_IOLIBNAME);                                                         // S: lanes_register "io"
        luaL_requiref(S, LUA_IOLIBNAME, luaopen_io, 1);                                            // S: lanes_register "io" io
        lua_call(S, 2, 0);                                                                         // S:
        S.stackCheck(0);
@@ -204,7 +204,7 @@ TEST_CASE("lanes.embedding.with default allocator")
 // this is not really a test yet, just something sitting here until it is converted properly
 // currently it crashes with moonjit (but maybe I just need a more recent moonjit version)
-TEST_CASE("lanes.embedding.with custom allocator")
+TEST_CASE("lanes.embedding.with_custom_allocator")
 {
    static constexpr auto logPrint = +[](lua_State* L) {
        lua_getglobal(L, "ID"); // ID
@@ -220,7 +220,7 @@ TEST_CASE("lanes.embedding.with custom allocator")
    static constexpr auto launch_lane = +[](lua_CFunction on_state_create_, int id_, int n_) {
        char script[500];
-        lua_State* L = lua_newstate(local::allocf, nullptr);
+        lua_State* L = luaW_newstate(local::allocf, nullptr, luaL_makeseed(nullptr));
        // _G.ID = id_
        luaL_openlibs(L);
        luaL_dostring(L, "lanes = require 'lanes'");
diff --git a/unit_tests/init_and_shutdown.cpp b/unit_tests/init_and_shutdown.cpp
index bd72157..69e4f1b 100644
--- a/unit_tests/init_and_shutdown.cpp
+++ b/unit_tests/init_and_shutdown.cpp
@@ -3,7 +3,7 @@
 // #################################################################################################
-TEST_CASE("lanes.require 'lanes'")
+TEST_CASE("Lua.require_lanes")
 {
    LuaState L{ LuaState::WithBaseLibs{ false }, LuaState::WithFixture{ false } };
@@ -58,7 +58,7 @@ TEST_CASE("lanes.require 'lanes'")
 // #################################################################################################
 // allocator should be "protected", a C function returning a suitable userdata, or nil
-TEST_CASE("lanes.configure.allocator")
+TEST_CASE("lanes.configure.allocator/bool_number_table_string")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -90,49 +90,33 @@ TEST_CASE("lanes.configure.allocator")
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <Lua function>")
-    {
-        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
-    }
-    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <bad C function>")
-    {
-        // a C function that doesn't return what we expect should cause an error too
-        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
-        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
-    }
-    // ---------------------------------------------------------------------------------------------
    SECTION("allocator = <string with a typo>")
    {
        // oops, a typo
        L.requireFailure("require 'lanes'.configure{allocator = 'Protected'}");
    }
+}
+// #################################################################################################
+TEST_CASE("lanes.configure.allocator/bad_functions")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = 'protected'")
+    SECTION("allocator = <Lua function>")
    {
-        // no typo, should work
+        L.requireFailure("require 'lanes'.configure{allocator = function() return {}, 12, 'yoy' end}");
-        L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
    }
    // ---------------------------------------------------------------------------------------------
-    SECTION("allocator = <good custom C allocator>")
+    SECTION("allocator = <bad C function>")
    {
-        // a function that provides what we expect is fine
+        // a C function that doesn't return what we expect should cause an error too
-        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
+        // TODO: for some reason, we use os.getenv here because using 'print' as the culprit, the tests deadlock in Release builds
-            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
+        L.requireFailure("return type(require 'lanes'.configure{allocator = os.getenv})");
-            _def->initFrom(L_);
-            return 1;
-        };
-        lua_pushcfunction(L, _provideAllocator);
-        lua_setglobal(L, "ProvideAllocator");
-        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
    }
    // ---------------------------------------------------------------------------------------------
@@ -191,6 +175,39 @@ TEST_CASE("lanes.configure.allocator")
 // #################################################################################################
+TEST_CASE("lanes.configure.allocator/good_function")
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    SECTION("allocator = <good custom C allocator>")
+    {
+        // a function that provides what we expect is fine
+        static constexpr lua_CFunction _provideAllocator = +[](lua_State* const L_) {
+            lanes::AllocatorDefinition* const _def{ new (L_) lanes::AllocatorDefinition{} };
+            _def->initFrom(L_);
+            return 1;
+        };
+        lua_pushcfunction(L, _provideAllocator);
+        lua_setglobal(L, "ProvideAllocator");
+        L.requireSuccess("require 'lanes'.configure{allocator = ProvideAllocator}");
+    }
+}
+// #################################################################################################
+// TODO: investigate why this test crashes under AppVerifier on lanes_core.dll unload when running against Lua 5.1, 5.2 and 5.4 RELEASE ONLY!
+// apparently, the mutex of ProtectedAllocator is deemed still in use. Crash goes away if I don't use it in protected_lua_Alloc
+TEST_CASE(("lanes.configure.allocator/protected"))
+{
+    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    // no typo, should work
+    L.requireSuccess("require 'lanes'.configure{allocator = 'protected'}");
+}
+// #################################################################################################
 TEST_CASE("lanes.configure.internal_allocator")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -401,7 +418,7 @@ TEST_CASE("lanes.configure.nb_user_keepers")
 // #################################################################################################
-TEST_CASE("lanes.configure.on_state_create")
+TEST_CASE("lanes.configure.on_state_create/configuration")
 {
    LuaState L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
@@ -758,7 +775,7 @@ TEST_CASE("lanes.configure.unknown_setting")
 #if LUAJIT_FLAVOR() == 0
 // TODO: this test crashes inside S.close() against LuaJIT. to be investigated
-TEST_CASE("lanes.finally.no fixture")
+TEST_CASE("lanes.finally.no_fixture")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // we need Lanes to be up. Since we run several 'scripts', we store it as a global
@@ -779,7 +796,7 @@ TEST_CASE("lanes.finally.no fixture")
 // #################################################################################################
-TEST_CASE("lanes.finally.with fixture")
+TEST_CASE("lanes.finally.with_fixture")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
@@ -797,7 +814,7 @@ TEST_CASE("lanes.finally.with fixture")
 // #################################################################################################
-TEST_CASE("lanes.finally.shutdown with an uncooperative lane")
+TEST_CASE("lanes.finally.shutdown_with_an_uncooperative_lane")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -846,7 +863,7 @@ namespace
 // #################################################################################################
-TEST_CASE("lanes.on_state_create setting")
+TEST_CASE("lanes.configure.on_state_create/details")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
diff --git a/unit_tests/lane_tests.cpp b/unit_tests/lane_tests.cpp
index 1367ae5..b6fb188 100644
--- a/unit_tests/lane_tests.cpp
+++ b/unit_tests/lane_tests.cpp
@@ -1,5 +1,7 @@
 #include "_pch.hpp"
 #include "shared.h"
+#include "lanes/src/threading.hpp"
 // #################################################################################################
 // #################################################################################################
@@ -33,7 +35,77 @@ TEST_CASE("lanes.nameof")
 // #################################################################################################
 // #################################################################################################
-TEST_CASE("lanes.sleep.argument validation")
+TEST_CASE("lanes.thread_priority_range")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    S.requireSuccess("a, b = lanes.thread_priority_range(); print(a, b)");
+    S.requireSuccess("assert(type(a) == 'number' and type(b) == 'number' and b > a)");
+    S.requireSuccess("c, d = lanes.thread_priority_range('native'); print(c, d)");
+    S.requireSuccess("assert(type(c) == 'number' and type(d) == 'number' and d > c)");
+    // can't really test the range of values from pthread as they are platform-dependent
+    if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+        // windows constants THREAD_PRIORITY_IDLE and THREAD_PRIORITY_TIME_CRITICAL
+        S.requireSuccess("assert(c == -15 and d == 15)");
+    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.set_thread_priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    SECTION("mapped priorities")
+    {
+        std::string_view const _script{
+            " min_prio, max_prio = lanes.thread_priority_range()"
+            " for prio = min_prio, max_prio do"
+            "     lanes.set_thread_priority(prio)"
+            " end"
+        };
+        S.requireSuccess(_script);
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+    SECTION("native priorities")
+    {
+        S.requireSuccess("min_prio, max_prio = lanes.thread_priority_range('native')");
+        if constexpr (THREADAPI == THREADAPI_WINDOWS) {
+            // Win32 range is -15 to 15, but only some values are accepted
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_IDLE
+            S.requireFailure("lanes.set_thread_priority(-3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-2, 'native')"); // THREAD_PRIORITY_LOWEST
+            S.requireSuccess("lanes.set_thread_priority(-1, 'native')"); // THREAD_PRIORITY_BELOW_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(0, 'native')"); // THREAD_PRIORITY_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(1, 'native')"); // THREAD_PRIORITY_ABOVE_NORMAL
+            S.requireSuccess("lanes.set_thread_priority(2, 'native')"); // THREAD_PRIORITY_HIGHEST
+            S.requireFailure("lanes.set_thread_priority(3, 'native')");
+            S.requireSuccess("lanes.set_thread_priority(-15, 'native')"); // THREAD_PRIORITY_TIME_CRITICAL
+        } else {
+            // until proven otherwise, the full set of values is supported by pthread
+            std::string_view const _script{
+                " for prio = min_prio, max_prio do"
+                "     lanes.set_thread_priority(prio, 'native')"
+                " end"
+            };
+            S.requireSuccess(_script);
+        }
+        S.requireFailure("lanes.set_thread_priority(min_prio - 1)");
+        S.requireFailure("lanes.set_thread_priority(max_prio + 1)");
+    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.sleep.argument_validation/not_numbers")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
@@ -44,6 +116,14 @@ TEST_CASE("lanes.sleep.argument validation")
    S.requireFailure("lanes.sleep('a string')");
    S.requireFailure("lanes.sleep(lanes.null)");
    S.requireFailure("lanes.sleep(print)");
+}
+// #################################################################################################
+TEST_CASE("lanes.sleep.argument_validation/numbers")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
    // negative durations are not supported
    S.requireFailure("lanes.sleep(-1)");
@@ -97,88 +177,109 @@ TEST_CASE("lanes.sleep.interactions with timers")
 // #################################################################################################
 // #################################################################################################
-TEST_CASE("lanes.gen")
+TEST_CASE("lanes.gen.argument_checks")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    S.requireSuccess("lanes = require 'lanes'.configure()");
    // ---------------------------------------------------------------------------------------------
-    SECTION("argument checks")
+    // no argument is bad
-    {
+    S.requireFailure("lanes.gen()");
-        // no parameter is bad
-        S.requireFailure("lanes.gen()");
+    // minimal generator needs a function
+    S.requireSuccess("lanes.gen(function() end)");
-        // minimal generator needs a function
-        S.requireSuccess("lanes.gen(function() end)");
+    // acceptable arguments for the generator are strings, tables, nil, followed by the function body
+    S.requireSuccess("lanes.gen(nil, function() end)");
-        // acceptable parameters for the generator are strings, tables, nil, followed by the function body
+    S.requireSuccess("lanes.gen('', function() end)");
-        S.requireSuccess("lanes.gen(nil, function() end)");
+    S.requireSuccess("lanes.gen({}, function() end)");
-        S.requireSuccess("lanes.gen('', function() end)");
+    S.requireSuccess("lanes.gen('', {}, function() end)");
-        S.requireSuccess("lanes.gen({}, function() end)");
+    S.requireSuccess("lanes.gen({}, '', function() end)");
-        S.requireSuccess("lanes.gen('', {}, function() end)");
+    S.requireSuccess("lanes.gen('', '', function() end)");
-        S.requireSuccess("lanes.gen({}, '', function() end)");
+    S.requireSuccess("lanes.gen({}, {}, function() end)");
-        S.requireSuccess("lanes.gen('', '', function() end)");
-        S.requireSuccess("lanes.gen({}, {}, function() end)");
+    // anything different should fail: booleans, numbers, any userdata
+    S.requireFailure("lanes.gen(false, function() end)");
-        // anything different should fail: booleans, numbers, any userdata
+    S.requireFailure("lanes.gen(true, function() end)");
-        S.requireFailure("lanes.gen(false, function() end)");
+    S.requireFailure("lanes.gen(42, function() end)");
-        S.requireFailure("lanes.gen(true, function() end)");
+    S.requireFailure("lanes.gen(io.stdin, function() end)");
-        S.requireFailure("lanes.gen(42, function() end)");
+    S.requireFailure("lanes.gen(lanes.linda(), function() end)");
-        S.requireFailure("lanes.gen(io.stdin, function() end)");
+    S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
-        S.requireFailure("lanes.gen(lanes.linda(), function() end)");
-        S.requireFailure("lanes.gen(lanes.linda():deep(), function() end)");
+    // even if argument types are correct, the function must come last
+    S.requireFailure("lanes.gen(function() end, '')");
-        // even if parameter types are correct, the function must come last
-        S.requireFailure("lanes.gen(function() end, '')");
+    // the strings should only list "known base libraries", in any order, or "*"
+    // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
-        // the strings should only list "known base libraries", in any order, or "*"
+    S.requireSuccess("lanes.gen('base', function() end)");
-        // if the particular Lua flavor we build for doesn't support them, they raise an error unless postfixed by '?'
-        S.requireSuccess("lanes.gen('base', function() end)");
+    // bit, ffi, jit are LuaJIT-specific
-        // bit, ffi, jit are LuaJIT-specific
 #if LUAJIT_FLAVOR() == 0
-        S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
+    S.requireFailure("lanes.gen('bit,ffi,jit', function() end)");
-        S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
+    S.requireSuccess("lanes.gen('bit?,ffi?,jit?', function() end)");
 #endif // LUAJIT_FLAVOR()
-        // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
+    // bit32 library existed only in Lua 5.2, there is still a loader that will raise an error in Lua 5.3
 #if LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireSuccess("lanes.gen('bit32', function() end)");
+    S.requireSuccess("lanes.gen('bit32', function() end)");
 #else // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        S.requireFailure("lanes.gen('bit32', function() end)");
+    S.requireFailure("lanes.gen('bit32', function() end)");
-        S.requireSuccess("lanes.gen('bit32?', function() end)");
+    S.requireSuccess("lanes.gen('bit32?', function() end)");
 #endif // LUA_VERSION_NUM == 502 || LUA_VERSION_NUM == 503
-        // coroutine library appeared with Lua 5.2
+    // coroutine library appeared with Lua 5.2
 #if LUA_VERSION_NUM == 501
-        S.requireFailure("lanes.gen('coroutine', function() end)");
+    S.requireFailure("lanes.gen('coroutine', function() end)");
-        S.requireSuccess("lanes.gen('coroutine?', function() end)");
+    S.requireSuccess("lanes.gen('coroutine?', function() end)");
 #endif // LUA_VERSION_NUM == 501
-        S.requireSuccess("lanes.gen('debug', function() end)");
+    S.requireSuccess("lanes.gen('debug', function() end)");
-        S.requireSuccess("lanes.gen('io', function() end)");
+    S.requireSuccess("lanes.gen('io', function() end)");
-        S.requireSuccess("lanes.gen('math', function() end)");
+    S.requireSuccess("lanes.gen('math', function() end)");
-        S.requireSuccess("lanes.gen('os', function() end)");
+    S.requireSuccess("lanes.gen('os', function() end)");
-        S.requireSuccess("lanes.gen('package', function() end)");
+    S.requireSuccess("lanes.gen('package', function() end)");
-        S.requireSuccess("lanes.gen('string', function() end)");
+    S.requireSuccess("lanes.gen('string', function() end)");
-        S.requireSuccess("lanes.gen('table', function() end)");
+    S.requireSuccess("lanes.gen('table', function() end)");
-        // utf8 library appeared with Lua 5.3
+    // utf8 library appeared with Lua 5.3
 #if LUA_VERSION_NUM < 503
-        S.requireFailure("lanes.gen('utf8', function() end)");
+    S.requireFailure("lanes.gen('utf8', function() end)");
-        S.requireSuccess("lanes.gen('utf8?', function() end)");
+    S.requireSuccess("lanes.gen('utf8?', function() end)");
 #endif // LUA_VERSION_NUM < 503
-        S.requireSuccess("lanes.gen('lanes_core', function() end)");
+    S.requireSuccess("lanes.gen('lanes_core', function() end)");
-        // "*" repeated or combined with anything else is forbidden
+    // "*" repeated or combined with anything else is forbidden
-        S.requireFailure("lanes.gen('*', '*', function() end)");
+    S.requireFailure("lanes.gen('*', '*', function() end)");
-        S.requireFailure("lanes.gen('base', '*', function() end)");
+    S.requireFailure("lanes.gen('base', '*', function() end)");
-        // unknown names are forbidden
+    // unknown names are forbidden
-        S.requireFailure("lanes.gen('Base', function() end)");
+    S.requireFailure("lanes.gen('Base', function() end)");
-        // repeating the same library more than once is forbidden
+    // repeating the same library more than once is forbidden
-        S.requireFailure("lanes.gen('base,base', function() end)");
+    S.requireFailure("lanes.gen('base,base', function() end)");
-    }
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.gen.priority")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    S.requireSuccess("lanes.gen({priority=1}, function() end)");
+    // AFAICT, 1 is accepted by all pthread flavors and win32 API
+    S.requireSuccess("lanes.gen({native_priority=1}, function() end)");
+    // shouldn't be able to provide 2 priority settings
+    S.requireFailure("lanes.gen({priority=1, native_priority=1}, function() end)");
+}
+// #################################################################################################
+// #################################################################################################
+TEST_CASE("lanes.gen.thread_naming")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
    // ---------------------------------------------------------------------------------------------
@@ -319,18 +420,22 @@ TEST_CASE("lane.cancel")
 // unfortunately, VS Test adapter does not list individual sections,
 // so let's create a separate test case for each file with an ugly macro...
-#define MAKE_TEST_CASE(DIR, FILE, CONDITION)\
+#define MAKE_TEST_CASE(DIR, FILE, CONDITION) \
 TEST_CASE("scripted_tests." #DIR "." #FILE) \
 { \
    FileRunner _runner(R"(.\unit_tests\scripts)"); \
    _runner.performTest(FileRunnerParam{ #DIR "/" #FILE, TestType::CONDITION }); \
 }
-MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+#if LUA_VERSION_NUM >= 504 // this makes use of to-be-closed variables, a Lua 5.4 feature
-#if LUA_VERSION_NUM >= 504 // // warnings are a Lua 5.4 feature
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION) MAKE_TEST_CASE(DIR, FILE, CONDITION)
-// NOTE: when this test ends, there are resource leaks and a dangling thread
+#else // LUA_VERSION_NUM
-MAKE_TEST_CASE(lane, uncooperative_shutdown, AssertWarns)
+#define MAKE_TEST_CASE_54(DIR, FILE, CONDITION)
 #endif // LUA_VERSION_NUM
+MAKE_TEST_CASE(lane, body_is_a_c_function, AssertNoLuaError)
+MAKE_TEST_CASE(lane, cooperative_shutdown, AssertNoLuaError)
+MAKE_TEST_CASE_54(lane, uncooperative_shutdown, AssertWarns) // NOTE: when this test ends, there are resource leaks and a dangling thread
 MAKE_TEST_CASE(lane, tasking_basic, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_cancelling_with_hook, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_cancelling, AssertNoLuaError)
@@ -340,11 +445,18 @@ MAKE_TEST_CASE(lane, tasking_error, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_join_test, AssertNoLuaError)
 MAKE_TEST_CASE(lane, tasking_send_receive_code, AssertNoLuaError)
 MAKE_TEST_CASE(lane, stdlib_naming, AssertNoLuaError)
-MAKE_TEST_CASE(coro, basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, cancelling_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, collect_yielded_lane, AssertNoLuaError)
 #if LUAJIT_FLAVOR() == 0
 // TODO: for some reason, the test fails with LuaJIT. To be investigated
 MAKE_TEST_CASE(coro, error_handling, AssertNoLuaError)
 #endif // LUAJIT_FLAVOR()
+MAKE_TEST_CASE(coro, index_suspended, AssertNoLuaError)
+MAKE_TEST_CASE(coro, join_suspended, AssertNoLuaError)
+MAKE_TEST_CASE_54(coro, linda_in_close_handler, AssertNoLuaError)
+MAKE_TEST_CASE(coro, regular_function, AssertNoLuaError)
+MAKE_TEST_CASE(coro, resume_basics, AssertNoLuaError)
+MAKE_TEST_CASE(coro, yielding_in_non_coro_errors, AssertNoLuaError)
 /*
 TEST_CASE("lanes.scripted_tests")
diff --git a/unit_tests/linda_tests.cpp b/unit_tests/linda_tests.cpp
index d956ae2..90630a7 100644
--- a/unit_tests/linda_tests.cpp
+++ b/unit_tests/linda_tests.cpp
@@ -35,7 +35,7 @@ TEST_CASE("linda.single_keeper.creation/close_handler")
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
    S.requireSuccess("lanes = require 'lanes'");
-    if constexpr (LUA_VERSION_NUM == 504) {
+    if constexpr (LUA_VERSION_NUM >= 504) {
        // a function is acceptable as a __close handler
        S.requireSuccess("local l <close> = lanes.linda{close_handler = function() end}");
        // a callable table too (a callable full userdata as well, but I have none here)
@@ -109,103 +109,110 @@ TEST_CASE("linda.single_keeper.creation/wake_period")
 // #################################################################################################
-TEST_CASE("linda.single_keeper.the_rest")
+TEST_CASE("linda.single_keeper.indexing")
 {
    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
-    S.requireSuccess("lanes = require 'lanes'");
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+    // indexing the linda with an unknown string key should fail
+    S.requireFailure("return lanes.linda().gouikra");
+    // indexing the linda with an unsupported key type should fail
+    S.requireFailure("return lanes.linda()[5]");
+    S.requireFailure("return lanes.linda()[false]");
+    S.requireFailure("return lanes.linda()[{}]");
+    S.requireFailure("return lanes.linda()[function() end]");
+}
-    // ---------------------------------------------------------------------------------------------
+// #################################################################################################
-    SECTION("error in close handler is propagated")
+TEST_CASE("linda.single_keeper.send()")
+{
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
+    S.requireSuccess("lanes = require 'lanes'.configure()");
+        SECTION("timeout")
    {
-        // if the function raises an error, we should get it
+        // timeout checks
-        S.requireFailure("local l <close> = lanes.linda{close_handler = function() error 'gluh' end}");
+        // linda:send() should fail if the timeout is bad
+        S.requireFailure("lanes.linda():send(-1, 'k', 'v')");
+        // any positive value is ok
+        S.requireSuccess("lanes.linda():send(0, 'k', 'v')");
+        S.requireSuccess("lanes.linda():send(1e20, 'k', 'v')");
+        // nil too (same as 'forever')
+        S.requireSuccess("lanes.linda():send(nil, 'k', 'v')");
    }
-    // ---------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-    SECTION("Linda indexing")
+    SECTION("fails on bad keys")
    {
-        // indexing the linda with an unknown string key should fail
+        // key checks
-        S.requireFailure("return lanes.linda().gouikra");
+        // linda:send() should fail if the key is unsupported (nil, table, function, full userdata, reserved light userdata)
-        // indexing the linda with an unsupported key type should fail
+        S.requireFailure("lanes.linda():send(0, nil, 'v')");
-        S.requireFailure("return lanes.linda()[5]");
+        S.requireFailure("lanes.linda():send(0, {}, 'v')");
-        S.requireFailure("return lanes.linda()[false]");
+        S.requireFailure("lanes.linda():send(0, function() end, 'v')");
-        S.requireFailure("return lanes.linda()[{}]");
+        S.requireFailure("lanes.linda():send(0, io.stdin, 'v')");
-        S.requireFailure("return lanes.linda()[function() end]");
+        S.requireFailure("lanes.linda():send(0, lanes.null, 'v')");
+        S.requireFailure("lanes.linda():send(0, lanes.cancel_error, 'v')");
    }
-    // ---------------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-    SECTION("linda:send()")
+    SECTION("succeeds on supported keys")
    {
-        SECTION("timeout")
+        // supported keys are ok: boolean, number, string, light userdata, deep userdata
-        {
+        S.requireSuccess("lanes.linda():send(0, true, 'v')");
-            // timeout checks
+        S.requireSuccess("lanes.linda():send(0, false, 'v')");
-            // linda:send() should fail if the timeout is bad
+        S.requireSuccess("lanes.linda():send(0, 99, 'v')");
-            S.requireFailure("lanes.linda():send(-1, 'k', 'v')");
+        S.requireSuccess("local l = lanes.linda(); l:send(0, l:deep(), 'v')");
-            // any positive value is ok
+    }
-            S.requireSuccess("lanes.linda():send(0, 'k', 'v')");
-            S.requireSuccess("lanes.linda():send(1e20, 'k', 'v')");
-            // nil too (same as 'forever')
-            S.requireSuccess("lanes.linda():send(nil, 'k', 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("fails on bad keys")
+    SECTION("succeeds on deep userdata key")
-        {
+    {
-            // key checks
+        S.requireSuccess("local l = lanes.linda(); l:send(0, l, 'v')");
-            // linda:send() should fail if the key is unsupported (nil, table, function, full userdata, reserved light userdata)
+    }
-            S.requireFailure("lanes.linda():send(0, nil, 'v')");
-            S.requireFailure("lanes.linda():send(0, {}, 'v')");
-            S.requireFailure("lanes.linda():send(0, function() end, 'v')");
-            S.requireFailure("lanes.linda():send(0, io.stdin, 'v')");
-            S.requireFailure("lanes.linda():send(0, lanes.null, 'v')");
-            S.requireFailure("lanes.linda():send(0, lanes.cancel_error, 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("succeeds on supported keys")
+    SECTION(". fails")
-        {
+    {
-            // supported keys are ok: boolean, number, string, light userdata, deep userdata
+        // misuse checks, . instead of :
-            S.requireSuccess("lanes.linda():send(0, true, 'v')");
+        S.requireFailure("lanes.linda().send(nil, 'k', 'v')");
-            S.requireSuccess("lanes.linda():send(0, false, 'v')");
+    }
-            S.requireSuccess("lanes.linda():send(0, 99, 'v')");
-            S.requireSuccess("local l = lanes.linda(); l:send(0, l:deep(), 'v')");
-        }
-        // -----------------------------------------------------------------------------------------
+    // -----------------------------------------------------------------------------------------
-        SECTION("succeeds on deep userdata key")
+    SECTION("unsupported values fail")
-        {
+    {
-            S.requireSuccess("local l = lanes.linda(); l:send(0, l, 'v')");
+        // value checks
-        }
+        // linda:send() should fail if we don't send anything
+        S.requireFailure("lanes.linda():send()");
+        S.requireFailure("lanes.linda():send(0)");
+        S.requireFailure("lanes.linda():send(0, 'k')");
+        // or non-deep userdata
+        S.requireFailure("lanes.linda():send(0, 'k', fixture.newuserdata())");
+        // or something with a converter that raises an error (maybe that should go to a dedicated __lanesconvert test!)
+        S.requireFailure("lanes.linda():send(0, 'k', setmetatable({}, {__lanesconvert = function(where_) error (where_ .. ': should not send me' end}))");
+        // but a registered non-deep userdata should work
+        S.requireSuccess("lanes.linda():send(0, 'k', io.stdin)");
+    }
+}
-        // -----------------------------------------------------------------------------------------
+// #################################################################################################
-        SECTION(". fails")
+TEST_CASE("linda.single_keeper.the_rest")
-        {
+{
-            // misuse checks, . instead of :
+    LuaState S{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ true } };
-            S.requireFailure("lanes.linda().send(nil, 'k', 'v')");
+    S.requireSuccess("lanes = require 'lanes'");
-        }
-        // -----------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------------
-        SECTION("unsupported values fail")
+    SECTION("error in close handler is propagated")
-        {
+    {
-            // value checks
+        // if the function raises an error, we should get it
-            // linda:send() should fail if we don't send anything
+        S.requireFailure("local l <close> = lanes.linda{close_handler = function() error 'gluh' end}");
-            S.requireFailure("lanes.linda():send()");
-            S.requireFailure("lanes.linda():send(0)");
-            S.requireFailure("lanes.linda():send(0, 'k')");
-            // or non-deep userdata
-            S.requireFailure("lanes.linda():send(0, 'k', fixture.newuserdata())");
-            // or something with a converter that raises an error (maybe that should go to a dedicated __lanesconvert test!)
-            S.requireFailure("lanes.linda():send(0, 'k', setmetatable({}, {__lanesconvert = function(where_) error (where_ .. ': should not send me' end}))");
-            // but a registered non-deep userdata should work
-            S.requireSuccess("lanes.linda():send(0, 'k', io.stdin)");
-        }
    }
    // ---------------------------------------------------------------------------------------------
@@ -390,6 +397,7 @@ TEST_CASE("scripted_tests." #DIR "." #FILE) \
 MAKE_TEST_CASE(linda, multiple_keepers)
 MAKE_TEST_CASE(linda, send_receive)
+MAKE_TEST_CASE(linda, send_receive_func_and_string)
 MAKE_TEST_CASE(linda, send_registered_userdata)
 MAKE_TEST_CASE(linda, wake_period)
diff --git a/unit_tests/scripts/_utils.lua b/unit_tests/scripts/_utils.lua
index d710702..9f46237 100644
--- a/unit_tests/scripts/_utils.lua
+++ b/unit_tests/scripts/_utils.lua
@@ -68,8 +68,26 @@ local function dump_error_stack(error_reporting_mode_, stack)
    end
 end
+-- a function that yields back what got in, one element at a time
+local yield_one_by_one = function(...)
+    local PRINT = MAKE_PRINT()
+    PRINT "In lane"
+    for _i  = 1, select('#', ...) do
+        local _val = select(_i, ...)
+        PRINT("yielding #", _i, _val)
+        local _ack = coroutine.yield(_val)
+        if cancel_test and cancel_test() then -- cancel_test does not exist when run immediately (not in a Lane)
+            return "cancelled!"
+        end
+        -- of course, if we are cancelled, we were not resumed, and yield() didn't return what we expect
+        assert(_ack == _i)
+    end
+    return "bye!"
+end
 return {
    MAKE_PRINT = MAKE_PRINT,
    tables_match = tables_match,
-    dump_error_stack = dump_error_stack
+    dump_error_stack = dump_error_stack,
+    yield_one_by_one = yield_one_by_one
 }
diff --git a/unit_tests/scripts/_utils54.lua b/unit_tests/scripts/_utils54.lua
new file mode 100644
index 0000000..a511563
--- /dev/null
+++ b/unit_tests/scripts/_utils54.lua
@@ -0,0 +1,30 @@
+local utils = require "_utils"
+-- expand _utils module with Lua5.4 specific stuff
+-- a lane body that yields stuff
+utils.yielder_with_to_be_closed = function(out_linda_, wait_)
+        local fixture = assert(require "fixture")
+        -- here is a to-be-closed variable that, when closed, sends "Closed!" in the "out" slot of the provided linda
+        local t <close> = setmetatable(
+                { text = "Closed!" }, {
+                        __close = function(self, err)
+                                if wait_ then
+                                        fixture.block_for(wait_)
+                                end
+                                out_linda_:send("out", self.text)
+                        end
+                }
+        )
+        -- yield forever, but be cancel-friendly
+        local n = 1
+        while true do
+                coroutine.yield("I yield!", n)
+                if cancel_test and cancel_test() then -- cancel_test does not exist when run immediately (not in a Lane)
+                        return "I am cancelled"
+                end
+                n = n + 1
+        end
+end
+return utils
diff --git a/unit_tests/scripts/coro/basics.lua b/unit_tests/scripts/coro/basics.lua
deleted file mode 100644
index cd2f410..0000000
--- a/unit_tests/scripts/coro/basics.lua
+++ /dev/null
@@ -1,97 +0,0 @@
-local lanes = require "lanes"
-local fixture = require "fixture"
-lanes.finally(fixture.throwing_finalizer)
-local utils = lanes.require "_utils"
-local PRINT = utils.MAKE_PRINT()
-if true then
-    -- a lane body that just returns some value
-    local lane = function(msg_)
-        local utils = lanes.require "_utils"
-        local PRINT = utils.MAKE_PRINT()
-        PRINT "In lane"
-        assert(msg_ == "hi")
-        return "bye"
-    end
-    -- the generator
-    local g1 = lanes.coro("*", {name = "auto"}, lane)
-    -- launch lane
-    local h1 = g1("hi")
-    local r = h1[1]
-    assert(r == "bye")
-end
-- a lane coroutine that yields back what got in, one element at a time
-local yielder = function(...)
-    local utils = lanes.require "_utils"
-    local PRINT = utils.MAKE_PRINT()
-    PRINT "In lane"
-    for _i  = 1, select('#', ...) do
-        local _val = select(_i, ...)
-        PRINT("yielding #", _i, _val)
-        local _ack = coroutine.yield(_val)
-        assert(_ack == _i)
-    end
-    return "done!"
-end
-if true then
-    -- if we start a non-coroutine lane with a yielding function, we should get an error, right?
-    local fun_g = lanes.gen("*", { name = 'auto' }, yielder)
-    local h = fun_g("hello", "world", "!")
-    local err, status, stack = h:join()
-    PRINT(err, status, stack)
-    -- the actual error message is not the same for Lua 5.1
-    -- of course, it also has to be different for LuaJIT as well
-    -- also, LuaJIT prepends a file:line to the actual error message, which Lua5.1 does not.
-    local msgs = {
-        ["Lua 5.1"] = jit and "attempt to yield across C-call boundary" or "attempt to yield across metamethod/C-call boundary",
-        ["Lua 5.2"] = "attempt to yield from outside a coroutine",
-        ["Lua 5.3"] = "attempt to yield from outside a coroutine",
-        ["Lua 5.4"] = "attempt to yield from outside a coroutine"
-    }
-    local expected_msg = msgs[_VERSION]
-    PRINT("expected_msg = " .. expected_msg)
-    assert(err == nil and string.find(status, expected_msg, 1, true) and stack == nil, "status = " .. status)
-end
-- the generator
-local coro_g = lanes.coro("*", {name = "auto"}, yielder)
-if true then
-    -- launch coroutine lane
-    local h2 = coro_g("hello", "world", "!")
-    -- read the yielded values, sending back the expected index
-    assert(h2:resume(1) == "hello")
-    assert(h2:resume(2) == "world")
-    assert(h2:resume(3) == "!")
-    -- the lane return value is available as usual
-    local r = h2[1]
-    assert(r == "done!")
-end
-if true then
-    -- another coroutine lane
-    local h3 = coro_g("hello", "world", "!")
-    -- yielded values are available as regular return values
-    assert(h3[1] == "hello" and h3.status == "suspended")
-    -- since we consumed the returned values, they should not be here when we resume
-    assert(h3:resume(1) == nil)
-    -- similarly, we can get them with join()
-    assert(h3:join() == "world" and h3.status == "suspended")
-    -- since we consumed the returned values, they should not be here when we resume
-    assert(h3:resume(2) == nil)
-    -- the rest should work as usual
-    assert(h3:resume(3) == "!")
-    -- the final return value of the lane body remains to be read
-    assert(h3:join() == "done!" and h3.status == "done")
-end
diff --git a/unit_tests/scripts/coro/cancelling_suspended.lua b/unit_tests/scripts/coro/cancelling_suspended.lua
new file mode 100644
index 0000000..3a29e55
--- /dev/null
+++ b/unit_tests/scripts/coro/cancelling_suspended.lua
@@ -0,0 +1,31 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+--------------------------------------------------
+-- TEST: cancelling a suspended Lane should end it
+--------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yield_one_by_one)
+        -- start the lane
+        local h = coro_g("hello", "world", "!")
+        repeat until h.status == "suspended"
+        -- first cancellation attempt: don't wake the lane
+        local b, r = h:cancel("soft", 0.5)
+        -- the lane is still blocked in its suspended state
+        assert(b == false and r == "timeout" and h.status == "suspended", "got " .. tostring(b) .. " " .. tostring(r) .. " " .. h.status)
+        -- cancel the Lane again, this time waking it. it will resume, and yielder()'s will break out of its infinite loop
+        h:cancel("soft", nil, true)
+        -- lane should be done, because it returned cooperatively when detecting a soft cancel
+        assert(h.status == "done", "got " .. h.status)
+end
diff --git a/unit_tests/scripts/coro/collect_yielded_lane.lua b/unit_tests/scripts/coro/collect_yielded_lane.lua
new file mode 100644
index 0000000..2ee58f8
--- /dev/null
+++ b/unit_tests/scripts/coro/collect_yielded_lane.lua
@@ -0,0 +1,64 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+-- this test is only for Lua 5.4+
+local utils = lanes.require "_utils54"
+local PRINT = utils.MAKE_PRINT()
+local out_linda = lanes.linda()
+------------------------------------------------------------------------------
+-- TEST: to-be-closed variables are properly closed when the lane is collected
+------------------------------------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yielder_with_to_be_closed)
+        -- start the lane
+        local h = coro_g(out_linda)
+        -- join the lane. it should be done and give back the values resulting of the first yield point
+        local r, v1, v2 = h:join()
+        assert(r == true and v1 == "I yield!" and v2 == 1, "got " .. tostring(r) .. " " .. tostring(v1) .. " " .. tostring(v2))
+        assert(h.status == "done", "got " .. h.status)
+        -- force collection of the lane
+        h = nil
+        collectgarbage()
+        -- I want the to-be-closed variable of the coroutine linda to be properly closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", "coro got " .. tostring(s) .. " " .. tostring(r)) -- THIS TEST FAILS
+end
+---------------------------------------------------------------------------------------------------
+-- TEST: if a to-be-closed handler takes longer than the join timeout, everything works as expected
+---------------------------------------------------------------------------------------------------
+if true then
+        -- the generator
+        local coro_g = lanes.coro("*", utils.yielder_with_to_be_closed)
+        -- start the lane. The to-be-closed handler will sleep for 1 second
+        local h = coro_g(out_linda, 1)
+        -- first join attempt should timeout
+        local r, v = h:join(0.6)
+        assert(r == nil and v == "timeout", "got " .. tostring(r) .. " " .. tostring(v))
+        assert(h.status == "running", "got " .. h.status)
+        -- join the lane again. it should be done and give back the values resulting of the first yield point
+        local r, v1, v2 = h:join(0.6)
+        assert(r == true and v1 == "I yield!" and v2 == 1, "got " .. tostring(r) .. " " .. tostring(v1) .. " " .. tostring(v2))
+        assert(h.status == "done", "got " .. h.status)
+        -- force collection of the lane
+        h = nil
+        collectgarbage()
+        -- I want the to-be-closed variable of the coroutine linda to be properly closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", "coro got " .. tostring(s) .. " " .. tostring(r)) -- THIS TEST FAILS
+end
diff --git a/unit_tests/scripts/coro/error_handling.lua b/unit_tests/scripts/coro/error_handling.lua
index ba6cff6..1cfb8c8 100644
--- a/unit_tests/scripts/coro/error_handling.lua
+++ b/unit_tests/scripts/coro/error_handling.lua
@@ -38,15 +38,15 @@ local force_error_test = function(error_trace_level_)
    utils.dump_error_stack(error_trace_level_, c)
 end
-if false then
+if true then
    force_error_test("minimal")
 end
-if false then
+if true then
    force_error_test("basic")
 end
-if false then
+if true then
    force_error_test("extended")
 end
diff --git a/unit_tests/scripts/coro/index_suspended.lua b/unit_tests/scripts/coro/index_suspended.lua
new file mode 100644
index 0000000..2cd8c28
--- /dev/null
+++ b/unit_tests/scripts/coro/index_suspended.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+-------------------------------------------------------------------------
+-- TEST: if we index a yielded lane, we should get the last yielded value
+-------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the first yielded value, sending back the expected index
+    assert(h:resume(1) == "hello")
+    -- indexing multiple times gives back the same us the same yielded value
+    local r1 = h[1]
+    local r2 = h[1]
+    local r3 = h[1]
+    assert(r1 == "world" and r2 == "world" and r3 == "world", "got " .. r1 .. " " .. r2 .. " " .. r3)
+    -- once the lane was indexed, it is no longer resumable (just like after join)
+    local b, e = pcall(h.resume, h, 2)
+    assert(b == false and e == "cannot resume non-suspended coroutine Lane")
+end
diff --git a/unit_tests/scripts/coro/join_suspended.lua b/unit_tests/scripts/coro/join_suspended.lua
new file mode 100644
index 0000000..33be406
--- /dev/null
+++ b/unit_tests/scripts/coro/join_suspended.lua
@@ -0,0 +1,24 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+---------------------------------------------------
+-- TEST: if we join a yielded lane, the lane aborts
+---------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the first yielded value, sending back the expected index
+    assert(h:resume(1) == "hello")
+    -- join the lane. since it will reach a yield point, it unblocks and ends. last yielded values are returned normally
+    local b, r = h:join(0.5)
+    local s = h.status
+    assert(s == "done" and b == true and r == "world", "got " .. s .. " " .. tostring(b) .. " " .. tostring(r))
+end
diff --git a/unit_tests/scripts/coro/linda_in_close_handler.lua b/unit_tests/scripts/coro/linda_in_close_handler.lua
new file mode 100644
index 0000000..8636f01
--- /dev/null
+++ b/unit_tests/scripts/coro/linda_in_close_handler.lua
@@ -0,0 +1,43 @@
+local fixture = require "fixture"
+local lanes = require "lanes".configure{on_state_create = fixture.on_state_create}
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+-- this test is only for Lua 5.4+
+local utils = lanes.require "_utils54"
+local PRINT = utils.MAKE_PRINT()
+local out_linda = lanes.linda()
+local test_close = function(what_, f_)
+        local c = coroutine.create(f_)
+        for i = 1, 10 do
+                local t, r1, r2 = coroutine.resume(c, out_linda) -- returns true + <yielded values>
+                assert(t == true and r1 == "I yield!" and r2 == i, "got " .. tostring(t) .. " " .. tostring(r1) .. " " .. tostring(r2))
+                local s = coroutine.status(c)
+                assert(s == "suspended")
+        end
+        local r, s = coroutine.close(c)
+        assert(r == true and s == nil)
+        -- the local variable inside the yielder body should be closed
+        local s, r = out_linda:receive(0, "out")
+        assert(s == "out" and r == "Closed!", what_ .. " got " .. tostring(s) .. " " .. tostring(r))
+end
+---------------------------------------------------------
+-- TEST: first, try the close mechanism outside of a lane
+---------------------------------------------------------
+if true then
+        assert(type(utils.yielder_with_to_be_closed) == "function")
+        test_close("base", utils.yielder_with_to_be_closed)
+end
+---------------------------------------------------------------
+-- TEST: try again with a function obtained through dump/undump
+---------------------------------------------------------------
+if true then
+        -- note this means our yielder implementation can't have upvalues, as they are lost in the process
+        test_close("dumped", load(string.dump(utils.yielder_with_to_be_closed)))
+end
diff --git a/unit_tests/scripts/coro/regular_function.lua b/unit_tests/scripts/coro/regular_function.lua
new file mode 100644
index 0000000..09aa3b7
--- /dev/null
+++ b/unit_tests/scripts/coro/regular_function.lua
@@ -0,0 +1,38 @@
+local lanes = require "lanes".configure()
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- a lane body that just returns some value
+local returner = function(msg_)
+    local utils = lanes.require "_utils"
+    local PRINT = utils.MAKE_PRINT()
+    PRINT "In lane"
+    assert(msg_ == "hi")
+    return "bye"
+end
+-- a function that returns some value can run in a coroutine
+if true then
+    -- the generator
+    local g = lanes.coro("*", {name = "auto"}, returner)
+    -- launch lane
+    local h = g("hi")
+    local r = h[1]
+    assert(r == "bye")
+end
+-- can't resume a coro after the lane body has returned
+if true then
+    -- the generator
+    local g = lanes.coro("*", {name = "auto"}, returner)
+    -- launch lane
+    local h = g("hi")
+    -- resuming a lane that terminated execution should raise an error
+    local b, e = pcall(h.resume, h)
+    assert(b == false and type(e) == "string")
+end
diff --git a/unit_tests/scripts/coro/resume_basics.lua b/unit_tests/scripts/coro/resume_basics.lua
new file mode 100644
index 0000000..5b124f5
--- /dev/null
+++ b/unit_tests/scripts/coro/resume_basics.lua
@@ -0,0 +1,40 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+-- the coroutine generator
+local coro_g = lanes.coro("*", {name = "auto"}, utils.yield_one_by_one)
+-------------------------------------------------------------------------------------------------
+-- TEST: we can resume as many times as the lane yields, then read the returned value on indexing
+-------------------------------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the yielded values, sending back the expected index
+    assert(h:resume(1) == "hello")
+    assert(h:resume(2) == "world")
+    assert(h:resume(3) == "!")
+    -- the lane return value is available as usual
+    local r = h[1]
+    assert(r == "bye!")
+end
+---------------------------------------------------------------------------------------------
+-- TEST: we can resume as many times as the lane yields, then read the returned value on join
+---------------------------------------------------------------------------------------------
+if true then
+    -- launch coroutine lane
+    local h = coro_g("hello", "world", "!")
+    -- read the yielded values, sending back the expected index
+    assert(h:resume(1) == "hello")
+    assert(h:resume(2) == "world")
+    assert(h:resume(3) == "!")
+    -- the lane return value is available as usual
+    local s, r = h:join()
+    assert(h.status == "done" and s == true and r == "bye!")
+end
diff --git a/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua b/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua
new file mode 100644
index 0000000..fc0c072
--- /dev/null
+++ b/unit_tests/scripts/coro/yielding_in_non_coro_errors.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes"
+local fixture = require "fixture"
+lanes.finally(fixture.throwing_finalizer)
+local utils = lanes.require "_utils"
+local PRINT = utils.MAKE_PRINT()
+--------------------------------------------------------------------------------------------------
+-- TEST: if we start a non-coroutine lane with a yielding function, we should get an error, right?
+--------------------------------------------------------------------------------------------------
+local fun_g = lanes.gen("*", { name = 'auto' }, utils.yield_one_by_one)
+local h = fun_g("hello", "world", "!")
+local err, status, stack = h:join()
+PRINT(err, status, stack)
+-- the actual error message is not the same for Lua 5.1
+-- of course, it also has to be different for LuaJIT as well
+-- also, LuaJIT prepends a file:line to the actual error message, which Lua5.1 does not.
+local msgs = {
+    ["Lua 5.1"] = jit and "attempt to yield across C-call boundary" or "attempt to yield across metamethod/C-call boundary",
+    ["Lua 5.2"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.3"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.4"] = "attempt to yield from outside a coroutine",
+    ["Lua 5.5"] = "attempt to yield from outside a coroutine"
+}
+local expected_msg = msgs[_VERSION]
+PRINT("expected_msg = " .. expected_msg)
+assert(err == nil and string.find(status, expected_msg, 1, true) and stack == nil, "status = " .. status)
diff --git a/unit_tests/scripts/lane/body_is_a_c_function.lua b/unit_tests/scripts/lane/body_is_a_c_function.lua
new file mode 100644
index 0000000..d8d329f
--- /dev/null
+++ b/unit_tests/scripts/lane/body_is_a_c_function.lua
@@ -0,0 +1,28 @@
+local lanes = require "lanes".configure()
+-- ##################################################################################################
+-- ##################################################################################################
+-- ##################################################################################################
+-- we can create a generator where the lane body is a C function
+do
+    local b, g = pcall(lanes.gen, "*", print)
+    assert(b == true and type(g) == "function")
+    -- we can start the lane
+    local b, h = pcall(g, "hello")
+    -- the lane runs normally
+    h:join()
+    assert(h.status == "done")
+end
+-- we can create a generator where the lane body is a C function that raises an error
+do
+    local b, g = pcall(lanes.gen, "*", error)
+    assert(b == true and type(g) == "function")
+    -- we can start the lane
+    local b, h = pcall(g, "this is an error")
+    -- this provides the error that occurred in the lane
+    local s, e, t = h:join()
+    assert(h.status == "error")
+    assert(s == nil and e == "this is an error" and t == nil)
+end
diff --git a/unit_tests/scripts/lane/cooperative_shutdown.lua b/unit_tests/scripts/lane/cooperative_shutdown.lua
index 756e33c..0a0943e 100644
--- a/unit_tests/scripts/lane/cooperative_shutdown.lua
+++ b/unit_tests/scripts/lane/cooperative_shutdown.lua
@@ -1,10 +1,10 @@
-local lanes = require "lanes"
+local lanes = require "lanes".configure{on_state_create = require "fixture".on_state_create}
 -- launch lanes that cooperate properly with cancellation request
 local lane1 = function()
        lane_threadname("lane1")
-        -- loop breaks on cancellation request
+        -- loop breaks on soft cancellation request
        repeat
                lanes.sleep(0)
        until cancel_test()
@@ -23,7 +23,6 @@ end
 local lane3 = function()
        lane_threadname("lane3")
        -- this one cooperates too, because of the hook cancellation modes that Lanes will be using
-        -- but not with LuaJIT, because the function is compiled, and we don't call anyone, so no hook triggers
        local fixture = require "fixture"
        repeat until fixture.give_me_back(false)
 end
@@ -43,7 +42,14 @@ local h2 = g2(linda)
 local h3 = g3()
-- wait until they are both started
+lanes.sleep(0.1)
-repeat until h1.status == "running" and h2.status == "waiting" and h3.status == "running"
+local is_running = function(lane_h)
+        local status = lane_h.status
+        return status == "running" or status == "waiting"
+end
+-- wait until they are all started
+repeat until is_running(h1) and is_running(h2) and is_running(h3)
 -- let the script terminate, Lanes should not crash at shutdown
diff --git a/unit_tests/scripts/lane/tasking_cancelling.lua b/unit_tests/scripts/lane/tasking_cancelling.lua
index 873140e..d153ffa 100644
--- a/unit_tests/scripts/lane/tasking_cancelling.lua
+++ b/unit_tests/scripts/lane/tasking_cancelling.lua
@@ -1,4 +1,7 @@
-local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure(config).configure()
+local require_fixture_result_1, require_fixture_result_2 = require "fixture"
+local fixture = assert(require_fixture_result_1)
+local require_lanes_result_1, require_lanes_result_2 = require "lanes".configure{on_state_create = fixture.on_state_create}.configure()
 print("require_lanes_result:", require_lanes_result_1, require_lanes_result_2)
 local lanes = require_lanes_result_1
@@ -15,6 +18,28 @@ local lanes_linda = assert(lanes.linda)
 -- ##################################################################################################
 -- ##################################################################################################
+-- cancellation of cooperating lanes
+local cooperative = function()
+    local fixture = assert(require "fixture")
+    local which_cancel
+    repeat
+        fixture.block_for(0.2)
+        which_cancel = cancel_test()
+    until which_cancel
+    return which_cancel
+end
+-- soft and hard are behaviorally equivalent when no blocking linda operation is involved
+local cooperative_lane_soft = lanes_gen("*", { name = 'auto' }, cooperative)()
+local a, b = cooperative_lane_soft:cancel("soft", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(a) .. " " .. tostring(b))
+assert(cooperative_lane_soft[1] == "soft") -- return value of the lane body is the value returned by cancel_test()
+local cooperative_lane_hard = lanes_gen("*", { name = 'auto' }, cooperative)()
+local c, d = cooperative_lane_hard:cancel("hard", 0) -- issue request, do not wait for lane to terminate
+assert(a == false and b == "timeout", "got " .. tostring(c) .. " " .. tostring(d))
+assert(cooperative_lane_hard[1] == "hard") -- return value of the lane body is the value returned by cancel_test()
+-- ##################################################################################################
 -- cancellation of lanes waiting on a linda
 local limited = lanes_linda{name = "limited"}
 assert.fails(function() limited:limit("key", -1) end)
diff --git a/unit_tests/scripts/lane/tasking_join_test.lua b/unit_tests/scripts/lane/tasking_join_test.lua
index 2fbce6c..495a709 100644
--- a/unit_tests/scripts/lane/tasking_join_test.lua
+++ b/unit_tests/scripts/lane/tasking_join_test.lua
@@ -30,14 +30,19 @@ end
 PRINT("---=== :join test ===---", "\n\n")
+-- a lane body that returns nothing is successfully joined with true, nil
+local r, ret = lanes_gen(function() end)():join()
+assert(r == true and ret == nil)
 -- NOTE: 'unpack()' cannot be used on the lane handle; it will always return nil
 --       (unless [1..n] has been read earlier, in which case it would seemingly
 --       work).
-local S= lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
+local S = lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
    function(arg)
        lane_threadname "join test lane"
        set_finalizer(function() end)
+        -- take arg table, reverse its contents in aux, then return the unpacked result
        local aux= {}
        for i, v in ipairs(arg) do
           table.insert(aux, 1, v)
@@ -46,15 +51,16 @@ local S= lanes_gen("table", { name = 'auto', gc_cb = gc_cb },
    return (unpack or table.unpack)(aux)
 end)
-h= S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
+local h = S { 12, 13, 14 }     -- execution starts, h[1..3] will get the return values
 -- wait a bit so that the lane has a chance to set its debug name
 SLEEP(0.5)
 print("joining with '" .. h:get_threadname() .. "'")
-local a,b,c,d= h:join()
+local r, a, b, c, d = h:join()
 if h.status == "error" then
-    print(h:get_threadname(), "error: " , a, b, c, d)
+    print(h:get_threadname(), "error: " , r, a, b, c, d)
 else
-    print(h:get_threadname(), a,b,c,d)
+    print(h:get_threadname(), r, a, b, c, d)
+    assert(r==true, "r == " .. tostring(r))
    assert(a==14, "a == " .. tostring(a))
    assert(b==13, "b == " .. tostring(b))
    assert(c==12, "c == " .. tostring(c))
diff --git a/unit_tests/scripts/lane/tasking_send_receive_code.lua b/unit_tests/scripts/lane/tasking_send_receive_code.lua
index cb3663f..fdc2602 100644
--- a/unit_tests/scripts/lane/tasking_send_receive_code.lua
+++ b/unit_tests/scripts/lane/tasking_send_receive_code.lua
@@ -53,28 +53,26 @@ local function chunk2(linda)
    assert(info.linedefined == 32, "bad linedefined")   -- start of 'chunk2'
    assert(config.strip_functions and info.currentline==-1 or info.currentline > info.linedefined, "bad currentline")   -- line of 'debug.getinfo'
    assert(info.lastlinedefined > info.currentline, "bad lastlinedefined")   -- end of 'chunk2'
-    local k,func= linda:receive("down")
+    assert(linda:count("down") == 2, "bad linda contents") -- function, "ok"
-    assert(type(func)=="function", "not a function")
+    local k,func,str= linda:receive_batched("down", 2)
    assert(k=="down")
+    assert(type(func)=="function", "not a function")
+    assert(str=="ok", "bad receive result: " .. tostring(k) .. " -> ".. tostring(str))
+    assert(linda:count("down") == 0, "bad linda contents") -- nothing
    func(linda)
-    local k,str= linda:receive("down")
-    assert(str=="ok", "bad receive result")
    linda:send("up", function() return ":)" end, "ok2")
 end
 local linda = lanes_linda{name = "auto"}
 local t2= lanes_gen("debug,package,string,io", { name = 'auto', gc_cb = gc_cb }, chunk2)(linda)     -- prepare & launch
-linda:send("down", function(linda) linda:send("up", "ready!") end,
+linda:send("down", function(linda) linda:send("up", "ready!") end, "ok")
-                    "ok")
 -- wait to see if the tiny function gets executed
 --
 local k,s= linda:receive(1, "up")
 if t2.status == "error" then
-    PRINT("t2 error: " , t2:join())
+    local n,err,s = t2:join()
-    assert(false)
+    assert(false, "t2 error: " .. err)
 end
 PRINT(s)
 assert(s=="ready!", s .. " is not 'ready!'")
diff --git a/unit_tests/scripts/lane/uncooperative_shutdown.lua b/unit_tests/scripts/lane/uncooperative_shutdown.lua
index 89e1ff8..eb89ed3 100644
--- a/unit_tests/scripts/lane/uncooperative_shutdown.lua
+++ b/unit_tests/scripts/lane/uncooperative_shutdown.lua
@@ -8,7 +8,7 @@ local lanes = require "lanes".configure{shutdown_timeout = 0.001, on_state_creat
 -- launch lanes that blocks forever
 local lane = function()
        local fixture = require "fixture"
-        fixture.sleep_for()
+        fixture.block_for()
 end
 -- the generator
diff --git a/unit_tests/scripts/linda/send_receive_func_and_string.lua b/unit_tests/scripts/linda/send_receive_func_and_string.lua
new file mode 100644
index 0000000..188cfcd
--- /dev/null
+++ b/unit_tests/scripts/linda/send_receive_func_and_string.lua
@@ -0,0 +1,13 @@
+local lanes = require "lanes"
+-- a newly created linda doesn't contain anything
+local l = lanes.linda()
+-- send a function and a string, make sure that's what we read back
+l:send("k", function() end, "str")
+local c = l:count("k")
+assert(c == 2, "got " .. c)
+local k, v1, v2 = l:receive_batched("k", 2)
+local tv1, tv2 = type(v1), type(v2)
+assert(k == "k" and tv1 == "function" and tv2 == "string", "got " .. tv1 .. " " .. tv2)
+assert(l:count("k") == 0)
diff --git a/unit_tests/scripts/linda/wake_period.lua b/unit_tests/scripts/linda/wake_period.lua
index e4a900d..d2dccc3 100644
--- a/unit_tests/scripts/linda/wake_period.lua
+++ b/unit_tests/scripts/linda/wake_period.lua
@@ -6,7 +6,7 @@ local lanes = require_lanes_result_1
 local body = function(linda_)
        -- a blocking read that lasts longer than the tested wake_period values
        linda_:receive(2, "empty_slot")
-        return true
+        return "done"
 end
 -- if we don't cancel the lane, we should wait the whole duration
@@ -22,7 +22,8 @@ local function check_wake_duration(linda_, expected_, do_cancel_)
                assert(result == false and reason == 'timeout', "unexpected cancel result")
        end
        -- this should wait until the linda wakes by itself before the actual receive timeout and sees the cancel request
-        h:join()
+        local r, ret = h:join()
+        assert(r == true and ret == "done")
        local t1 = lanes.now_secs()
        local delta = t1 - t0
        -- the linda should check for cancellation at about the expected period, not earlier
diff --git a/unit_tests/scripts/misc/deeptest.lua b/unit_tests/scripts/misc/deeptest.lua
new file mode 100644
index 0000000..542c35b
--- /dev/null
+++ b/unit_tests/scripts/misc/deeptest.lua
@@ -0,0 +1,161 @@
+local fixture = require "fixture"
+local lanes = require("lanes").configure{on_state_create = fixture.on_state_create}
+local l = lanes.linda{name = "my linda"}
+local table_unpack = table.unpack or unpack -- Lua 5.1 support
+-- we will transfer userdata created by this module, so we need to make Lanes aware of it
+local dt = lanes.require "deep_userdata_example"
+-- set DEEP to any non-false value to run the Deep Userdata tests. "gc" selects a special test for debug purposes
+DEEP = DEEP or true
+-- set CLONABLE to any non-false value to run the Clonable Userdata tests
+CLONABLE = CLONABLE or true
+-- lua 5.1->5.2 support a single table uservalue
+-- lua 5.3->5.4 supports an arbitrary type uservalue
+local test_uvtype = (_VERSION == "Lua 5.4") and "function" or (_VERSION == "Lua 5.3") and "string" or "table"
+-- lua 5.4 supports multiple uservalues
+local nupvals = _VERSION == "Lua 5.4" and 3 or 1
+local makeUserValue = function( obj_)
+        if test_uvtype == "table" then
+                return {"some uservalue"}
+        elseif test_uvtype == "string" then
+                return "some uservalue"
+        elseif test_uvtype == "function" then
+                -- a function that pull the userdata as upvalue
+                local f = function()
+                        return "-> '" .. tostring( obj_) .. "'"
+                end
+                return f
+        end
+end
+local printDeep = function( prefix_, obj_, t_)
+        print( prefix_, obj_)
+        for uvi = 1, nupvals do
+                local uservalue = obj_:getuv(uvi)
+                print ("uv #" .. uvi, type( uservalue), uservalue, type(uservalue) == "function" and uservalue() or "")
+        end
+        if t_ then
+                local count = 0
+                for k, v in ipairs( t_) do
+                        print( "t["..tostring(k).."]", v)
+                        count = count + 1
+                end
+                -- we should have only 2 indexed entries with the same value
+                assert(count == 2 and t_[1] == t_[2])
+        end
+        print()
+end
+local performTest = function( obj_)
+        -- setup the userdata with some value and a uservalue
+        obj_:set( 666)
+        obj_:setuv( 1, makeUserValue( obj_))
+        if nupvals > 1 then
+                -- keep uv #2 as nil
+                obj_:setuv( 3, "ENDUV")
+        end
+        local t =
+        {
+                -- two indices with an identical value: we should also have identical values on the other side (even if not the same as the original ones when they are clonables)
+                obj_,
+                obj_,
+                -- this one won't transfer because we don't support full uservalue as keys
+                [obj_] = "val"
+        }
+        -- read back the contents of the object
+        printDeep( "immediate:", obj_, t)
+        -- send the object in a linda, get it back out, read the contents
+        l:set( "key", obj_, t)
+        -- when obj_ is a deep userdata, out is the same userdata as obj_ (not another one pointing on the same deep memory block) because of an internal cache table [deep*] -> proxy)
+        -- when obj_ is a clonable userdata, we get a different clone everytime we cross a linda or lane barrier
+        local _n, _val1, _val2 = l:get( "key", 2)
+        assert(_n == (_val2 and 2 or 1))
+        printDeep( "out of linda:", _val1, _val2)
+        -- send the object in a lane through argument passing, the lane body returns it as return value, read the contents
+        local g = lanes.gen(
+                "package"
+                , {
+                        name = 'auto',
+                        required = { "deep_userdata_example"} -- we will transfer userdata created by this module, so we need to make this lane aware of it
+                }
+                , function( arg_, t_)
+                        -- read contents inside lane: arg_ and t_ by argument
+                        printDeep( "in lane, as arguments:", arg_, t_)
+                        -- read contents inside lane: obj_ and t by upvalue
+                        printDeep( "in lane, as upvalues:", obj_, t)
+                        -- read contents inside lane: in linda
+                        local _n, _val1, _val2 = l:get( "key", 2)
+                        assert(_n == (_val2 and 2 or 1))
+                        printDeep( "in lane, from linda:", _val1, _val2)
+                        return arg_, t_
+                end
+        )
+        h = g( obj_, t)
+        -- when obj_ is a deep userdata, from_lane is the same userdata as obj_ (not another one pointing on the same deep memory block) because of an internal cache table [deep*] -> proxy)
+        -- when obj_ is a clonable userdata, we get a different clone everytime we cross a linda or lane barrier
+        printDeep( "from lane:", h[1], h[2])
+end
+if DEEP then
+        print "================================================================"
+        print "DEEP"
+        local d = dt.new_deep(nupvals)
+        if type(DEEP) == "string" then
+                local gc_tests = {
+                        thrasher = function(repeat_, size_)
+                                print "in thrasher"
+                                -- result is a table of repeat_ tables, each containing size_ entries
+                                local result = {}
+                                for i = 1, repeat_ do
+                                        local batch_values = {}
+                                        for j = 1, size_ do
+                                                table.insert(batch_values, j)
+                                        end
+                                        table.insert(result, batch_values)
+                                end
+                                print "thrasher done"
+                                return result
+                        end,
+                        stack_abuser = function(repeat_, size_)
+                                print "in stack_abuser"
+                                for i = 1, repeat_ do
+                                        local batch_values = {}
+                                        for j = 1, size_ do
+                                                table.insert(batch_values, j)
+                                        end
+                                        -- return size_ values
+                                        local _ = table_unpack(batch_values)
+                                end
+                                print "stack_abuser done"
+                                return result
+                        end
+                }
+                -- have the object call the function from inside one of its functions, to detect if it gets collected from there (while in use!)
+                local testf = gc_tests[DEEP]
+                if testf then
+                        local r = d:invoke(gc_tests[DEEP], REPEAT or 10, SIZE or 10)
+                        print("invoke -> ", tostring(r))
+                else
+                        print("unknown test '" .. DEEP .. "'")
+                end
+        else
+                performTest(d)
+        end
+end
+if CLONABLE then
+        print "================================================================"
+        print "CLONABLE"
+        performTest( dt.new_clonable(nupvals))
+end
+print "================================================================"
+print "TEST OK"
+\ No newline at end of file
diff --git a/unit_tests/shared.cpp b/unit_tests/shared.cpp
index e70d5d8..9f3b08e 100644
--- a/unit_tests/shared.cpp
+++ b/unit_tests/shared.cpp
@@ -18,9 +18,9 @@ namespace
        {
            STACK_CHECK_START_REL(L_, 0);
            lua_getglobal(L_, "package");                                                          // L_: package
-            std::ignore = luaG_getfield(L_, kIdxTop, "preload");                                   // L_: package package.preload
+            std::ignore = luaW_getfield(L_, kIdxTop, "preload");                                   // L_: package package.preload
            lua_pushcfunction(L_, openf_);                                                         // L_: package package.preload openf_
-            luaG_setfield(L_, StackIndex{ -2 }, name_);                                            // L_: package package.preload
+            luaW_setfield(L_, StackIndex{ -2 }, name_);                                            // L_: package package.preload
            lua_pop(L_, 2);
            STACK_CHECK(L_, 0);
        }
@@ -32,7 +32,7 @@ namespace
        lua_CFunction sFreezingFinalizer = +[](lua_State* const L_) {
            std::lock_guard _guard{ sCallCountsLock };
            sFinalizerHits[L_].test_and_set();
-            luaG_pushstring(L_, "freeze"); // just freeze the thread in place so that it can be debugged
+            luaW_pushstring(L_, "freeze"); // just freeze the thread in place so that it can be debugged
            return 1;
        };
@@ -47,22 +47,22 @@ namespace
        };
        lua_CFunction sNewUserData = +[](lua_State* const L_) {
-            std::ignore = luaG_newuserdatauv<int>(L_, UserValueCount{ 0 });
+            std::ignore = luaW_newuserdatauv<int>(L_, UserValueCount{ 0 });
            return 1;
        };
-        // a function that enables any lane to require "fixture"
+        // a function that enables any lane to require "fixture" and "deep_userdata_example"
        lua_CFunction sOnStateCreate = +[](lua_State* const L_) {
            PreloadModule(L_, "fixture", luaopen_fixture);
            PreloadModule(L_, "deep_userdata_example", luaopen_deep_userdata_example);
            return 0;
        };
-        // a function that sleeps for the specified duration (in seconds)
+        // a function that blocks for the specified duration (in seconds) by putting the current thread to sleep
-        lua_CFunction sSleepFor = +[](lua_State* const L_) {
+        lua_CFunction sBlockFor = +[](lua_State* const L_) {
            std::chrono::time_point<std::chrono::steady_clock> _until{ std::chrono::time_point<std::chrono::steady_clock>::max() };
            lua_settop(L_, 1);
-            if (luaG_type(L_, kIdxTop) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
+            if (luaW_type(L_, kIdxTop) == LuaType::NUMBER) { // we don't want to use lua_isnumber() because of autocoercion
                lua_Duration const _duration{ lua_tonumber(L_, kIdxTop) };
                if (_duration.count() >= 0.0) {
                    _until = std::chrono::steady_clock::now() + std::chrono::duration_cast<std::chrono::steady_clock::duration>(_duration);
@@ -82,17 +82,17 @@ namespace
            std::lock_guard _guard{ sCallCountsLock };
            sFinalizerHits[L_].test_and_set();
            bool const _allLanesTerminated = lua_toboolean(L_, kIdxTop);
-            luaG_pushstring(L_, "Finalizer%s", _allLanesTerminated ? "" : ": Uncooperative lanes detected");
+            luaW_pushstring(L_, "Finalizer%s", _allLanesTerminated ? "" : ": Uncooperative lanes detected");
            return 1;
        };
        static luaL_Reg const sFixture[] = {
            { "freezing_finalizer", sFreezingFinalizer },
-            { "give_me_back()", sGiveMeBack },
+            { "give_me_back", sGiveMeBack },
            { "newlightuserdata", sNewLightUserData },
            { "newuserdata", sNewUserData },
            { "on_state_create", sOnStateCreate },
-            { "sleep_for", sSleepFor },
+            { "block_for", sBlockFor },
            { "throwing_finalizer", sThrowingFinalizer },
            { nullptr, nullptr }
        };
@@ -103,7 +103,7 @@ namespace
    int luaopen_fixture(lua_State* L_)
    {
        STACK_CHECK_START_REL(L_, 0);
-        luaG_newlib<std::size(local::sFixture)>(L_, local::sFixture);                              // M
+        luaW_newlib<std::size(local::sFixture)>(L_, local::sFixture);                              // M
        STACK_CHECK(L_, 1);
        return 1;
    }
@@ -246,7 +246,7 @@ LuaError LuaState::doString(std::string_view const& str_) const
        return _loadErr;
    }
    LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                                              // L: "<msg>"?
-    [[maybe_unused]] std::string_view const _out{ luaG_tostring(L, kIdxTop) };
+    [[maybe_unused]] std::string_view const _out{ luaW_tostring(L, kIdxTop) };
    STACK_CHECK(L, 1);
    return _callErr;
 }
@@ -257,8 +257,8 @@ std::string_view LuaState::doStringAndRet(std::string_view const& str_) const
 {
    lua_settop(L, 0);
    if (str_.empty()) {
-        luaG_pushstring(L, "");
+        luaW_pushstring(L, "");
-        return luaG_tostring(L, kIdxTop);
+        return luaW_tostring(L, kIdxTop);
    }
    STACK_CHECK_START_REL(L, 0);
    LuaError const _loadErr{ luaL_loadstring(L, str_.data()) };                                    // L: chunk()
@@ -268,7 +268,7 @@ std::string_view LuaState::doStringAndRet(std::string_view const& str_) const
    }
    [[maybe_unused]] LuaError const _callErr{ lua_pcall(L, 0, 1, 0) };                             // L: "<msg>"?|retstring
    STACK_CHECK(L, 1);
-    return luaG_tostring(L, kIdxTop);
+    return luaW_tostring(L, kIdxTop);
 }
 // #################################################################################################
@@ -336,7 +336,7 @@ void LuaState::requireFailure(std::string_view const& script_)
 {
    auto const _result{ doString(script_) };
    if (_result == LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result != LuaError::OK);
    lua_settop(L, 0);
@@ -372,7 +372,7 @@ void LuaState::requireSuccess(std::string_view const& script_)
 {
    auto const _result{ doString(script_) };
    if (_result != LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result == LuaError::OK);
    lua_settop(L, 0);
@@ -384,7 +384,7 @@ void LuaState::requireSuccess(std::filesystem::path const& root_, std::string_vi
 {
    auto const _result{ doFile(root_, path_) };
    if (_result != LuaError::OK) {
-        WARN(luaG_tostring(L, kIdxTop));
+        WARN(luaW_tostring(L, kIdxTop));
    }
    REQUIRE(_result == LuaError::OK);
    lua_settop(L, 0);
@@ -407,20 +407,20 @@ TEST_CASE("LuaState.doString")
 {
    LuaState _L{ LuaState::WithBaseLibs{ true }, LuaState::WithFixture{ false } };
    // if the script fails to load, we should find the error message at the top of the stack
-    REQUIRE([&L = _L]() { std::ignore = L.doString("function end"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::STRING; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("function end"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::STRING; }());
    // if the script runs, the stack should contain its return value
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return true"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::BOOLEAN; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return true"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::BOOLEAN; }());
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return 'hello'"); return lua_gettop(L) == 1 && luaG_tostring(L, StackIndex{1}) == "hello"; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return 'hello'"); return lua_gettop(L) == 1 && luaW_tostring(L, StackIndex{1}) == "hello"; }());
    // or nil if it didn't return anything
-    REQUIRE([&L = _L]() { std::ignore = L.doString("return"); return lua_gettop(L) == 1 && luaG_type(L, StackIndex{1}) == LuaType::NIL; }());
+    REQUIRE([&L = _L]() { std::ignore = L.doString("return"); return lua_gettop(L) == 1 && luaW_type(L, StackIndex{1}) == LuaType::NIL; }());
    // on failure, doStringAndRet returns "", and the error message is on the stack
-    REQUIRE([&L = _L]() { return L.doStringAndRet("function end") == "" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::STRING && luaG_tostring(L, StackIndex{ 1 }) != ""; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("function end") == "" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::STRING && luaW_tostring(L, StackIndex{ 1 }) != ""; }());
    // on success doStringAndRet returns the string returned by the script, that is also at the top of the stack
-    REQUIRE([&L = _L]() { return L.doStringAndRet("return 'hello'") == "hello" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::STRING && luaG_tostring(L, StackIndex{ 1 }) == "hello"; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("return 'hello'") == "hello" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::STRING && luaW_tostring(L, StackIndex{ 1 }) == "hello"; }());
    // if the returned value is not (convertible to) a string, we should get an empty string out of doStringAndRet
-    REQUIRE([&L = _L]() { return L.doStringAndRet("return function() end") == "" && lua_gettop(L) == 1 && luaG_type(L, StackIndex{ 1 }) == LuaType::FUNCTION && luaG_tostring(L, StackIndex{ 1 }) == ""; }());
+    REQUIRE([&L = _L]() { return L.doStringAndRet("return function() end") == "" && lua_gettop(L) == 1 && luaW_type(L, StackIndex{ 1 }) == LuaType::FUNCTION && luaW_tostring(L, StackIndex{ 1 }) == ""; }());
 }
 // #################################################################################################
@@ -436,9 +436,9 @@ FileRunner::FileRunner(std::string_view const& where_)
    // because the VS Test Explorer doesn't appreciate the text output of some scripts, so absorb them
    if constexpr (1) {
        auto const _nullprint = +[](lua_State* const L_) { return 0; };
-        luaG_pushglobaltable(L);
+        luaW_pushglobaltable(L);
        lua_pushcfunction(L, _nullprint);
-        luaG_setfield(L, StackIndex{ -2 }, std::string_view{ "print" });
+        luaW_setfield(L, StackIndex{ -2 }, std::string_view{ "print" });
        lua_pop(L, 1);
        stackCheck(0);
    }
diff --git a/unit_tests/shared.h b/unit_tests/shared.h
index b884df0..c6c3339 100644
--- a/unit_tests/shared.h
+++ b/unit_tests/shared.h
@@ -56,7 +56,7 @@ class LuaState
    friend std::ostream& operator<<(std::ostream& os_, LuaState const& s_)
    {
-        os_ << luaG_tostring(s_.L, kIdxTop);
+        os_ << luaW_tostring(s_.L, kIdxTop);
        return os_;
    }
 };