diff --git a/examples/notebook_BHBH.ipynb b/examples/notebook_BHBH.ipynb
index 80b707d95f361ea1d14cdd22e333cb93a93c2734..4afd498b935307f40cd1b52bb87cccdd4a573ad3 100644
--- a/examples/notebook_BHBH.ipynb
+++ b/examples/notebook_BHBH.ipynb
@@ -5,27 +5,8 @@
    "id": "a544d28c-c2e1-4c6a-b55b-8caec440743f",
    "metadata": {},
    "source": [
-    "# Tutorial: Running individual systems with binary_c-python\n",
-    "This notebook will show you how to run single systems and analyze their results.\n",
-    "\n",
-    "It can be useful to have some functions to quickly run a single system to, for example, inspect what evolutionary steps a specific system goes through, to plot the mass loss evolution of a single system, etc. "
-   ]
-  },
-  {
-   "cell_type": "markdown",
-   "id": "dd5d9ec7-5791-45f1-afbd-225947e2a583",
-   "metadata": {
-    "tags": []
-   },
-   "source": [
-    "## Single system with run_system_wrapper\n",
-    "\n",
-    "The simplest method to run a single system is to use the run_system wrapper. This function deals with setting up the argument string, makes sure all the required parameters are included and handles setting and cleaning up the custom logging functionality (see notebook_custom_logging).\n",
-    "\n",
-    "As arguments to this function we can add any of the parameters that binary_c itself actually knows, as well as:\n",
-    "- custom_logging_code: string containing a Printf statement that binary_c can use to print information\n",
-    "- log_filename: path of the logfile that binary_c generates\n",
-    "- parse_function: function that handles parsing the output of binary-c"
+    "# Example use case: Binary black hole systems\n",
+    "TODO: introduce the notebook\n"
    ]
   },
   {
@@ -91,7 +72,13 @@
    "cell_type": "code",
    "execution_count": 3,
    "id": "029fc3f2-f09a-49af-a32b-248505738f2e",
-   "metadata": {},
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -288,13 +275,7 @@
       "     7.4046    9.501    9.586 14  14       -102.91       -1   -1.00   0.000   0.000  SN kick Ib/c (SN type 11 11, pre-explosion M=10.0399 Mc\"CO\"=7.43173 type=8) -> kick 1(190) vk=384.535 vr=0 omega=3.4205 phi=-0.103702 -> vn=384.535 ; final sep -102.908 ecc -1 (random count 5) - Runaway v=(-379.582,-106.329,10.8544) |v|=384.535 : companion v=(-5.13796e-51,-1.27569e-103,2.85406e-105), |v|=5.13796e-51 ; - , dm(exploder) = 0.454268, dm(companion) = 0\n",
       "     7.4046    9.501    9.586 14  14       -102.91       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     7.4046    9.501    9.586 14  14       -102.91       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000    9.501    9.586 14  14       -102.91       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000    9.501    9.586 14  14       -102.91       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n"
      ]
     }
@@ -376,7 +357,13 @@
    "cell_type": "code",
    "execution_count": 5,
    "id": "8018ef52-093d-45ac-a00b-5fb721db3adb",
-   "metadata": {},
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -558,13 +545,7 @@
       "System 58 has separation -140.9\n",
       "system 59 / 100\n",
       "{'time': 7.4046, 'M1': 5.851, 'M2': 5.873, 'K1': 14.0, 'K2': 14.0, 'separation': -2439.0}\n",
-      "System 59 has separation -2439.0\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "System 59 has separation -2439.0\n",
       "system 60 / 100\n",
       "{'time': 7.4046, 'M1': 5.851, 'M2': 5.873, 'K1': 14.0, 'K2': 14.0, 'separation': -235.82}\n",
       "System 60 has separation -235.82\n",
@@ -742,7 +723,13 @@
    "cell_type": "code",
    "execution_count": 6,
    "id": "3085ba82-430e-48f0-bca3-b19231e6109d",
-   "metadata": {},
+   "metadata": {
+    "collapsed": true,
+    "jupyter": {
+     "outputs_hidden": true
+    },
+    "tags": []
+   },
    "outputs": [
     {
      "name": "stdout",
@@ -944,13 +931,7 @@
       "     7.4046    9.501    9.586 14  14        9548.9     67.7 y  0.05   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     7.4046    9.501    9.586 14  14        9548.9     67.7 y  0.05   0.000   0.000  \"SN\"\n",
       "     7.4146    9.501    9.586 14  14        9548.9     67.7 y  0.05   0.000   0.000  \"END_SYMB\"\n",
-      " 15000.0000    9.501    9.586 14  14        9548.9     67.7 y  0.05   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000    9.501    9.586 14  14        9548.9     67.7 y  0.05   0.000   0.000  \"MAX_TIME\"\n",
       "\n"
      ]
     }
@@ -1238,13 +1219,7 @@
       "   265.4710   45.203    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "   265.4710   45.203    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "   265.4710   45.203    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.203    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.203    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1369,13 +1344,7 @@
       "     6.1830   26.222   18.898 14  14        94.707     15.9 d  0.58   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1830   26.222   18.898 14  14        94.707     15.9 d  0.58   0.000   0.000  \"SN\"\n",
       "     6.1830   26.222   18.898 14  14        94.707     15.9 d  0.58   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.222   18.898 14  14        89.066     14.5 d  0.56   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.222   18.898 14  14        89.066     14.5 d  0.56   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1505,13 +1474,7 @@
       "    83.5556   45.159    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "    83.5556   45.159    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "    83.5556   45.159    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.159    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.159    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1594,13 +1557,7 @@
       "  1473.7324   45.249    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "  1473.7324   45.249    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "  1473.7324   45.249    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.249    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.249    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1739,13 +1696,7 @@
       "   112.8805   45.090    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "   112.8805   45.090    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "   112.8805   45.090    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.090    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.090    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1813,13 +1764,7 @@
       "    12.7426   44.651    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "    12.7426   44.651    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "    12.7426   44.651    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   44.651    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   44.651    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -1931,13 +1876,7 @@
       "     6.1823   26.223   18.942 14  14        174.23     39.6 d  0.87   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1823   26.223   18.942 14  14        174.23     39.6 d  0.87   0.000   0.000  \"SN\"\n",
       "     6.1823   26.223   18.942 14  14        174.23     39.6 d  0.87   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.223   18.942 14  14           122     23.2 d  0.82   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.223   18.942 14  14           122     23.2 d  0.82   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -2016,13 +1955,7 @@
       "{'time': 6.1816, 'M1': 26.224, 'M2': 18.995, 'K1': 14.0, 'K2': 14.0, 'separation': -24.872}\n",
       "System 7 has separation -24.872\n",
       "system 8 / 100\n",
-      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -33.648}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -33.648}\n",
       "System 8 has separation -33.648\n",
       "system 9 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -1713.8}\n",
@@ -2137,13 +2070,7 @@
       "     6.1810   26.225   19.039 14  14           144     29.7 d  0.62   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1810   26.225   19.039 14  14           144     29.7 d  0.62   0.000   0.000  \"SN\"\n",
       "     6.1810   26.225   19.039 14  14           144     29.7 d  0.62   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.225   19.039 14  14        141.62       29 d  0.62   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.225   19.039 14  14        141.62       29 d  0.62   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -2230,13 +2157,7 @@
       "system 6 / 100\n",
       "None\n",
       "system 7 / 100\n",
-      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -62.267}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -62.267}\n",
       "System 7 has separation -62.267\n",
       "system 8 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -42.878}\n",
@@ -2345,13 +2266,7 @@
       "     6.1825   26.223   18.926 14  14         161.5     35.4 d  0.88   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1825   26.223   18.926 14  14         161.5     35.4 d  0.88   0.000   0.000  \"SN\"\n",
       "     6.1825   26.223   18.926 14  14         161.5     35.4 d  0.88   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.223   18.926 14  14        75.019     11.2 d  0.76   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.223   18.926 14  14        75.019     11.2 d  0.76   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -2431,13 +2346,7 @@
       "system 6 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -106.87}\n",
       "System 6 has separation -106.87\n",
-      "system 7 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 7 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -89.768}\n",
       "System 7 has separation -89.768\n",
       "system 8 / 100\n",
@@ -2514,13 +2423,7 @@
       "{'time': 6.1819, 'M1': 26.224, 'M2': 18.975, 'K1': 14.0, 'K2': 14.0, 'separation': -23.855}\n",
       "System 1 has separation -23.855\n",
       "system 2 / 100\n",
-      "{'time': 6.1811, 'M1': 26.225, 'M2': 19.036, 'K1': 14.0, 'K2': 14.0, 'separation': -168.1}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "{'time': 6.1811, 'M1': 26.225, 'M2': 19.036, 'K1': 14.0, 'K2': 14.0, 'separation': -168.1}\n",
       "System 2 has separation -168.1\n",
       "system 3 / 100\n",
       "None\n",
@@ -2603,13 +2506,7 @@
       "System 6 has separation -98.879\n",
       "system 7 / 100\n",
       "{'time': 6.1834, 'M1': 26.221, 'M2': 18.866, 'K1': 14.0, 'K2': 14.0, 'separation': 71.42}\n",
-      "System 7 has separation 71.42\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "System 7 has separation 71.42\n",
       "Found bound BHBH system\n",
       "      TIME      M1       M2   K1  K2           SEP        PER   ECC  R1/ROL1 R2/ROL2  TYPE RANDOM_SEED=26051 RANDOM_COUNT=0\n",
       "     0.0000   60.000   40.000  1   1        3101.2     5.48 y  0.00   0.006   0.006  \"INITIAL \"\n",
@@ -2673,13 +2570,7 @@
       "System 1 has separation -490.65\n",
       "system 2 / 100\n",
       "None\n",
-      "system 3 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 3 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -844.54}\n",
       "System 3 has separation -844.54\n",
       "system 4 / 100\n",
@@ -2803,13 +2694,7 @@
       "     6.1812   26.225   19.021 14  14        157.31       34 d  0.29   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1812   26.225   19.021 14  14        157.31       34 d  0.29   0.000   0.000  \"SN\"\n",
       "     6.1812   26.225   19.021 14  14        157.31       34 d  0.29   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.225   19.021 14  14        157.05     33.9 d  0.29   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.225   19.021 14  14        157.05     33.9 d  0.29   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -2932,13 +2817,7 @@
       "   812.5051   43.110    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "   812.5051   43.110    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "   812.5051   43.110    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   43.110    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   43.110    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3051,13 +2930,7 @@
       "     6.1844   26.229   18.804 14  14        164.59     36.4 d  0.46   0.000   0.000  SN kick Ib/c (SN type 11 11, pre-explosion M=18.8039 Mc\"CO\"=14.1854 type=8) -> kick 1(190) vk=161.317 vr=310.99 omega=3.87813 phi=-1.31958 -> vn=375.785 ; final sep 164.585 ecc 0.464494 (random count 5) - Runaway v=(-42.7184,-100.373,-23.0784) |v|=111.499 : companion v=(225.604,-99.3719,-86.2291), |v|=261.166 ; - , dm(exploder) = 0, dm(companion) = 0\n",
       "     6.1844   26.229   18.804 14  14        164.59     36.4 d  0.46   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1844   26.229   18.804 14  14        164.59     36.4 d  0.46   0.000   0.000  \"SN\"\n",
-      " 15000.0000   26.229   18.804 14  14         164.1     36.3 d  0.46   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.229   18.804 14  14         164.1     36.3 d  0.46   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3176,13 +3049,7 @@
       "     6.1830   26.222   18.894 14  14        305.95     92.3 d  0.61   0.000   0.000  SN kick Ib/c (SN type 11 11, pre-explosion M=18.8941 Mc\"CO\"=14.2552 type=8) -> kick 1(190) vk=151.131 vr=262.883 omega=2.0613 phi=-1.06527 -> vn=331.775 ; final sep 305.952 ecc 0.613167 (random count 5) - Runaway v=(0,0,0) |v|=0 : companion v=(0,0,0), |v|=0 ; - , dm(exploder) = 0, dm(companion) = 0\n",
       "     6.1830   26.222   18.894 14  14        305.95     92.3 d  0.61   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1830   26.222   18.894 14  14        305.95     92.3 d  0.61   0.000   0.000  \"SN\"\n",
-      " 15000.0000   26.222   18.894 14  14        305.73     92.2 d  0.61   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.222   18.894 14  14        305.73     92.2 d  0.61   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3267,13 +3134,7 @@
       "   457.8881   45.125    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "   457.8881   45.125    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "   457.8881   45.125    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.125    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.125    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3351,13 +3212,7 @@
       "System 1 has separation -168.81\n",
       "system 2 / 100\n",
       "None\n",
-      "system 3 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 3 / 100\n",
       "{'time': 6.1808, 'M1': 26.225, 'M2': 19.057, 'K1': 14.0, 'K2': 14.0, 'separation': -26.38}\n",
       "System 3 has separation -26.38\n",
       "system 4 / 100\n",
@@ -3449,13 +3304,7 @@
       "system 13 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -374.05}\n",
       "System 13 has separation -374.05\n",
-      "system 14 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 14 / 100\n",
       "{'time': 6.181, 'M1': 26.225, 'M2': 19.041, 'K1': 14.0, 'K2': 14.0, 'separation': 236.64}\n",
       "System 14 has separation 236.64\n",
       "Found bound BHBH system\n",
@@ -3586,13 +3435,7 @@
       "     6.1827   26.222   18.914 14  14        99.202       17 d  0.44   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1827   26.222   18.914 14  14        99.202       17 d  0.44   0.000   0.000  \"SN\"\n",
       "     6.1827   26.222   18.914 14  14        99.202       17 d  0.44   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.222   18.914 14  14        97.228     16.5 d  0.43   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.222   18.914 14  14        97.228     16.5 d  0.43   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3704,13 +3547,7 @@
       "     6.1858   26.249   18.711 14  14        98.616     16.9 d  0.47   0.000   0.000  SN kick Ib/c (SN type 11 11, pre-explosion M=18.7108 Mc\"CO\"=14.1135 type=8) -> kick 1(190) vk=199.576 vr=332.361 omega=1.41485 phi=-0.652755 -> vn=365.958 ; final sep 98.6161 ecc 0.469056 (random count 5) - Runaway v=(-0.807331,-67.6832,0.168972) |v|=67.6883 : companion v=(254.424,134.518,0.477089), |v|=287.796 ; - , dm(exploder) = 0, dm(companion) = 0\n",
       "     6.1858   26.249   18.711 14  14        98.616     16.9 d  0.47   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1858   26.249   18.711 14  14        98.616     16.9 d  0.47   0.000   0.000  \"SN\"\n",
-      " 15000.0000   26.249   18.711 14  14        96.287     16.3 d  0.46   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.249   18.711 14  14        96.287     16.3 d  0.46   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3838,13 +3675,7 @@
       "    10.8252   45.201    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "    10.8252   45.201    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "    10.8252   45.201    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.201    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.201    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -3953,13 +3784,7 @@
       "  8031.6562   45.165    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "  8031.6562   45.165    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "  8031.6562   45.165    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.165    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.165    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -4046,13 +3871,7 @@
       "     6.1847   26.236   18.783 14  14        113.51     20.9 d  0.29   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1847   26.236   18.783 14  14        113.51     20.9 d  0.29   0.000   0.000  \"SN\"\n",
       " 15000.0000   26.236   18.783 14  14        112.85     20.7 d  0.29   0.000   0.000  \"MAX_TIME\"\n",
-      "\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -48.404}\n",
@@ -4115,13 +3934,7 @@
       "     6.2075   45.233    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.2075   45.233    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "     6.2075   45.233    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.233    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.233    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -4206,13 +4019,7 @@
       "     6.1817   26.224   18.984 14  14        763.92      364 d  0.79   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1817   26.224   18.984 14  14        763.92      364 d  0.79   0.000   0.000  \"SN\"\n",
       "     6.1817   26.224   18.984 14  14        763.92      364 d  0.79   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.224   18.984 14  14        763.81      364 d  0.79   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.224   18.984 14  14        763.81      364 d  0.79   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -4291,13 +4098,7 @@
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -1722.6}\n",
       "System 5 has separation -1722.6\n",
       "system 6 / 100\n",
-      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -1571.7}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -1571.7}\n",
       "System 6 has separation -1571.7\n",
       "system 7 / 100\n",
       "None\n",
@@ -4424,13 +4225,7 @@
       "     6.1826   26.223   18.922 14  14        1691.7     3.28 y  0.98   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1826   26.223   18.922 14  14        1691.7     3.28 y  0.98   0.000   0.000  \"SN\"\n",
       "     6.1826   26.223   18.922 14  14        1691.7     3.28 y  0.98   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.223   18.922 14  14        1663.3      3.2 y  0.98   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.223   18.922 14  14        1663.3      3.2 y  0.98   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -4508,13 +4303,7 @@
       "system 4 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -121.45}\n",
       "System 4 has separation -121.45\n",
-      "system 5 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 5 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -209.29}\n",
       "System 5 has separation -209.29\n",
       "system 6 / 100\n",
@@ -4611,13 +4400,7 @@
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -42.805}\n",
       "System 6 has separation -42.805\n",
       "system 7 / 100\n",
-      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -86.593}\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -86.593}\n",
       "System 7 has separation -86.593\n",
       "system 8 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -33.049}\n",
@@ -4693,13 +4476,7 @@
       "system 5 / 100\n",
       "{'time': 6.1817, 'M1': 26.224, 'M2': 18.986, 'K1': 14.0, 'K2': 14.0, 'separation': -78.905}\n",
       "System 5 has separation -78.905\n",
-      "system 6 / 100\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      "system 6 / 100\n",
       "{'time': 6.1851, 'M1': 26.215, 'M2': 48.508, 'K1': 14.0, 'K2': 14.0, 'separation': -58.583}\n",
       "System 6 has separation -58.583\n",
       "system 7 / 100\n",
@@ -4826,13 +4603,7 @@
       "     6.1822   26.223   18.952 14  14        133.24     26.5 d  0.42   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1822   26.223   18.952 14  14        133.24     26.5 d  0.42   0.000   0.000  \"SN\"\n",
       "     6.1822   26.223   18.952 14  14        133.24     26.5 d  0.42   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.223   18.952 14  14        132.51     26.3 d  0.42   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.223   18.952 14  14        132.51     26.3 d  0.42   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -4959,13 +4730,7 @@
       "     6.1814   26.225   19.013 14  14         195.2       47 d  0.11   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1814   26.225   19.013 14  14         195.2       47 d  0.11   0.000   0.000  \"SN\"\n",
       "     6.1814   26.225   19.013 14  14         195.2       47 d  0.11   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.225   19.013 14  14        195.12     46.9 d  0.11   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.225   19.013 14  14        195.12     46.9 d  0.11   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -5071,13 +4836,7 @@
       "   202.9610   45.199    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"TYPE_CHNGE\"\n",
       "   202.9610   45.199    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"COALESCE\"\n",
       "   202.9610   45.199    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"SN\"\n",
-      " 15000.0000   45.199    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   45.199    0.000 14  15            -1       -1   -1.00   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -5205,13 +4964,7 @@
       "     6.1817   26.224   18.984 14  14        239.33     63.8 d  0.62   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1817   26.224   18.984 14  14        239.33     63.8 d  0.62   0.000   0.000  \"SN\"\n",
       "     6.1817   26.224   18.984 14  14        239.33     63.8 d  0.62   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.224   18.984 14  14        238.83     63.6 d  0.62   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.224   18.984 14  14        238.83     63.6 d  0.62   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -5331,13 +5084,7 @@
       "     6.1821   26.223   18.957 14  14        144.61       30 d  0.23   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1821   26.223   18.957 14  14        144.61       30 d  0.23   0.000   0.000  \"SN\"\n",
       "     6.1821   26.223   18.957 14  14        144.61       30 d  0.23   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.223   18.957 14  14        144.35     29.9 d  0.23   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.223   18.957 14  14        144.35     29.9 d  0.23   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -5420,13 +5167,7 @@
       "     6.1816   26.224   18.998 14  14        246.46     66.6 d  0.33   0.000   0.000  \"TYPE_CHNGE\"\n",
       "     6.1816   26.224   18.998 14  14        246.46     66.6 d  0.33   0.000   0.000  \"SN\"\n",
       "     6.1816   26.224   18.998 14  14        246.46     66.6 d  0.33   0.000   0.000  \"End tidal lock 2\"\n",
-      " 15000.0000   26.224   18.998 14  14        246.39     66.6 d  0.33   0.000   0.000  \"MAX_TIME\"\n"
-     ]
-    },
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
+      " 15000.0000   26.224   18.998 14  14        246.39     66.6 d  0.33   0.000   0.000  \"MAX_TIME\"\n",
       "\n",
       "{'M_1': 60, 'M_2': 40, 'metallicity': 0.001, 'orbital_period': 2000, 'BH_prescription': 'BH_BELCZYNSKI', 'wind_mass_loss': 'WIND_ALGORITHM_NONE', 'alpha_ce': 0.1}\n",
       "system 1 / 100\n",
@@ -5528,7 +5269,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -5542,7 +5283,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_HRD.ipynb b/examples/notebook_HRD.ipynb
index ee40c35d223c078d3c33b4c054115e768a40ad0c..d56440170a9c8083dc85a31debcf6d9324440930 100644
--- a/examples/notebook_HRD.ipynb
+++ b/examples/notebook_HRD.ipynb
@@ -1089,7 +1089,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -1103,7 +1103,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_api_functionality.ipynb b/examples/notebook_api_functionality.ipynb
index fb6ea05bd2aa1e07e5265dfba2c0520441de2412..504ae4b16880946428716c496c81cbf82eea63a8 100644
--- a/examples/notebook_api_functionality.ipynb
+++ b/examples/notebook_api_functionality.ipynb
@@ -966,7 +966,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -980,7 +980,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_common_envelope_evolution.ipynb b/examples/notebook_common_envelope_evolution.ipynb
index 83f3e239c4da142d06592cb756d6599b5e76d0ee..b543957d6a16c387ee87082ddd3703bf1b1109f1 100644
--- a/examples/notebook_common_envelope_evolution.ipynb
+++ b/examples/notebook_common_envelope_evolution.ipynb
@@ -783,20 +783,21 @@
    "metadata": {},
    "source": [
     "Things to try:\n",
-    "* Extend the logging to output more data than just the orbital period.\n",
-    "* What are the stellar types of the post-common envelope systems? Are they likely to undergo novae or a type-Ia supernova?\n",
-    "* What are the lifetimes of the systems in close ($<1\\text{ }\\mathrm{d}$) binaries? Are they likely to merge in the life of the Universe?\n",
-    "* How much mass is lost in common-envelope interactions?\n",
-    "* Extend the grid to massive stars. Do you see many NS and BH compact binaries?\n",
-    "* Try different $\\alpha_\\mathrm{CE}$ and $\\lambda_\\mathrm{CE}$ options...\n",
-    "* ... and perhaps increased resolution to obtain smoother curves.\n",
-    "* Why do long-period systems not reach common envelope evolution?"
+    "\n",
+    " * Extend the logging to output more data than just the orbital period.\n",
+    " * What are the stellar types of the post-common envelope systems? Are they likely to undergo novae or a type-Ia supernova?\n",
+    " * What are the lifetimes of the systems in close ($<1\\text{ }\\mathrm{d}$) binaries? Are they likely to merge in the life of the Universe?\n",
+    " * How much mass is lost in common-envelope interactions?\n",
+    " * Extend the grid to massive stars. Do you see many NS and BH compact binaries?\n",
+    " * Try different $\\alpha_\\mathrm{CE}$ and $\\lambda_\\mathrm{CE}$ options...\n",
+    " * ... and perhaps increased resolution to obtain smoother curves.\n",
+    " * Why do long-period systems not reach common envelope evolution?"
    ]
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -810,7 +811,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_custom_logging.ipynb b/examples/notebook_custom_logging.ipynb
index dbe7d30010d358f1255aaa25eecfb865e3ff08cb..8dfb85034dd77e1b0ae790c475a1e52bd70d0227 100644
--- a/examples/notebook_custom_logging.ipynb
+++ b/examples/notebook_custom_logging.ipynb
@@ -34,6 +34,7 @@
     "The custom logging functionality allows us to decide the output of binary_c _without_ modifying the actual sourcecode of binary_c (i.e. editing `src/logging/log_every_timestep` in binary_c). Rather, we can create a logging routine from within python.\n",
     "\n",
     "Technically, the following steps are taken:\n",
+    "\n",
     "- User creates a logging print statement from within python\n",
     "- The logging print statement string gets wrapped into a proper c-function by `binary_c_log_code`\n",
     "- The c-function string gets compiled and loaded into memory by `create_and_load_logging_function`\n",
@@ -460,19 +461,11 @@
     "# print (abridged) output\n",
     "print(\"\\n\".join(output.splitlines()[-2:]))"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "484297c0-accb-4efc-a9c8-dbd2f32b89a6",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -486,7 +479,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_extra_features.ipynb b/examples/notebook_extra_features.ipynb
index f51d82bb4a62db6f3a6b32cf0dbed666c4116ee7..44c19c11274fbd39732e34e03e7a14a371ff9d7c 100644
--- a/examples/notebook_extra_features.ipynb
+++ b/examples/notebook_extra_features.ipynb
@@ -34,7 +34,8 @@
    "metadata": {},
    "source": [
     "## getting extra information about binary_c parameters\n",
-    "There are several functions that can be used to get information about the parameters in binary_c: \n",
+    "There are several functions that can be used to get information about the parameters in binary_c:\n",
+    "\n",
     "- `get_help(parameter)`: Function to get information about the specific input parameter. Prints the output on default but returns a dictionary containing the information. \n",
     "- `get_help_all(print_help=True)`: Function to get information about all the parameters. Prints the output on default but returns a dictionary containing the information. \n",
     "- `get_help_super()`:  Function to get even more information about all the parameters. Does not print the output on default but returns a dictionary containing the information. \n",
@@ -173,8 +174,7 @@
    "id": "b3c259ef-9f89-4b26-9ce3-45af625bc398",
    "metadata": {},
    "source": [
-    "## Getting help\n",
-    "There are sever"
+    "## Getting help\n"
    ]
   },
   {
@@ -188,7 +188,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -202,7 +202,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_individual_systems.ipynb b/examples/notebook_individual_systems.ipynb
index b71d148972de47150c82b16756f52c4b35d2a094..deb72fc55ba3785c9c829ab83ba0846cd9b86867 100644
--- a/examples/notebook_individual_systems.ipynb
+++ b/examples/notebook_individual_systems.ipynb
@@ -23,6 +23,7 @@
     "The simplest method to run a single system is to use the run_system wrapper. This function deals with setting up the argument string, makes sure all the required parameters are included and handles setting and cleaning up the custom logging functionality (see notebook_custom_logging).\n",
     "\n",
     "As arguments to this function we can add any of the parameters that binary_c itself actually knows, as well as:\n",
+    "\n",
     "- custom_logging_code: string containing a Printf statement that binary_c can use to print information\n",
     "- log_filename: path of the logfile that binary_c generates\n",
     "- parse_function: function that handles parsing the output of binary-c"
diff --git a/examples/notebook_luminosity_function_binaries.ipynb b/examples/notebook_luminosity_function_binaries.ipynb
index 8eabffc0883f2cb870139ed5babf2e0ac825463b..8325ab08f0772fc969f2acf5f9306c04ca64562d 100644
--- a/examples/notebook_luminosity_function_binaries.ipynb
+++ b/examples/notebook_luminosity_function_binaries.ipynb
@@ -124,11 +124,12 @@
    "id": "2a9104fc-4136-4e53-8604-f24ad52fbe56",
    "metadata": {},
    "source": [
-    "First let us set up some global variables that will be useful throughout. \n",
-    "* The resolution is the number of stars we simulate in our model population.\n",
-    "* The massrange is a list of the min and max masses\n",
-    "* The total_probability is the theoretical integral of a probability density function, i.e. 1.0.\n",
-    "* The binwidth sets the resolution of the final distribution. If set to 0.5, the bins in log*L* are 0.5dex wide."
+    "First let us set up some global variables that will be useful throughout.\n",
+    "\n",
+    " * The resolution is the number of stars we simulate in our model population.\n",
+    " * The massrange is a list of the min and max masses\n",
+    " * The total_probability is the theoretical integral of a probability density function, i.e. 1.0.\n",
+    " * The binwidth sets the resolution of the final distribution. If set to 0.5, the bins in log*L* are 0.5dex wide."
    ]
   },
   {
@@ -869,33 +870,31 @@
    ]
   },
   {
-   "cell_type": "code",
-   "execution_count": 12,
-   "id": "99e25a72-54e6-4826-b0e5-4a02460b857d",
+   "cell_type": "markdown",
+   "id": "e0601000-a4c9-4073-a695-10a664e532f0",
    "metadata": {},
-   "outputs": [
-    {
-     "ename": "SyntaxError",
-     "evalue": "invalid syntax (2944163245.py, line 1)",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[0;36m  File \u001b[0;32m\"/tmp/ipykernel_518916/2944163245.py\"\u001b[0;36m, line \u001b[0;32m1\u001b[0m\n\u001b[0;31m    Things to try:\u001b[0m\n\u001b[0m           ^\u001b[0m\n\u001b[0;31mSyntaxError\u001b[0m\u001b[0;31m:\u001b[0m invalid syntax\n"
-     ]
-    }
-   ],
    "source": [
     "Things to try:\n",
-    "* Massive stars: can you see the effects of wind mass loss and rejuvenation in these stars?\n",
-    "* Alter the metallicity, does this make much of a difference?\n",
-    "* Change the binary fraction. Here we assume a 100% binary fraction, but a real population is a mixture of single and binary stars.\n",
-    "* How might you go about comparing these computed observations to real stars?\n",
-    "* What about evolved stars? Here we consider only the *zero-age* main sequnece. What about other main-sequence stars? What about stars in later phases of stellar evolution?"
+    "\n",
+    " * Massive stars: can you see the effects of wind mass loss and rejuvenation in these stars?\n",
+    " * Alter the metallicity, does this make much of a difference?\n",
+    " * Change the binary fraction. Here we assume a 100% binary fraction, but a real population is a mixture of single and binary stars.\n",
+    " * How might you go about comparing these computed observations to real stars?\n",
+    " * What about evolved stars? Here we consider only the *zero-age* main sequnece. What about other main-sequence stars? What about stars in later phases of stellar evolution?"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "abb096b0-7c57-43d6-a9f7-56bdd21dc542",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -909,7 +908,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_luminosity_function_single.ipynb b/examples/notebook_luminosity_function_single.ipynb
index 2fc879dc405718cef3fcb7999b7a3c19fc9fbcfb..93e041531422571b1a499b0089f9e4e465d4a0f3 100644
--- a/examples/notebook_luminosity_function_single.ipynb
+++ b/examples/notebook_luminosity_function_single.ipynb
@@ -131,7 +131,8 @@
    "id": "2a9104fc-4136-4e53-8604-f24ad52fbe56",
    "metadata": {},
    "source": [
-    "First let us set up some global variables that will be useful throughout. \n",
+    "First let us set up some global variables that will be useful throughout.\n",
+    "\n",
     "* The resolution is the number of stars we simulate in our model population.\n",
     "* The massrange is a list of the min and max masses\n",
     "* The total_probability is the theoretical integral of a probability density function, i.e. 1.0.\n",
@@ -594,6 +595,7 @@
    "metadata": {},
    "source": [
     "Things to try:\n",
+    "\n",
     "* Change the resolution to make the distributions smoother: what about error bars, how would you do that?\n",
     "* Different initial distributions: the Kroupa distribution isn't the only one out there\n",
     "* Change the metallicity and mass ranges\n",
@@ -601,11 +603,19 @@
     "* What about evolved stars? Here we consider only the *zero-age* main sequnece. What about other main-sequence stars? What about stars in later phases of stellar evolution?\n",
     "* Binary stars! (see notebook_luminosity_function_binaries.ipynb)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "ef00d82c-dc36-4a94-b4be-98f58649644e",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -619,7 +629,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_massive_remnants.ipynb b/examples/notebook_massive_remnants.ipynb
index f7586281eca293f9882e5438c42119d2382fc600..28227d1a1cb7536b70a32fd936026697be9cbe35 100644
--- a/examples/notebook_massive_remnants.ipynb
+++ b/examples/notebook_massive_remnants.ipynb
@@ -7,7 +7,7 @@
     "tags": []
    },
    "source": [
-    "# Example use case: Zero-age stellar luminosity function\n",
+    "# Example use case: Massive star luminosity\n",
     "\n",
     "In this notebook we compute the luminosity function of the zero-age main-sequence by running a population of single stars using binary_c. \n",
     "\n",
@@ -131,7 +131,8 @@
    "id": "2a9104fc-4136-4e53-8604-f24ad52fbe56",
    "metadata": {},
    "source": [
-    "First let us set up some global variables that will be useful throughout. \n",
+    "First let us set up some global variables that will be useful throughout.\n",
+    "\n",
     "* The resolution is the number of stars we simulate in our model population.\n",
     "* The massrange is a list of the min and max masses\n",
     "* The total_probability is the theoretical integral of a probability density function, i.e. 1.0.\n",
@@ -718,18 +719,27 @@
    "metadata": {},
    "source": [
     "Things to try:\n",
-    "* Change the resolution to make the distributions smoother: what about error bars, how would you do that?\n",
-    "* Different initial distributions: the Kroupa distribution isn't the only one out there\n",
-    "* Change the metallicity and mass ranges\n",
-    "* What about a non-constant star formation rate? This is more of a challenge!\n",
-    "* What about evolved stars? Here we consider only the *zero-age* main sequnece. What about other main-sequence stars? What about stars in later phases of stellar evolution?\n",
-    "* Binary stars! (see notebook_luminosity_function_binaries.ipynb)"
+    "\n",
+    " * Change the resolution to make the distributions smoother: what about error bars, how would you do that?\n",
+    " * Different initial distributions: the Kroupa distribution isn't the only one out there\n",
+    " * Change the metallicity and mass ranges\n",
+    " * What about a non-constant star formation rate? This is more of a challenge!\n",
+    " * What about evolved stars? Here we consider only the *zero-age* main sequnece. What about other main-sequence stars? What about stars in later phases of stellar evolution?\n",
+    " * Binary stars! (see notebook_luminosity_function_binaries.ipynb)"
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "5abd0935-3957-4859-80c1-6f5d7ce4b614",
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -743,7 +753,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_population.ipynb b/examples/notebook_population.ipynb
index 968c033508c90b5c4387ef758542038219bcd5f7..760b1480e9f9bdcc508ced177f8f0d806cfb53eb 100644
--- a/examples/notebook_population.ipynb
+++ b/examples/notebook_population.ipynb
@@ -116,6 +116,7 @@
     "After configuring the population, but before running the actual population, its usually a good idea to export the full configuration (including version info of binary_c and all the parameters) to a file. To do this we use `example_pop.export_all_info()`.\n",
     "\n",
     "On default this exports everything, each of the sections can be disabled:\n",
+    "\n",
     "  - population settings (bse_options, grid_options, custom_options), turn off with include_population\n",
     "      settings=False\n",
     "  - binary_c_defaults (all the commandline arguments that binary c accepts, and their defaults).\n",
@@ -1144,7 +1145,7 @@
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -1158,7 +1159,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,
diff --git a/examples/notebook_solar_system.ipynb b/examples/notebook_solar_system.ipynb
index 67556a6556f73188f9c888b0538a3a4aa40be24e..926e6d9c4a22c0ec6018ae47aadfbcc188c4e8c2 100644
--- a/examples/notebook_solar_system.ipynb
+++ b/examples/notebook_solar_system.ipynb
@@ -3,9 +3,11 @@
   {
    "cell_type": "markdown",
    "id": "ddc06da3-fc68-4c6f-8067-14ea862b964d",
-   "metadata": {},
+   "metadata": {
+    "tags": []
+   },
    "source": [
-    "## Solar system using the API functionality\n",
+    "## Example use case: Solar system using the API functionality\n",
     "We use the API interface to construct a model of the Solar system."
    ]
   },
@@ -292,19 +294,11 @@
    "source": [
     "It gets a little toasty on Earth in the not too distant future!"
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "22df65d7-1c77-4e9c-b188-955219377014",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Python 3 (ipykernel)",
+   "display_name": "Python 3",
    "language": "python",
    "name": "python3"
   },
@@ -318,7 +312,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.9.5"
+   "version": "3.6.4"
   }
  },
  "nbformat": 4,