diff --git a/demo/wasienv/canvas/demowasicanvas.lpi b/demo/wasienv/canvas/demowasicanvas.lpi
index a157da6..7f4d1f7 100644
--- a/demo/wasienv/canvas/demowasicanvas.lpi
+++ b/demo/wasienv/canvas/demowasicanvas.lpi
@@ -14,9 +14,11 @@
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
-    <CustomData Count="2">
+    <CustomData Count="4">
       <Item0 Name="MaintainHTML" Value="1"/>
-      <Item1 Name="PasJSWebBrowserProject" Value="1"/>
+      <Item1 Name="Pas2JSProject" Value="1"/>
+      <Item2 Name="PasJSLocation" Value="canvas"/>
+      <Item3 Name="PasJSWebBrowserProject" Value="1"/>
     </CustomData>
     <BuildModes>
       <Item Name="Default" Default="True"/>
@@ -48,7 +50,7 @@
   </ProjectOptions>
   <CompilerOptions>
     <Version Value="11"/>
-    <Target FileExt=".js">
+    <Target>
       <Filename Value="demowasicanvas"/>
     </Target>
     <SearchPaths>
@@ -58,8 +60,8 @@
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
-        <CPPInline Value="False"/>
         <UseAnsiStrings Value="False"/>
+        <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
diff --git a/demo/wasienv/dom/BrowserDomTest1.lpi b/demo/wasienv/dom/BrowserDomTest1.lpi
index 2b693e6..f35188e 100644
--- a/demo/wasienv/dom/BrowserDomTest1.lpi
+++ b/demo/wasienv/dom/BrowserDomTest1.lpi
@@ -67,8 +67,8 @@
     <Parsing>
       <SyntaxOptions>
         <AllowLabel Value="False"/>
-        <CPPInline Value="False"/>
         <UseAnsiStrings Value="False"/>
+        <CPPInline Value="False"/>
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
diff --git a/demo/wasienv/dom/WasiDomTest1.lpr b/demo/wasienv/dom/WasiDomTest1.lpr
index b1e96fe..f6f7742 100644
--- a/demo/wasienv/dom/WasiDomTest1.lpr
+++ b/demo/wasienv/dom/WasiDomTest1.lpr
@@ -11,7 +11,7 @@ uses
   {$IFDEF UseDucet}
   unicodeducet, unicodedata, fpwidestring,
   {$ENDIF}
-  Math, SysUtils, Variants, JOB_Shared, JOB_Web, JOB_JS;
+  Math, SysUtils, Variants, JOB.Shared, JOB_Web, JOB.JS;
 
 type
   EWasiTest = class(Exception);
@@ -1233,7 +1233,7 @@ end;
 // workaround: fpc wasm does not yet support exporting functions from units
 function JOBCallback(const Func: TJOBCallback; Data, Code: Pointer; Args: PByte): PByte;
 begin
-  Result:=JOB_JS.JOBCallback(Func,Data,Code,Args);
+  Result:=JOB.JS.JOBCallback(Func,Data,Code,Args);
 end;
 
 exports
diff --git a/demo/wasienv/job/hostsimpletest.lps b/demo/wasienv/job/hostsimpletest.lps
index a930fed..03cee34 100644
--- a/demo/wasienv/job/hostsimpletest.lps
+++ b/demo/wasienv/job/hostsimpletest.lps
@@ -8,7 +8,7 @@
         <Filename Value="hostsimpletest.lpr"/>
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="38"/>
+        <TopLine Value="25"/>
         <CursorPos X="18" Y="53"/>
         <UsageCount Value="31"/>
         <Loaded Value="True"/>
@@ -19,7 +19,7 @@
         <CustomData Count="1">
           <Item0 Name="PasJSIsProjectHTMLFile" Value="1"/>
         </CustomData>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="1"/>
         <CursorPos X="19" Y="16"/>
         <UsageCount Value="31"/>
         <Loaded Value="True"/>
@@ -40,36 +40,32 @@
       <Unit>
         <Filename Value="../../../FPC/Pas2JS/packages/job/src/job_shared.pp"/>
         <UnitName Value="JOB_Shared"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="5"/>
         <CursorPos X="3" Y="36"/>
         <UsageCount Value="16"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="job_browser.pp"/>
         <UnitName Value="JOB_Browser"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="976"/>
         <CursorPos X="20" Y="988"/>
         <UsageCount Value="16"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="../../../FPC/Pas2JS/packages/wasi/src/wasihostapp.pas"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="38"/>
         <CursorPos X="5" Y="50"/>
         <UsageCount Value="12"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="../../../FPC/Pas2JS/packages/rtl/src/browserconsole.pas"/>
-        <EditorIndex Value="1"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="150"/>
         <CursorPos Y="178"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="../../../FPC/Pas2JS/packages/rtl/src/web.pas"/>
@@ -89,7 +85,7 @@
       </Unit>
       <Unit>
         <Filename Value="wasmsimpletest.lpr"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="2"/>
         <TopLine Value="16"/>
         <CursorPos X="20" Y="19"/>
         <UsageCount Value="10"/>
@@ -97,13 +93,12 @@
       </Unit>
       <Unit>
         <Filename Value="job.js.pas"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
         <CursorPos Y="5"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit>
     </Units>
-    <JumpHistory HistoryIndex="29">
+    <JumpHistory HistoryIndex="10">
       <Position>
         <Filename Value="hostsimpletest.lpr"/>
         <Caret Line="51" Column="57" TopLine="35"/>
@@ -136,84 +131,10 @@
         <Filename Value="hostsimpletest.lpr"/>
         <Caret Line="69" Column="63" TopLine="45"/>
       </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="242" Column="25" TopLine="223"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="91" Column="15" TopLine="73"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="184" Column="16" TopLine="168"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="84" Column="19" TopLine="72"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="506" TopLine="495"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="703" Column="22" TopLine="678"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="772" Column="42" TopLine="764"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="691" Column="22" TopLine="659"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="701" Column="24" TopLine="669"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="796" Column="25" TopLine="764"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="26" Column="9"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="51" Column="8" TopLine="11"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="672" Column="22" TopLine="672"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="3" Column="46"/>
-      </Position>
       <Position>
         <Filename Value="hostsimpletest.lpr"/>
         <Caret Line="55"/>
       </Position>
-      <Position>
-        <Filename Value="../../../FPC/Pas2JS/packages/rtl/src/browserconsole.pas"/>
-        <Caret Line="59" Column="3" TopLine="37"/>
-      </Position>
-      <Position>
-        <Filename Value="../../../FPC/Pas2JS/packages/rtl/src/browserconsole.pas"/>
-        <Caret Line="132" Column="22" TopLine="132"/>
-      </Position>
-      <Position>
-        <Filename Value="../../../FPC/Pas2JS/packages/rtl/src/browserconsole.pas"/>
-        <Caret Line="48" Column="3" TopLine="19"/>
-      </Position>
       <Position>
         <Filename Value="hostsimpletest.lpr"/>
         <Caret Line="82" Column="17" TopLine="45"/>
diff --git a/demo/wasienv/job/wasmsimpletest.lpi b/demo/wasienv/job/wasmsimpletest.lpi
index 7b90e74..df33c6c 100644
--- a/demo/wasienv/job/wasmsimpletest.lpi
+++ b/demo/wasienv/job/wasmsimpletest.lpi
@@ -43,7 +43,7 @@
     <CodeGeneration>
       <TargetCPU Value="wasm32"/>
       <TargetOS Value="wasi"/>
-      <Subtarget Value="unicodertl-browser"/>
+      <Subtarget Value="unicodertl"/>
     </CodeGeneration>
     <Linking>
       <Debugging>
@@ -58,7 +58,7 @@
       <OtherDefines Count="1">
         <Define0 Value="FPC_DOTTEDUNITS"/>
       </OtherDefines>
-      <CompilerPath Value="/home/tixeo/bin/ppcrosswasm32"/>
+      <CompilerPath Value="/usr/lib/fpc/3.3.1/ppcrosswasm32"/>
     </Other>
   </CompilerOptions>
   <Debugging>
diff --git a/demo/wasienv/job/wasmsimpletest.lps b/demo/wasienv/job/wasmsimpletest.lps
index 4f2d120..d820965 100644
--- a/demo/wasienv/job/wasmsimpletest.lps
+++ b/demo/wasienv/job/wasmsimpletest.lps
@@ -7,8 +7,8 @@
       <Unit>
         <Filename Value="wasmsimpletest.lpr"/>
         <IsPartOfProject Value="True"/>
-        <TopLine Value="179"/>
-        <CursorPos X="21" Y="90"/>
+        <IsVisibleTab Value="True"/>
+        <CursorPos X="55" Y="27"/>
         <UsageCount Value="54"/>
         <Loaded Value="True"/>
       </Unit>
@@ -32,47 +32,41 @@
       <Unit>
         <Filename Value="job.js.pas"/>
         <UnitName Value="JOB.Js"/>
-        <EditorIndex Value="4"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="6" Y="16"/>
         <UsageCount Value="25"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="job_browser.pp"/>
         <UnitName Value="JOB_Browser"/>
-        <EditorIndex Value="2"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="38" Y="12"/>
         <UsageCount Value="25"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="../../../FPC/FPC/src/rtl/wasi/wasiapi.pp"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="5" Y="22"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="Wasm.Job.Js.pas"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="51" Y="3"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="../../../FPC/FPC/src/rtl/wasi/system.pp"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="42"/>
         <CursorPos X="66" Y="62"/>
         <UsageCount Value="10"/>
-        <Loaded Value="True"/>
       </Unit>
       <Unit>
         <Filename Value="hostsimpletest.lpr"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="1"/>
         <TopLine Value="7"/>
-        <CursorPos X="9" Y="38"/>
+        <CursorPos X="31" Y="25"/>
         <UsageCount Value="10"/>
         <Loaded Value="True"/>
       </Unit>
@@ -80,7 +74,7 @@
     <OtherDefines Count="1">
       <Define0 Value="FPC_DOTTEDUNITS"/>
     </OtherDefines>
-    <JumpHistory HistoryIndex="29">
+    <JumpHistory HistoryIndex="9">
       <Position>
         <Filename Value="wasmsimpletest.lpr"/>
         <Caret Line="159" Column="5" TopLine="150"/>
@@ -93,10 +87,6 @@
         <Filename Value="wasmsimpletest.lpr"/>
         <Caret Line="115" Column="46" TopLine="86"/>
       </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="322" Column="21" TopLine="302"/>
-      </Position>
       <Position>
         <Filename Value="wasmsimpletest.lpr"/>
         <Caret Line="193" Column="25" TopLine="174"/>
@@ -118,86 +108,12 @@
         <Caret Line="163" TopLine="145"/>
       </Position>
       <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="2944" TopLine="2930"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="8"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1334" TopLine="1309"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="3348" TopLine="3308"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1083" Column="10" TopLine="1050"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1096" Column="14" TopLine="1063"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1845" Column="12" TopLine="1812"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1849" Column="12" TopLine="1816"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1872" Column="12" TopLine="1839"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="1876" Column="12" TopLine="1843"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="2111" Column="12" TopLine="2078"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="2614" Column="14" TopLine="2582"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="2727" Column="12" TopLine="2695"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="153" Column="43" TopLine="127"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="214" TopLine="181"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="72" TopLine="62"/>
-      </Position>
-      <Position>
-        <Filename Value="job_browser.pp"/>
-        <Caret Line="701" Column="5" TopLine="694"/>
-      </Position>
-      <Position>
-        <Filename Value="job.js.pas"/>
-        <Caret Line="3020" Column="74" TopLine="3009"/>
+        <Filename Value="hostsimpletest.lpr"/>
+        <Caret Line="16" Column="12" TopLine="7"/>
       </Position>
       <Position>
         <Filename Value="hostsimpletest.lpr"/>
-        <Caret Line="16" Column="12" TopLine="7"/>
+        <Caret Line="25" Column="31" TopLine="7"/>
       </Position>
     </JumpHistory>
     <RunParams>
diff --git a/demo/wasienv/threads/threadapp.lpi b/demo/wasienv/threads/threadapp.lpi
index 8b368dc..e809a2a 100644
--- a/demo/wasienv/threads/threadapp.lpi
+++ b/demo/wasienv/threads/threadapp.lpi
@@ -50,6 +50,7 @@
     </Linking>
     <Other>
       <CustomOptions Value="-CTwasmthreads"/>
+      <CompilerPath Value="/usr/lib/fpc/3.3.1/ppcrosswasm32"/>
     </Other>
   </CompilerOptions>
   <Debugging>