diff --git a/doc/3-Chroot/014-File b/doc/3-Chroot/014-File
index 1f49f38..47e060e 100644
--- a/doc/3-Chroot/014-File
+++ b/doc/3-Chroot/014-File
@@ -1,5 +1,4 @@
-# Final System: File 5.39
-# Source: ftp://ftp.astron.com/pub/file/file-5.39.tar.gz
+# Final System: File 
 # This section is done in Chroot environment
 
 # Configure
diff --git a/doc/3-Chroot/017-Bc b/doc/3-Chroot/017-Bc
index 3a9f1f2..ab6cefa 100644
--- a/doc/3-Chroot/017-Bc
+++ b/doc/3-Chroot/017-Bc
@@ -1,5 +1,4 @@
 # Final System: Bc
-# Source: https://github.com/gavinhoward/bc/releases/download/3.1.5/bc-3.1.5.tar.xz
 # This section is done in Chroot environment
 
 # Configure source
diff --git a/doc/3-Chroot/018-Binutils b/doc/3-Chroot/018-Binutils
index ff60979..3966b10 100644
--- a/doc/3-Chroot/018-Binutils
+++ b/doc/3-Chroot/018-Binutils
@@ -1,14 +1,19 @@
 # Final System: Binutils
-# Source: http://ftp.gnu.org/gnu/binutils/binutils-2.35.tar.xz
 # This section is done in Chroot environment
 
+# Apply patches from Alpine Linux;
+patch -Np1 -i ../patches/binutils-alpine/binutils-ld-fix-static-linking.patch
+patch -Np1 -i ../patches/binutils-alpine/binutils-mips-disable-assert.patch
+patch -Np1 -i ../patches/binutils-alpine/gold-mips.patch
+patch -Np1 -i ../patches/binutils-alpine/ld-bfd-mips.patch
+
 # Create build directory
 mkdir -v build && cd build
 
 case $(uname -m) in
   x86_64)  export EXTRA_CONFIG=" --enable-targets=x86_64-pep"
            ;;
-  i686)    export EXTRA_CONFIG=" --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
+  i686)    export EXTRA_CONFIG=" --disable-separate-code --enable-64-bit-bfd --enable-targets=x86_64-linux-gnu,x86_64-pep"
            ;;
 esac
 
@@ -24,9 +29,11 @@ esac
              --enable-lto \
              --disable-nls \
              --enable-deterministic-archives \
+             --enable-default-hash-style=gnu \
              --enable-threads \
+             --disable-multilib \
              --disable-compressed-debug-sections \
-             --with-mmap $EXTRA_CONFIG 
+             --with-mmap $EXTRA_CONFIG
 
 # Build
 make tooldir=/usr
@@ -46,6 +53,7 @@ make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
 cp -a opcodes opcodes-pic
 make -C opcodes-pic clean
 make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
+install -v -m 644 opcodes-pic/libopcodes.a  /usr/lib
 
 # Install
 make tooldir=/usr install
diff --git a/doc/3-Chroot/019-GMP b/doc/3-Chroot/019-GMP
index 5a05160..5d5847e 100644
--- a/doc/3-Chroot/019-GMP
+++ b/doc/3-Chroot/019-GMP
@@ -1,5 +1,4 @@
-# Final System: GMP 6.2.0
-# Source: http://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.xz
+# Final System: GMP 
 # This section is done in Chroot environment
 
 # By default, GMP configures to optimize for the
@@ -12,7 +11,7 @@
 ./configure --prefix=/usr    \
             --enable-cxx     \
             --disable-static \
-            --docdir=/usr/share/doc/gmp-6.2.0
+            --docdir=/usr/share/doc/gmp-6.2.1
 
 # Build
 make 
diff --git a/doc/3-Chroot/020-MPFR b/doc/3-Chroot/020-MPFR
index 7680674..1a73dc2 100644
--- a/doc/3-Chroot/020-MPFR
+++ b/doc/3-Chroot/020-MPFR
@@ -1,5 +1,4 @@
-# Final System: MPFR 4.1.0
-# Souce: http://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz
+# Final System: MPFR 
 # This section is done in Chroot environment
 
 # Configure source
diff --git a/doc/3-Chroot/021-MPC b/doc/3-Chroot/021-MPC
index c4f31c3..053d1df 100644
--- a/doc/3-Chroot/021-MPC
+++ b/doc/3-Chroot/021-MPC
@@ -1,11 +1,10 @@
-# Final System: MPC 1.1.0
-# Source: https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+# Final System: MPC 
 # This section is done in Chroot environment
 
 # Configure source
 ./configure --prefix=/usr    \
             --disable-static \
-            --docdir=/usr/share/doc/mpc-1.1.0 
+            --docdir=/usr/share/doc/mpc-1.2.1 
 
 # Build and install
 make && make install
diff --git a/doc/3-Chroot/022-Shadow b/doc/3-Chroot/022-Shadow
index 8b66235..cdd4bde 100644
--- a/doc/3-Chroot/022-Shadow
+++ b/doc/3-Chroot/022-Shadow
@@ -1,5 +1,4 @@
 # Final System: Shadow
-# Source: https://github.com/shadow-maint/shadow/releases/download/4.8.1/shadow-4.8.1.tar.xz
 # This section is done in Chroot environment
 
 #  Disable the installation of the groups program and its man pages, 
@@ -13,8 +12,11 @@ sed -i -e 's@#ENCRYPT_METHOD DES@ENCRYPT_METHOD SHA512@' \
 sed -i 's/1000/999/' etc/useradd
 
 # Configure source
-touch /usr/bin/passwd
-./configure --sysconfdir=/etc --with-group-name-max-length=32
+touch /usr/bin/passwd &&
+LIBS="-lutmps -lskarnet" \
+./configure --with-group-name-max-length=32 \
+            --sysconfdir=/etc \
+            --enable-utmpx
 
 # Build, Install, and fix misplaced files
 make && make install
diff --git a/doc/3-Chroot/024-Bzip2 b/doc/3-Chroot/024-Bzip2
index b7605ea..e89007e 100644
--- a/doc/3-Chroot/024-Bzip2
+++ b/doc/3-Chroot/024-Bzip2
@@ -1,12 +1,15 @@
 # Final System: Bzip2
-# Source: http://anduin.linuxfromscratch.org/LFS/bzip2-1.0.8.tar.gz
 # This section is done in Chroot environment
 
+# Patch, per Void Linux
 patch -Np1 -i ../patches/bzip2-void/install_docs-1.patch
 patch -Np0 -i ../patches/bzip2-void/soname.patch
 sed -i 's@\(ln -s -f \)$(PREFIX)/bin/@\1@' Makefile
 sed -i "s@(PREFIX)/man@(PREFIX)/share/man@g" Makefile
 
+# Freeytpe requires this flag set for bzip2
+export CFLAGS="-fPIC" 
+
 # Prepare the source
 make -f Makefile-libbz2_so
 make clean
@@ -20,3 +23,4 @@ rm -v /usr/bin/{bunzip2,bzcat,bzip2}
 ln -sv bzip2 /bin/bunzip2
 ln -sv bzip2 /bin/bzcat
 
+unset CFLAGS
diff --git a/doc/3-Chroot/026-Ncurses b/doc/3-Chroot/026-Ncurses
index 2a8a0bc..788ebd1 100644
--- a/doc/3-Chroot/026-Ncurses
+++ b/doc/3-Chroot/026-Ncurses
@@ -1,5 +1,4 @@
 # Final System: Ncurses
-# Source: http://ftp.gnu.org/gnu/ncurses/ncurses-6.2.tar.gz
 # This section is done in Chroot environment
 
 # Don't install a static library that is not 
@@ -13,7 +12,8 @@ sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
             --without-debug         \
             --without-normal        \
             --enable-pc-files       \
-            --enable-widec
+            --enable-widec          \
+            --with-pkg-config-libdir=/usr/lib/pkgconfig
 
 # Build and install
 make && make install
diff --git a/doc/3-Chroot/027-Attr b/doc/3-Chroot/027-Attr
index 56bae76..2149a73 100644
--- a/doc/3-Chroot/027-Attr
+++ b/doc/3-Chroot/027-Attr
@@ -1,12 +1,11 @@
-# Final System: Attr 2.4.48
-# Source: http://download.savannah.gnu.org/releases/attr/attr-2.4.48.tar.gz
+# Final System: Attr 
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr     \
             --bindir=/bin     \
             --disable-static  \
             --sysconfdir=/etc \
-            --docdir=/usr/share/doc/attr-2.4.48
+            --docdir=/usr/share/doc/attr-2.5.1
 
 make && make install
 
diff --git a/doc/3-Chroot/028-ACL b/doc/3-Chroot/028-ACL
index 3041783..9b17c2b 100644
--- a/doc/3-Chroot/028-ACL
+++ b/doc/3-Chroot/028-ACL
@@ -1,12 +1,11 @@
-# Final System: ACL 2.2.53
-# Source: http://download.savannah.gnu.org/releases/acl/acl-2.2.53.tar.gz
+# Final System: ACL 
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr         \
             --bindir=/bin         \
             --disable-static      \
             --libexecdir=/usr/lib \
-            --docdir=/usr/share/doc/acl-2.2.53
+            --docdir=/usr/share/doc/acl-2.3.1
 
 make && make install
 mv -v /usr/lib/libacl.so.* /lib
diff --git a/doc/3-Chroot/030-Sed b/doc/3-Chroot/030-Sed
index f7fb753..bac87fb 100644
--- a/doc/3-Chroot/030-Sed
+++ b/doc/3-Chroot/030-Sed
@@ -1,5 +1,4 @@
 # Final System: Sed 
-# Source: http://ftp.gnu.org/gnu/sed/sed-4.8.tar.xz
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr --bindir=/bin
diff --git a/doc/3-Chroot/035-Grep b/doc/3-Chroot/035-Grep
index 54588d8..b1e420a 100644
--- a/doc/3-Chroot/035-Grep
+++ b/doc/3-Chroot/035-Grep
@@ -1,5 +1,4 @@
-# Final System: Grep 3.3
-# Source: http://ftp.gnu.org/gnu/grep/grep-3.3.tar.xz
+# Final System: Grep 
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr --bindir=/bin && make && make install
diff --git a/doc/3-Chroot/037-Libtool b/doc/3-Chroot/037-Libtool
index 5c5d2ad..16f8d12 100644
--- a/doc/3-Chroot/037-Libtool
+++ b/doc/3-Chroot/037-Libtool
@@ -1,5 +1,4 @@
-# Final System: Libtool 2.4.6
-# Source: http://ftp.gnu.org/gnu/libtool/libtool-2.4.6.tar.xz
+# Final System: Libtool 
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr && make && make install
diff --git a/doc/3-Chroot/038-GDBM b/doc/3-Chroot/038-GDBM
index 79550d6..b694ee4 100644
--- a/doc/3-Chroot/038-GDBM
+++ b/doc/3-Chroot/038-GDBM
@@ -1,5 +1,4 @@
-# Final System: GDBM 1.18.1
-# Source: http://ftp.gnu.org/gnu/gdbm/gdbm-1.18.1.tar.gz
+# Final System: GDBM 
 # This section is done in Chroot environment
 
 sed -r -i '/^char.*parseopt_program_(doc|args)/d' src/parseopt.c
diff --git a/doc/3-Chroot/039-Gperf b/doc/3-Chroot/039-Gperf
index b413794..f3196b7 100644
--- a/doc/3-Chroot/039-Gperf
+++ b/doc/3-Chroot/039-Gperf
@@ -1,5 +1,4 @@
-# Final System: Gperf 3.1
-# Source: http://ftp.gnu.org/gnu/gperf/gperf-3.1.tar.gz
+# Final System: Gperf 
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1
diff --git a/doc/3-Chroot/043-XML-Parser b/doc/3-Chroot/043-XML-Parser
index 256ba61..22fe177 100644
--- a/doc/3-Chroot/043-XML-Parser
+++ b/doc/3-Chroot/043-XML-Parser
@@ -1,5 +1,4 @@
 # Final System: XML::Parser 
-# Source: https://cpan.metacpan.org/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz
 # This section is done in Chroot environment
 
 perl Makefile.PL && make && make install
diff --git a/doc/3-Chroot/044-Intltool b/doc/3-Chroot/044-Intltool
index 138b2a6..eef437e 100644
--- a/doc/3-Chroot/044-Intltool
+++ b/doc/3-Chroot/044-Intltool
@@ -1,5 +1,4 @@
-# Final System: Intltool 0.51.0
-# Source: https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz
+# Final System: Intltool 
 # This section is done in Chroot environment
 
 sed -i 's:\\\${:\\\$\\{:' intltool-update.in
diff --git a/doc/3-Chroot/050-Xz b/doc/3-Chroot/050-Xz
index d550e59..62b35e4 100644
--- a/doc/3-Chroot/050-Xz
+++ b/doc/3-Chroot/050-Xz
@@ -1,5 +1,4 @@
 # Final System: Xz
-# Source: https://tukaani.org/xz/xz-5.2.5.tar.xz
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr    \
diff --git a/doc/3-Chroot/051-Kmod b/doc/3-Chroot/051-Kmod
index 9bf3eb3..a36c7c3 100644
--- a/doc/3-Chroot/051-Kmod
+++ b/doc/3-Chroot/051-Kmod
@@ -1,5 +1,4 @@
 # Final System: Kmod
-# Source: https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-27.tar.xz
 # This section is done in Chroot environment
 
 ./configure --prefix=/usr          \
diff --git a/doc/3-Chroot/054-Zstd b/doc/3-Chroot/054-Zstd
index eba1664..1fabbbb 100644
--- a/doc/3-Chroot/054-Zstd
+++ b/doc/3-Chroot/054-Zstd
@@ -1,5 +1,4 @@
 # Final System: Zstd
-# Source: https://github.com/facebook/zstd/releases/download/v1.4.5/zstd-1.4.5.tar.gz 
 # This section is done in Chroot environment
 
 make 
diff --git a/doc/3-Chroot/056-Libffi b/doc/3-Chroot/056-Libffi
index 44517a5..11c4cd6 100644
--- a/doc/3-Chroot/056-Libffi
+++ b/doc/3-Chroot/056-Libffi
@@ -1,5 +1,4 @@
 # Final System: Libffi
-# Source: ftp://sourceware.org/pub/libffi/libffi-3.3.tar.gz
 # This section is done in Chroot environment
 
 # Configure source. If host and target are the same machine, 
diff --git a/doc/3-Chroot/059-Ninja b/doc/3-Chroot/059-Ninja
index 5d6b08a..0b01adb 100644
--- a/doc/3-Chroot/059-Ninja
+++ b/doc/3-Chroot/059-Ninja
@@ -1,5 +1,4 @@
 # Final System: Ninja
-# Source: https://github.com/ninja-build/ninja/archive/v1.10.0/ninja-1.10.0.tar.gz
 # This section is done in Chroot environment
 
 # If desired, add the capability to use the 
diff --git a/doc/3-Chroot/060-Meson b/doc/3-Chroot/060-Meson
index 29393c3..ad07b12 100644
--- a/doc/3-Chroot/060-Meson
+++ b/doc/3-Chroot/060-Meson
@@ -1,5 +1,4 @@
 # Final System: Meson
-# Source: https://github.com/mesonbuild/meson/releases/download/0.55.1/meson-0.55.1.tar.gz
 # This section is done in Chroot environment
 
 # Build
diff --git a/doc/3-Chroot/062-Coreutils b/doc/3-Chroot/062-Coreutils
index 926fb02..a6fff6b 100644
--- a/doc/3-Chroot/062-Coreutils
+++ b/doc/3-Chroot/062-Coreutils
@@ -1,5 +1,4 @@
 # Final System: Coreutils
-# Source: http://ftp.gnu.org/gnu/coreutils/coreutils-8.32.tar.xz
 # This section is done in Chroot environment
 
 # Apply patches
diff --git a/doc/3-Chroot/063-Check b/doc/3-Chroot/063-Check
index 6c46863..1c6c689 100644
--- a/doc/3-Chroot/063-Check
+++ b/doc/3-Chroot/063-Check
@@ -1,9 +1,10 @@
-# Final System: Check 0.15.2
-# Source: https://github.com/libcheck/check/releases/download/0.15.2/check-0.15.2.tar.gz
+# Final System: Check
 # This section is done in Chroot environment
 
+# Configure
 ./configure --prefix=/usr --disable-static &&
 
+# Build & install
 make && make install
 
 # Fix a script
diff --git a/doc/3-Chroot/064-Diffutils b/doc/3-Chroot/064-Diffutils
index c974ada..eb89ab2 100644
--- a/doc/3-Chroot/064-Diffutils
+++ b/doc/3-Chroot/064-Diffutils
@@ -1,6 +1,8 @@
 # Final System: Diffutils
-# Source: http://ftp.gnu.org/gnu/diffutils/diffutils-3.7.tar.xz
 # This section is done in Chroot environment
 
+# Configure
 ./configure --prefix=/usr
+
+# Build and install
 make && make install
diff --git a/doc/3-Chroot/065-Gawk b/doc/3-Chroot/065-Gawk
index 1f324b2..3db07c2 100644
--- a/doc/3-Chroot/065-Gawk
+++ b/doc/3-Chroot/065-Gawk
@@ -1,10 +1,11 @@
 # Final System: Gawk
-# Source: http://ftp.gnu.org/gnu/gawk/gawk-5.1.0.tar.xz
 # This section is done in Chroot environment
 
 # Ensure some unneeded files are not installed
 sed -i 's/extras//' Makefile.in
 
+# Configure
 ./configure --prefix=/usr
 
+# Build & install
 make && make install
diff --git a/doc/3-Chroot/066-Findutils b/doc/3-Chroot/066-Findutils
index 32bb983..a7f4789 100644
--- a/doc/3-Chroot/066-Findutils
+++ b/doc/3-Chroot/066-Findutils
@@ -1,12 +1,10 @@
 # Final System: Findutils
-# Source: http://ftp.gnu.org/gnu/findutils/findutils-4.7.0.tar.xz
 # This section is done in Chroot environment
 
 # Configure source
 ./configure --prefix=/usr --localstatedir=/var/lib/locate
 
 # Build in this order:
-#make -C locate dblocation.texi &&
 make 
 
 # Install
diff --git a/doc/3-Chroot/067-Groff b/doc/3-Chroot/067-Groff
index a9ae526..0e2ffc4 100644
--- a/doc/3-Chroot/067-Groff
+++ b/doc/3-Chroot/067-Groff
@@ -1,10 +1,11 @@
 # Final System: Groff
-# Source: http://ftp.gnu.org/gnu/groff/groff-1.22.4.tar.gz
 # This section is done in Chroot environment
 
 #For users in the United States, PAGE=letter is appropriate. Elsewhere, PAGE=A4 may be more suitable.
 #It can be overridden later by echoing either `A4` or `letter` to the `/etc/papersize` file.
 
+# Configure
 PAGE=<paper_size> ./configure --prefix=/usr
 
+# Build and install
 make -j1 && make install
diff --git a/doc/3-Chroot/069-Less b/doc/3-Chroot/069-Less
index de4fee9..427646a 100644
--- a/doc/3-Chroot/069-Less
+++ b/doc/3-Chroot/069-Less
@@ -1,7 +1,8 @@
 # Final System: Less
-# Source: http://www.greenwoodsoftware.com/less/less-551.tar.gz
 # This section is done in Chroot environment
 
+# Configure
 ./configure --prefix=/usr --sysconfdir=/etc &&
 
+# Build and install
 make && make install
diff --git a/doc/3-Chroot/070-Gzip b/doc/3-Chroot/070-Gzip
index 536c7ce..42a81d3 100644
--- a/doc/3-Chroot/070-Gzip
+++ b/doc/3-Chroot/070-Gzip
@@ -1,5 +1,4 @@
 # Final System: Gzip
-# Source: http://ftp.gnu.org/gnu/gzip/gzip-1.10.tar.xz
 # This section is done in Chroot environment
 
 # Configure source
diff --git a/doc/3-Chroot/072-KBD b/doc/3-Chroot/072-KBD
index d86f680..f622bc5 100644
--- a/doc/3-Chroot/072-KBD
+++ b/doc/3-Chroot/072-KBD
@@ -1,5 +1,4 @@
 # Final System: KBD
-# Source: https://www.kernel.org/pub/linux/utils/kbd/kbd-2.3.0.tar.xz
 # This section is done in Chroot environment
 
 patch -Np1 -i ../patches/kbd-lfs/kbd-2.3.0-backspace-1.patch
@@ -40,8 +39,6 @@ autoreconf -fvi
 sed -e '/^PKG_CHECK_MODULES.*/d' -i configure.ac
 sed -e 's,tests ,,g' -i Makefile.am
 
-
-
 # Configure
 ./configure --prefix=/usr --disable-vlock
 
diff --git a/doc/3-Chroot/073-Libpipeline b/doc/3-Chroot/073-Libpipeline
index 5610520..11ebc82 100644
--- a/doc/3-Chroot/073-Libpipeline
+++ b/doc/3-Chroot/073-Libpipeline
@@ -1,5 +1,11 @@
 # Final System: Libpipeline
-# Source: http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.3.tar.gz
 # This section is done in Chroot environment
 
-./configure --prefix=/usr && make && make install
+# Configure
+./configure --prefix=/usr 
+
+# Build
+make
+
+# Install
+make install
diff --git a/doc/3-Chroot/074-Make b/doc/3-Chroot/074-Make
index 2ea6443..3dfb17a 100644
--- a/doc/3-Chroot/074-Make
+++ b/doc/3-Chroot/074-Make
@@ -1,5 +1,11 @@
 # Final System: Make 
-# Source: http://ftp.gnu.org/gnu/make/make-4.3.tar.bz2
 # This section is done in Chroot environment
 
-./configure --prefix=/usr && make && make install
+# Configure
+./configure --prefix=/usr 
+
+# Build
+make 
+
+# Install
+make install
diff --git a/doc/3-Chroot/075-Patch b/doc/3-Chroot/075-Patch
index 8eabe24..b6a3652 100644
--- a/doc/3-Chroot/075-Patch
+++ b/doc/3-Chroot/075-Patch
@@ -1,5 +1,11 @@
 # Final System: Patch
-# Source: http://ftp.gnu.org/gnu/patch/patch-2.7.6.tar.xz
 # This section is done in Chroot environment
 
-./configure --prefix=/usr && make && make install
+# Configure
+./configure --prefix=/usr
+
+# Build
+make
+
+# Install
+make install
diff --git a/doc/3-Chroot/076-Man-DB b/doc/3-Chroot/076-Man-DB
index 6afe976..7cce182 100644
--- a/doc/3-Chroot/076-Man-DB
+++ b/doc/3-Chroot/076-Man-DB
@@ -5,6 +5,7 @@
 patch -Np0 -i ../patches/man-db-void/guard-glibc-iconv-ext.patch
 patch -Np0 -i ../patches/man-db-void/add-missing-stdlib_h-include.patch 
 
+# Configure
 ./configure --prefix=/usr                        \
             --docdir=/usr/share/doc/man-db-2.9.4 \
             --sysconfdir=/etc                    \
@@ -21,6 +22,8 @@ patch -Np0 -i ../patches/man-db-void/add-missing-stdlib_h-include.patch
             --without-included-regex             \
             --enable-automatic-create 
 
+# Build and install
 make && make install
 
+# Clean up
 unset CFLAGS LDFLAGS
diff --git a/doc/3-Chroot/077-Tar b/doc/3-Chroot/077-Tar
index 019a19f..d2fc352 100644
--- a/doc/3-Chroot/077-Tar
+++ b/doc/3-Chroot/077-Tar
@@ -1,10 +1,11 @@
 # Final System: Tar
-# Source: http://ftp.gnu.org/gnu/tar/tar-1.32.tar.xz
 # This section is done in Chroot environment
 
+# Configure
 FORCE_UNSAFE_CONFIGURE=1  \
 gl_cv_struct_dirent_d_ino=yes \
 ./configure --prefix=/usr  \
             --bindir=/bin
 
+# Build & install
 make && make install
diff --git a/doc/3-Chroot/078-Texinfo b/doc/3-Chroot/078-Texinfo
index a45d594..ea08ddb 100644
--- a/doc/3-Chroot/078-Texinfo
+++ b/doc/3-Chroot/078-Texinfo
@@ -1,8 +1,11 @@
 # Final System: Texinfo
-# Source: http://ftp.gnu.org/gnu/texinfo/texinfo-6.7.tar.xz
 # This section is done in Chroot environment
 
-
+# Configure
 ./configure --prefix=/usr --disable-static
 
-make && make install
+# Build
+make
+
+# Install
+make install
diff --git a/doc/3-Chroot/079-Vim b/doc/3-Chroot/079-Vim
index cb2d5a8..528fa95 100644
--- a/doc/3-Chroot/079-Vim
+++ b/doc/3-Chroot/079-Vim
@@ -5,13 +5,22 @@
 # configuration file to /etc
 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h
 
-./configure --prefix=/usr && make && make install
+# Configure
+./configure --prefix=/usr
 
+# Build & install
+make && make install
+
+# For some,  it is a habbit to invoke vi instead of vim
 ln -sv vim /usr/bin/vi
+
+# Fix the docs
 for L in  /usr/share/man/{,*/}man1/vim.1; do
     ln -sv vim.1 $(dirname $L)/vi.1
 done
 ln -sv ../vim/vim82/doc /usr/share/doc/vim-8.2.2890
+
+# Create a simple configuration
 cat > /etc/vimrc << "EOF"
 " Begin /etc/vimrc
 
diff --git a/doc/3-Chroot/081-E2fsprogs b/doc/3-Chroot/081-E2fsprogs
index acdde98..6d76b86 100644
--- a/doc/3-Chroot/081-E2fsprogs
+++ b/doc/3-Chroot/081-E2fsprogs
@@ -1,10 +1,10 @@
 # Final System: E2fsprogs
-# Source: https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v1.45.6/e2fsprogs-1.45.6.tar.gz
 # This section is done in Chroot environment
 
-
+# Build in a dedicated directory
 mkdir -v build && cd build
 
+# configure
 e2fsprogs_cv_struct_st_flags=no      \
 ../configure --prefix=/usr           \
              --bindir=/bin           \
@@ -16,11 +16,16 @@ e2fsprogs_cv_struct_st_flags=no      \
              --disable-fsck \
              --enable-e2initrd-helper \
              --disable-rpath
-
+# build
 make
 
+# Install
 make install && make install-libs
+
+# Fix permissions for stripping later on
 chmod -v u+w /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a
+
+# Fix docs
 gunzip -v /usr/share/info/libext2fs.info.gz
 install-info --dir-file=/usr/share/info/dir /usr/share/info/libext2fs.info
 
diff --git a/doc/3-Chroot/082-Eudev b/doc/3-Chroot/082-Eudev
index e1e1f40..561828b 100644
--- a/doc/3-Chroot/082-Eudev
+++ b/doc/3-Chroot/082-Eudev
@@ -1,9 +1,10 @@
 # Final System: Eudev
-# Source: https://dev.gentoo.org/~blueness/eudev/eudev-3.2.9.tar.gz
 # This section is done in Chroot environment
 
+# Regenerate configure script
 autoreconf -fiv
 
+# Configure
 ./configure --prefix=/usr           \
             --bindir=/sbin          \
             --sbindir=/sbin         \
@@ -15,9 +16,9 @@ autoreconf -fiv
             --enable-manpages       \
             --disable-static        
 
+# Build and install
 make && make install
 
+# Install some useful udev rules
 tar -xvf ../udev-mlfs-20191014.tar.xz
-# Edit udev-lfs-20171102/55-lfs.rules:
-# Comment out the lines for rtc
 make -f udev-mlfs-20191014/Makefile.mlfs install
diff --git a/doc/3-Chroot/083-Cpio b/doc/3-Chroot/083-Cpio
index 2087c36..faf4087 100644
--- a/doc/3-Chroot/083-Cpio
+++ b/doc/3-Chroot/083-Cpio
@@ -1,5 +1,4 @@
 # Final System: Cpio
-# Source: https://ftp.gnu.org/gnu/cpio/cpio-2.13.tar.bz2
 # Required when building an initrd for boot
 
 # Recreate configure
@@ -18,4 +17,5 @@ sed -i '/The name/,+2 d' src/global.c
 make 
 make install
 
+# Clean up
 unset CFLAGS