diff --git a/.gitignore b/.gitignore
index f8acd10e..6b075fb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ core.*
 *.swp
 *.out
 *.err
+*.dot
diff --git a/s/SciPy-bundle/SciPy-bundle.dot b/s/SciPy-bundle/SciPy-bundle.dot
deleted file mode 100644
index 5590f8ba..00000000
--- a/s/SciPy-bundle/SciPy-bundle.dot
+++ /dev/null
@@ -1,182 +0,0 @@
-digraph graphname {
-"ncurses/6.1";
-"flex/2.6.4";
-"M4/1.4.18";
-"DB/18.1.32-GCCcore-9.3.0";
-"expat/2.2.9-GCCcore-9.3.0";
-"zlib/1.2.11";
-"iccifort/2020.1.217";
-"zlib/1.2.11-GCCcore-9.3.0";
-"libffi/3.3-GCCcore-9.3.0";
-"Autotools/20180311-GCCcore-9.3.0";
-"Bison/3.0.4";
-"iimpi/2020a";
-"help2man/1.47.12-GCCcore-9.3.0";
-"libreadline/8.0-GCCcore-9.3.0";
-"GMP/6.2.0-GCCcore-9.3.0";
-"GCCcore/9.3.0";
-"gettext/0.20.1";
-"bzip2/1.0.8-GCCcore-9.3.0";
-"flex/2.6.4-GCCcore-9.3.0";
-"ncurses/6.2-GCCcore-9.3.0";
-"Tcl/8.6.10-GCCcore-9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0";
-"binutils/2.34";
-"UCX/1.8.0-GCCcore-9.3.0";
-"Bison/3.5.3";
-"Autoconf/2.69-GCCcore-9.3.0";
-"numactl/2.0.13-GCCcore-9.3.0";
-"M4/1.4.18-GCCcore-9.3.0";
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8";
-"makeinfo/6.7-GCCcore-9.3.0";
-"binutils/2.34-GCCcore-9.3.0";
-"cURL/7.69.1-GCCcore-9.3.0";
-"pkg-config/0.29.2-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0";
-"imkl/2020.1.217-iimpi-2020a";
-"Python/3.7.8-GCCcore-9.3.0";
-"Automake/1.16.1-GCCcore-9.3.0";
-"groff/1.22.4-GCCcore-9.3.0";
-"intel/2020a";
-"XZ/5.2.5-GCCcore-9.3.0";
-"Bison/3.5.3-GCCcore-9.3.0";
-"SQLite/3.31.1-GCCcore-9.3.0";
-"libtool/2.4.6-GCCcore-9.3.0";
-"impi/2019.7.217-iccifort-2020.1.217";
-"Eigen/3.3.7-GCCcore-9.3.0";
-"SciPy-bundle/2020.03-intel-2020a-Python-3.7.8";
-"flex/2.6.4" -> "Bison/3.0.4";
-"DB/18.1.32-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"DB/18.1.32-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"expat/2.2.9-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"expat/2.2.9-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"iccifort/2020.1.217" -> "GCCcore/9.3.0";
-"iccifort/2020.1.217" -> "binutils/2.34-GCCcore-9.3.0";
-"zlib/1.2.11-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"zlib/1.2.11-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"libffi/3.3-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"libffi/3.3-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Autotools/20180311-GCCcore-9.3.0" -> "Autoconf/2.69-GCCcore-9.3.0";
-"Autotools/20180311-GCCcore-9.3.0" -> "Automake/1.16.1-GCCcore-9.3.0";
-"Autotools/20180311-GCCcore-9.3.0" -> "libtool/2.4.6-GCCcore-9.3.0";
-"Autotools/20180311-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Bison/3.0.4" -> "M4/1.4.18"  [arrowhead=diamond, color=blue, style=dotted];
-"iimpi/2020a" -> "iccifort/2020.1.217";
-"iimpi/2020a" -> "impi/2019.7.217-iccifort-2020.1.217";
-"help2man/1.47.12-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"help2man/1.47.12-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"libreadline/8.0-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"libreadline/8.0-GCCcore-9.3.0" -> "ncurses/6.2-GCCcore-9.3.0";
-"libreadline/8.0-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"GMP/6.2.0-GCCcore-9.3.0" -> "Autotools/20180311-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"GMP/6.2.0-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"GMP/6.2.0-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"GCCcore/9.3.0" -> "M4/1.4.18"  [arrowhead=diamond, color=blue, style=dotted];
-"GCCcore/9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"gettext/0.20.1" -> "ncurses/6.1";
-"bzip2/1.0.8-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"bzip2/1.0.8-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"flex/2.6.4-GCCcore-9.3.0" -> "Bison/3.5.3-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"flex/2.6.4-GCCcore-9.3.0" -> "help2man/1.47.12-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"flex/2.6.4-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"flex/2.6.4-GCCcore-9.3.0" -> "M4/1.4.18-GCCcore-9.3.0";
-"flex/2.6.4-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"ncurses/6.2-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"ncurses/6.2-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Tcl/8.6.10-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Tcl/8.6.10-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"Tcl/8.6.10-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"CMake/3.16.4-GCCcore-9.3.0" -> "ncurses/6.2-GCCcore-9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0" -> "bzip2/1.0.8-GCCcore-9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0" -> "cURL/7.69.1-GCCcore-9.3.0";
-"CMake/3.16.4-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"binutils/2.34" -> "flex/2.6.4"  [arrowhead=diamond, color=blue, style=dotted];
-"binutils/2.34" -> "Bison/3.5.3"  [arrowhead=diamond, color=blue, style=dotted];
-"binutils/2.34" -> "zlib/1.2.11"  [arrowhead=diamond, color=blue, style=dotted];
-"UCX/1.8.0-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"UCX/1.8.0-GCCcore-9.3.0" -> "Autotools/20180311-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"UCX/1.8.0-GCCcore-9.3.0" -> "pkg-config/0.29.2-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"UCX/1.8.0-GCCcore-9.3.0" -> "numactl/2.0.13-GCCcore-9.3.0";
-"UCX/1.8.0-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Bison/3.5.3" -> "M4/1.4.18"  [arrowhead=diamond, color=blue, style=dotted];
-"Autoconf/2.69-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Autoconf/2.69-GCCcore-9.3.0" -> "Perl/5.30.2-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Autoconf/2.69-GCCcore-9.3.0" -> "M4/1.4.18-GCCcore-9.3.0";
-"Autoconf/2.69-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"numactl/2.0.13-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"numactl/2.0.13-GCCcore-9.3.0" -> "Autotools/20180311-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"numactl/2.0.13-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"M4/1.4.18-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"M4/1.4.18-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8" -> "CMake/3.16.4-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8" -> "Eigen/3.3.7-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8" -> "Python/3.7.8-GCCcore-9.3.0";
-"pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8" -> "GCCcore/9.3.0";
-"makeinfo/6.7-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"makeinfo/6.7-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"binutils/2.34-GCCcore-9.3.0" -> "flex/2.6.4-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"binutils/2.34-GCCcore-9.3.0" -> "Bison/3.5.3-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"binutils/2.34-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"binutils/2.34-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"binutils/2.34-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"cURL/7.69.1-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"cURL/7.69.1-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"cURL/7.69.1-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"pkg-config/0.29.2-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"pkg-config/0.29.2-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Perl/5.30.2-GCCcore-9.3.0" -> "groff/1.22.4-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Perl/5.30.2-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "expat/2.2.9-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "ncurses/6.2-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "libreadline/8.0-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "DB/18.1.32-GCCcore-9.3.0";
-"Perl/5.30.2-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"imkl/2020.1.217-iimpi-2020a" -> "iimpi/2020a";
-"Python/3.7.8-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "bzip2/1.0.8-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "zlib/1.2.11-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "libreadline/8.0-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "ncurses/6.2-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "SQLite/3.31.1-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "XZ/5.2.5-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "GMP/6.2.0-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "libffi/3.3-GCCcore-9.3.0";
-"Python/3.7.8-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Automake/1.16.1-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Automake/1.16.1-GCCcore-9.3.0" -> "Perl/5.30.2-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Automake/1.16.1-GCCcore-9.3.0" -> "Autoconf/2.69-GCCcore-9.3.0";
-"Automake/1.16.1-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"groff/1.22.4-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"groff/1.22.4-GCCcore-9.3.0" -> "makeinfo/6.7-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"groff/1.22.4-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"intel/2020a" -> "GCCcore/9.3.0";
-"intel/2020a" -> "binutils/2.34-GCCcore-9.3.0";
-"intel/2020a" -> "iccifort/2020.1.217";
-"intel/2020a" -> "impi/2019.7.217-iccifort-2020.1.217";
-"intel/2020a" -> "imkl/2020.1.217-iimpi-2020a";
-"XZ/5.2.5-GCCcore-9.3.0" -> "gettext/0.20.1"  [arrowhead=diamond, color=blue, style=dotted];
-"XZ/5.2.5-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"XZ/5.2.5-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"Bison/3.5.3-GCCcore-9.3.0" -> "M4/1.4.18-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Bison/3.5.3-GCCcore-9.3.0" -> "binutils/2.34"  [arrowhead=diamond, color=blue, style=dotted];
-"Bison/3.5.3-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"SQLite/3.31.1-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"SQLite/3.31.1-GCCcore-9.3.0" -> "libreadline/8.0-GCCcore-9.3.0";
-"SQLite/3.31.1-GCCcore-9.3.0" -> "Tcl/8.6.10-GCCcore-9.3.0";
-"SQLite/3.31.1-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"libtool/2.4.6-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"libtool/2.4.6-GCCcore-9.3.0" -> "M4/1.4.18-GCCcore-9.3.0";
-"libtool/2.4.6-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"impi/2019.7.217-iccifort-2020.1.217" -> "UCX/1.8.0-GCCcore-9.3.0";
-"impi/2019.7.217-iccifort-2020.1.217" -> "iccifort/2020.1.217";
-"Eigen/3.3.7-GCCcore-9.3.0" -> "binutils/2.34-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Eigen/3.3.7-GCCcore-9.3.0" -> "CMake/3.16.4-GCCcore-9.3.0"  [arrowhead=diamond, color=blue, style=dotted];
-"Eigen/3.3.7-GCCcore-9.3.0" -> "GCCcore/9.3.0";
-"SciPy-bundle/2020.03-intel-2020a-Python-3.7.8" -> "Python/3.7.8-GCCcore-9.3.0";
-"SciPy-bundle/2020.03-intel-2020a-Python-3.7.8" -> "pybind11/2.4.3-GCCcore-9.3.0-Python-3.7.8";
-"SciPy-bundle/2020.03-intel-2020a-Python-3.7.8" -> "intel/2020a";
-}