diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 324f059a5c..38110aaa87 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -39,6 +39,16 @@
     </listitem>
     -->
 
+    <listitem>
+      <para>June 28th, 2024</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Zeckmathederg] - Made several updates to improve smoothness
+          of GLFS instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>June 27th, 2024</para>
       <itemizedlist>
diff --git a/introduction/welcome/packages.xml b/introduction/welcome/packages.xml
index 7ccb78d23e..44ea269b47 100644
--- a/introduction/welcome/packages.xml
+++ b/introduction/welcome/packages.xml
@@ -52,7 +52,10 @@
       the packages and patches by doing the following:
     </para>
 
-<screen><userinput>wget -N --input-file=wget-list --continue</userinput></screen>
+<screen><userinput>wget -N --input-file=wget-list --continue
+ln -sv v0.69.4.tar.gz rust-bindgen-0.69.4.tar.gz
+ln -sv v18.1.1.tar.gz SPIRV-LLVM-Translator-18.1.1.tar.gz
+ln -sv 0.8.0.tar.gz seatd-0.8.0.tar.gz</userinput></screen>
 
   </sect2>
 
diff --git a/multilib/mesonfiles.xml b/multilib/mesonfiles.xml
index c36c64bcde..8128bb5503 100644
--- a/multilib/mesonfiles.xml
+++ b/multilib/mesonfiles.xml
@@ -49,7 +49,7 @@
 	user:
     </para>
 
-<screen role="root"><userinput>mkdir -v /usr/share/meson/cross
+<screen role="root"><userinput>mkdir -pv /usr/share/meson/cross
 
 cat &gt; /usr/share/meson/cross/lib32 &lt;&lt; "EOF"
 <literal>[binaries]
@@ -87,7 +87,7 @@ EOF</userinput></screen>
 	user:
     </para>
 
-<screen role="root"><userinput>mkdir -v /usr/share/meson/native
+<screen role="root"><userinput>mkdir -pv /usr/share/meson/native
 
 cat &gt; /usr/share/meson/native/x86 &lt;&lt; "EOF"
 <literal>[binaries]
diff --git a/multilib/pkgconf.xml b/multilib/pkgconf.xml
index faea2fa0dc..995ee35d1a 100644
--- a/multilib/pkgconf.xml
+++ b/multilib/pkgconf.xml
@@ -34,9 +34,9 @@
 	user:
     </para>
 
-    <screen role="root"><userinput>mkdir -v /usr/share/pkgconfig/personality.d
+    <screen role="root"><userinput>mkdir -pv /usr/share/pkgconfig/personality.d
 
-cat &gt; /usr/share/pkgconfig/x86_64-pc-linux-gnu.personality &lt;&lt; "EOF"
+cat &gt; /usr/share/pkgconfig/personality.d/x86_64-pc-linux-gnu.personality &lt;&lt; "EOF"
 <literal>Triplet: x86_64-pc-linux-gnu
 SysrootDir: /
 DefaultSearchPaths: /usr/lib/pkgconfig:/usr/share/pkgconfig
@@ -44,7 +44,7 @@ SystemIncludePaths: /usr/include
 SystemLibraryPaths: /usr/lib</literal>
 EOF
 
-cat &gt; /usr/share/pkgconfig/i686-pc-linux-gnu.personality &lt;&lt; "EOF"
+cat &gt; /usr/share/pkgconfig/personality.d/i686-pc-linux-gnu.personality &lt;&lt; "EOF"
 <literal>Triplet: i686-pc-linux-gnu
 SysrootDir: /
 DefaultSearchPaths: /usr/lib32/pkgconfig:/usr/share/pkgconfig
diff --git a/shareddeps/audio/libsndfile.xml b/shareddeps/audio/libsndfile.xml
index 7fbdfcd00e..16ce5c85d7 100644
--- a/shareddeps/audio/libsndfile.xml
+++ b/shareddeps/audio/libsndfile.xml
@@ -112,7 +112,7 @@ make</userinput></screen>
     </para>
 
 <screen role="root"><userinput>make DESTDIR=$PWD/DESTDIR install
-cp -vr DESTDIR/usr/lib32/*
+cp -vr DESTDIR/usr/lib32/* /usr/lib32
 rm -rf DESTDIR
 ldconfig</userinput></screen>
   
diff --git a/shareddeps/audio/pulseaudio.xml b/shareddeps/audio/pulseaudio.xml
index 4b2b4cca43..13386e3285 100644
--- a/shareddeps/audio/pulseaudio.xml
+++ b/shareddeps/audio/pulseaudio.xml
@@ -142,6 +142,34 @@ ninja</userinput></screen>
   <sect2 role="installation">
     <title>32-bit Installation of PulseAudio</title>
 
+    <note>
+      <para>
+        <ulink url="&lfs-domain;/~thomas/multilib/chapter08/check.html">Check</ulink>
+	from LFS Multilib does not contain 32-bit instructions currently and
+	this package depends on <application>Check</application>. Compile 32-bit
+	Check by following the instructions below if you have not installed 32-bit
+	Check:
+      </para>
+      
+<screen><userinput>CC="gcc -m32" CXX="g++ -m32"         \
+./configure --prefix=/usr            \
+            --libdir=/usr/lib32	     \
+            --host=i686-pc-linux-gnu \	
+            --disable-static &amp;&amp;
+            
+make</userinput></screen>
+    
+      <para>
+        Now as the <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>make DESTDIR=$PWD/DESTDIR install
+cp -Rv DESTDIR/usr/lib32/* /usr/lib32
+rm -rf DESTDIR
+ldconfig</userinput></screen>
+
+    </note>
+
     <para>
       First clean the build directory:
     </para>
diff --git a/shareddeps/dps/basicx/x/basic-xorg-7.xml b/shareddeps/dps/basicx/x/basic-xorg-7.xml
index b94fd0ac5d..0db6f93f0a 100644
--- a/shareddeps/dps/basicx/x/basic-xorg-7.xml
+++ b/shareddeps/dps/basicx/x/basic-xorg-7.xml
@@ -164,7 +164,7 @@ EOF
       <para>
         There is some confusion about the above 'here' document.
         The backslash in front of the dollar sign is correct.  Bash
-        will remove it when creating /etc/profile.d/xorg.sh.  However, if
+        will remove it when creating ~/xorg.sh.  However, if
         you are creating the file with an editor, a copy and paste operation
         will not remove the backslash.  It must then be removed manually.
       </para>
diff --git a/shareddeps/dps/x/xorg-server.xml b/shareddeps/dps/x/xorg-server.xml
index aa2875d24c..59801ba0f0 100644
--- a/shareddeps/dps/x/xorg-server.xml
+++ b/shareddeps/dps/x/xorg-server.xml
@@ -58,7 +58,7 @@
         </para>
         <para>
           Optional patch:
-          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-tearfree_backport-1.patch"/>
+          <ulink url="&patch-root;/xorg-server-&xorg-server-version;-tearfree_backport-2.patch"/>
         </para>
       </listitem>
     </itemizedlist>
diff --git a/shareddeps/drivers/rust.xml b/shareddeps/drivers/rust.xml
index efdfcf778d..26c353bbe8 100644
--- a/shareddeps/drivers/rust.xml
+++ b/shareddeps/drivers/rust.xml
@@ -474,24 +474,29 @@ ln -sfv /opt/rustc/share/zsh/site-functions/_cargo \
       </para>
 
       <para>
-        As the <systemitem class="username">root</systemitem> user, create
-        the <filename>/etc/profile.d/rustc.sh</filename> file:
+        Create the <filename>~/rustc.sh</filename> file:
       </para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/rustc.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/rustc.sh
+<screen><userinput>cat &gt; ~/rustc.sh &lt;&lt; "EOF"
+<literal># Begin ~/rustc.sh
 
 pathprepend /opt/rustc/bin           PATH
 
-# End /etc/profile.d/rustc.sh</literal>
+# End ~/rustc.sh</literal>
 EOF</userinput></screen>
 
       <para>
-        Immediately after installation, update the current PATH
-        for your current shell as a normal user:
+      Now ensure the script will be loaded when you are logged in:
       </para>
 
-<screen><userinput>source /etc/profile.d/rustc.sh</userinput></screen>
+<screen><userinput>echo "source ~/rustc.sh" >> ~/.bash_profile</userinput></screen>
+
+      <para>
+        Immediately after installation, update the current PATH
+        for your current shell:
+      </para>
+
+      <screen><userinput>source ~/.bash_profile</userinput></screen>
 
     </sect3>
   </sect2>
diff --git a/shareddeps/net/curl.xml b/shareddeps/net/curl.xml
index 625401c1a7..d2d0eae28b 100644
--- a/shareddeps/net/curl.xml
+++ b/shareddeps/net/curl.xml
@@ -130,223 +130,6 @@ make</userinput></screen>
        pages were deleted by the 'find' command in the installation instructions
        below.
     </para>
-<!-- Two (of 857) tests
-fail for unknown reasons, and all tests fail is valgrind is installed. Moving
-valgrind out of $PATH is recommended if you wish to run the test suite while
-it is installed.
-
-Added by Pierre for curl-7.59.0:
-no stunnel, no valgrind, no options
-Warning: smb server unexpectedly alive
-Warning: dict server unexpectedly alive
-TESTDONE: 950 tests out of 951 reported OK: 99%
-TESTFAIL: These test cases failed: 1148
-TESTDONE: 1189 tests were considered during 362 seconds.
-__________
-
-         if stunnel and valgrind are not installed, and also most options
-         (I had rtmpdump), the tests complete without problems.
-Warning: smb server unexpectedly alive
-Warning: dict server unexpectedly alive
-TESTDONE: 938 tests out of 938 reported OK: 100%
-TESTDONE: 1175 tests were considered during 355 seconds.
-         and no. I don't have smb - so commenting the rest of this:
-      To run the test suite, issue: <command>make test</command>. Many tests
-      may fail that depend on optional dependencies that may not be installed
-      or upstream servers that may not be available, especially for tests
-      numbered 700 and above.
-      Test time may be significantly increase due to hanging tests that fail.
-__________
-Added by Bruce for curl-7.60.0:
-TESTDONE: 957 tests out of 959 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140
-TESTDONE: 1196 tests were considered during 1184 seconds.
-From the logs, both appear to be ipv6 releated.
-
-==========
-Added by Douglas for curl-7.61.0:
-TESTDONE: 961 tests out of 961 reported OK: 100%
-TESTDONE: 1202 tests were considered during 338 seconds.
-I only have c-ares and libidn2 installed, I will likely try before release
-with all optional dependencies in the book installed.
-
-=========
-7.61.1 NOTE: The test suite is extremely noisy, complaining about verification errors.
-It's possible this is due to openssl-1.1.1, BUT 79/79 tests report as 100% OK. I had
-c-ares, libpsl, and libidn1/2 installed. - Doug
-
-========
-7.62.0: All tests passed. libpsl, c-ares, libssh2, libidn2 installed.
-All 1098 tests report OK.
-
-=======
-Added by Douglas for curl-7.64.0:
-TESTDONE: 1022 tests out of 1023 reported OK: 99%
-TESTFAIL: These tests cases failed: 323
-TESTDONE: 1235 tests were considered during 1279 seconds.
-For dependencies, I had c-ares, gnutls, libidn2, libpsl, krb5, libssh2, nghttp2,
-OpenLDAP, Samba, stunnel, and Valgrind installed.
-=======
-Added by bdubbs for curl-7.64.1:
-TESTDONE: 1022 tests out of 1025 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140
-TESTDONE: 1242 tests were considered during 1483 seconds
-
-=======
-Added by renodr for curl-7.65.1:
-TESTDONE: 996 tests out of 997 reported OK: 99%
-TESTFAIL: These test cases failed: 1560
-TESTDONE: 1249 tests were considered during 1091 seconds.
-All dependencies except for externals installed.
-=======
-Added by bdubbs for curl-7.65.2:
-TESTDONE: 1034 tests out of 1036 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1560
-TESTDONE: 1254 tests were considered during 1362 seconds.
-Time above does not include test build time.
-All dependencies except for externals installed.
-=======
-Added by bdubbs for curl-7.65.3:
-TESTDONE: 1031 tests out of 1036 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1254 tests were considered during 1364 seconds.
-
-The tests that fail seem to be somewhat random.  What happened between
-yesterday and today that that tests 1139 1140 1173 now fail?
-
-=======
-Added by bdubbs for curl-7.68.0:
-TESTDONE: 1066 tests out of 1071 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1290 tests were considered during 1515 seconds.
-
-=======
-Added by bdubbs for curl-7.69.0:
-TESTDONE: 074 tests out of 1079 reported OK: 99%
-TESTFAIL: These test cases failed: 323 1139 1140 1173 1560
-TESTDONE: 1320 tests were considered during 1514 seconds.
-
-For curl-7.69.1, 1082 tests out of 1086 reported OK.  1560 now passes.
-1330 tests were considered during 1528 seconds.
-
-======
-Added by renodr for curl-7.70.0:
-TESTDONE: 1062 tests out of 1062 reported OK: 100%
-TESTDONE: 1352 tests were considered during 1218 seconds.
-Tests were ran with all dependencies present except for stunnel.
-impacket only seems to add one extra test to the mix as well.
-
-======
-Added by renodr for curl-7.71.0:
-TESTDONE: 1072 tests out of 1072 reported OK: 100%
-TESTDONE: 1364 tests were considered during 1202 seconds.
-Tests were run similarly to 7.70.0 - all deps except for stunnel.
-
-======
-Added by renodr for curl-7.71.1:
-TESTDONE: 1076 tests out of 1076 reported OK: 100%
-TESTDONE: 1368 tests were considered during 1207 seconds.
-Tests were run similarly to 7.71.0, including impacket, but no stunnel.
-
-======
-Added by renodr for curl-7.72.0:
-TESTDONE: 1094 tests out of 1097 reported OK: 99%
-TESTFAIL: These test cases failed: 1700 1701 1702
-TESTDONE: 1374 tests were considered during 1285 seconds.
-Tests have all BLFS dependencies with the exception of stunnel;
-and the optional impacket python module was installed.
-Tests seem to be failing due to a missing 'nghttpx' executable
-used to start a test server.
-
-======
-Added by renodr for curl-7.73.0:
-TESTDONE: 1121 tests out of 1121 reported OK: 100%
-TESTDONE: 1387 tests were considered during 1303 seconds.
-Tests have all BLFS dependencies installed with the exception of stunnel,
-as well as the optional impacket installed.
-
-======
-Added by renodr for curl-7.74.0:
-TESTDONE: 1119 tests out of 1119 reported OK: 100%
-TESTDONE: 1388 tests were considered during 1370 seconds.
-Tests have all BLFS dependencies installed, as well as impacket.
-stunnel not installed.
-
-======
-Added by bdubbs for curl-7.79.0:
-TESTDONE: 1432 tests were considered during 1543 seconds.
-TESTDONE: 1208 tests out of 1212 reported OK: 99%
-
-Tests have all BLFS dependencies installed but without impacket.
-
-======
-Added by plabs for curl-7.79.1:
-TESTDONE: 1434 tests were considered during 1652 seconds.
-TESTDONE: 1171 tests out of 1171 reported OK: 100%
-Tests have all BLFS dependencies installed except stunnel but without impacket.
-====
-bdubbs curl-7.83.0  2022-04-28
-TESTDONE: 1497 tests were considered during 1666 seconds.
-TESTDONE: 1252 tests out of 1256 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140 1173 1177
-====
-Added by xry111 for curl-7.85.0 on 2022-09-01:
-With:
-  all BLFS dependencies but stunnel installed
-  libssh2-2.10.0 patched with libssh2-1.10.0-upstream_fix-1.patch
-  with-{gssapi,libssh2} enable-threaded-resolver
-TESTDONE: 1520 tests were considered during 508 seconds.
-TESTDONE: 1327 tests out of 1328 reported OK: 99%
-TESTFAIL: These test cases failed: 1459
-  It is a SCP test for bad .known_hosts file and fails because of a mismatch
-  of error codes, I don't think it indicated a serious issue.
-[renodr] - Test results for 7.85.0 (2022-09-03), no libssh2 enabled or gssapi
-TESTDONE: 1528 tests were considered during 2041 seconds.
-TESTDONE: 1326 tests out of 1326 reported OK: 100%
-
-[renodr] - Test results for 7.87.0 (2022-12-30)
-TESTDONE: 1559 tests were considered during 2112 seconds.
-TESTDONE: 1342 tests out of 1342 reported OK: 100%
-libssh2 installed and enabled
-
-[renodr] - Test results for 8.0.1 (2023-03-27)
-TESTDONE: 1593 tests were considered during 4761 seconds.
-TESTDONE: 1356 tests out of 1356 reported OK: 100%
-All BLFS dependencies installed.
-Note that if I move /usr/bin/valgrind to a place where it can't be found, I get
-TESTDONE: 1593 tests were considered during 595 seconds.
-TESTDONE: 1356 tests out of 1356 reported OK: 100%
-It appears that every test is now run under valgrind.
-
-[renodr] - Test results for 8.2.1 (2023-07-26)
-TESTDONE: 1611 tests were considered during 2129 seconds.
-TESTDONE: 1369 tests out of 1369 reported OK: 100%
-All BLFS dependencies installed, and run under valgrind.
-
-[renodr] - Test results for 8.3.0 (2023-09-14)
-TESTDONE: 1635 tests were considered during 4068 seconds.
-TESTDONE: 1386 tests out of 1387 reported OK: 99%
-TESTFAIL: These test cases failed: 1474
-All BLFS dependencies installed, and run under valgrind. Test 1474 is flaky.
-
-[renodr] - Test results for 8.4.0 (2023-10-11)
-TESTDONE: 1646 tests were considered during 2290 seconds.
-TESTDONE: 1449 tests out of 1452 reported OK: 99%
-TESTFAIL: These test cases failed: 1474 3021 3022
-All BLFS dependencies are installed, and the tests were run with Valgrind
-installed as well. Test 3021 and 3022 fails due to incompatibilities with
-our version of SSH. See https://github.com/curl/curl/issues/12096
-Test 1474 is still flaky.
-
-[bdubbs] - Test results for 8.6.0 (2024-02-01)
-TESTDONE: 1673 tests were considered during 395 seconds.
-TESTDONE: 1355 tests out of 1360 reported OK: 99%
-TESTFAIL: These test cases failed: 1139 1140 1173 1177 1477
-Run without valgrind.
-Tests seem to looking for man pages that are missing.
-- renodr: this is because tests were run after the man pages were deleted by
-  the find command after 'make install'
--->
 
     <para>
       Now, as the <systemitem class="username">root</systemitem>
@@ -440,11 +223,12 @@ cp -v -R docs -T /usr/share/doc/curl-&curl-version;</userinput></screen>
   <sect2>
     <title>32-bit Installation of cURL</title>
 
-    <para>
-	First clean the directory by running the following command:
-    </para>
-
-    <screen><userinput>make distclean</userinput></screen>
+    <note><para>
+      Like <xref linkend="nss"/>, cleaning the project tree doesn't work with
+      this package as expected and will lead to the 32-bit build to fail.
+      Remove the extracted folder from the tarball, extract the tarball, then
+      go back into it and follow the instructions below as normal.
+    </para></note>
 
     <para>
 	Install <application>lib32-cURL</application>
diff --git a/shareddeps/net/make-ca.xml b/shareddeps/net/make-ca.xml
index d494de51f8..8caf1fda8e 100644
--- a/shareddeps/net/make-ca.xml
+++ b/shareddeps/net/make-ca.xml
@@ -329,15 +329,20 @@ openssl x509 -in class3.crt -text -fingerprint -setalias "CAcert Class 3 root" \
       profiles:
     </para>
 
-<screen role="root"><userinput>mkdir -pv /etc/profile.d &amp;&amp;
-cat &gt; /etc/profile.d/pythoncerts.sh &lt;&lt; "EOF"
-<literal># Begin /etc/profile.d/pythoncerts.sh
+<screen><userinput>cat &gt; ~/pythoncerts.sh &lt;&lt; "EOF"
+<literal># Begin ~/pythoncerts.sh
 
 export _PIP_STANDALONE_CERT=/etc/pki/tls/certs/ca-bundle.crt
 
-# End /etc/profile.d/pythoncerts.sh</literal>
+# End ~/pythoncerts.sh</literal>
 EOF</userinput></screen>
 
+    <para>
+      Now ensure the script will be loaded when you are logged in:
+    </para>
+
+<screen><userinput>echo "source ~/pythoncerts.sh" >> ~/.bash_profile</userinput></screen>
+
   </sect2>
 
   <sect2 role="content">
diff --git a/shareddeps/net/nss.xml b/shareddeps/net/nss.xml
index 393dd7ba1a..9ce0beaecc 100644
--- a/shareddeps/net/nss.xml
+++ b/shareddeps/net/nss.xml
@@ -251,30 +251,12 @@ install -v -m644 Linux*/lib/pkgconfig/nss.pc  /usr/lib/pkgconfig</userinput></sc
   <sect2 role="installation">
     <title>32-bit Installation of NSS</title>
 
-    <para>
-	First clean the directory by running the following commands
-	while in the <filename>nss</filename> directory:
-    </para>
-
-    <screen><userinput>make clean &amp;&amp;
-rm -rf ../dist</userinput></screen>
-
-    <note>
-    <para>
-	The command <userinput>make clean</userinput> as of now
-	can fail but the directory in most cases can still be used
-	for 32-bit compilation after a 64-bit compilation. If
-	running the following commands do not work, remove the
-	directory containing <filename>nss</filename>, unpack the
-	tarball, change directory into the resulting directory,
-	and apply the patch by following the command:
-    </para>
-<screen><userinput>patch -Np1 -i ../nss-3.99-standalone-1.patch</userinput></screen>
-    <para>
-	Then finally change directory into <filename>nss</filename>
-	and proceed with the following commands.
-    </para>
-    </note>
+    <note><para>
+      Cleaning the directory doesn't work with NSS, so you will need to delete
+      the extracted folder from the tarball, extract it again, apply the patch
+      again as detailed in the normal installation, then change directory into
+      <filename>nss</filename>.
+    </para></note>
 
     <para>
 	Install <application>lib32-NSS</application> by running the following commands:
diff --git a/shareddeps/net/p11-kit.xml b/shareddeps/net/p11-kit.xml
index 7600428020..73651a90fa 100644
--- a/shareddeps/net/p11-kit.xml
+++ b/shareddeps/net/p11-kit.xml
@@ -147,12 +147,13 @@ ln -sfv /usr/libexec/p11-kit/trust-extract-compat \
 	by running the following commands:
     </para>
 
-<screen><userinput>CC="gcc -m32" CXX="g++ -m32"         \
-PKG_CONFIG_PATH=/usr/lib32/pkgconfig \
-meson setup ..			     \
-      --prefix=/usr		     \
-      --libdir=/usr/lib32	     \
-      --buildtype=release	     \
+<screen><userinput>CC="gcc -m32" CXX="g++ -m32"                     \
+PKG_CONFIG_PATH=/usr/lib32/pkgconfig             \
+CFLAGS+=" -Wno-error=incompatible-pointer-types" \
+meson setup ..			                 \
+      --prefix=/usr		                 \
+      --libdir=/usr/lib32	                 \
+      --buildtype=release	                 \
       -Dtrust_paths=/etc/pki/anchors &amp;&amp;
 
 ninja</userinput></screen>