diff --git a/book/figures/fig-bulk-fermentation.tex b/book/figures/fig-bulk-fermentation.tex
index 9f405ed..5eb0a45 100644
--- a/book/figures/fig-bulk-fermentation.tex
+++ b/book/figures/fig-bulk-fermentation.tex
@@ -1,25 +1,28 @@
 \begin{tikzpicture}[node distance = 3cm, auto]
   \node [start] (init) {Bulk fermentation};
-  \node [block, right of=init] (check_dough) {Check the dough};
+  \node [block, right of=init, node distance=4cm] (check_dough) {Check the dough};
   \node [block, right of=check_dough, node distance=4cm] (size_increase) {Check dough size increase};
   \node [block, below of=size_increase, node distance=2cm] (ph_value) {Check dough pH value};
   \node [block, below of=ph_value, node distance=2cm] (smell) {Check dough smell};
-  \node [decision, right of=ph_value, node distance=4cm] (dough_ready) {Dough ready?};
-  \node [success, below of=dough_ready] (divide_preshape) {Divide and preshape};
-  \node [decision, below of=smell] (dough_flattened) {Dough flattened out?};
-  \node [block, below of=check_dough, node distance=3cm] (wait_60_minutes) {Wait\\ 60~minutes};
-  \node [block, below of=wait_60_minutes, node distance=4cm] (stretch_fold) {Stretch and fold};
+  \node [decision, right of=size_increase, node distance=4cm] (dough_ready) {Dough ready?};
+  \node [success] at(dough_ready |- smell) (divide_preshape) {Divide and preshape};
+  \node [decision, above of=size_increase] (dough_flattened) {Dough flattened out?};
+  \node [block, above of=check_dough] (wait_60_minutes) {Wait\\ 60~minutes};
+  \node [block, above of=wait_60_minutes] (stretch_fold) {Stretch and fold};
 
   \path [line] (init) -- (check_dough);
   \path [line] (check_dough) -- (size_increase);
-  \path [line] (check_dough) -- node{or} (ph_value);
-  \path [line] (check_dough) -- node{or} (smell);
+  % Tricks not to get double lines
+  \path [line] (check_dough) ++(2, -2) -- node{or} (ph_value);
+  \path [line] (check_dough) ++(2, 0) -- node{} ++(0, -4) -- node{or} (smell);
+  \path [line] (check_dough) ++(2, -4) -- node{or} (smell);
   \path [line] (size_increase) -- (dough_ready);
-  \path [line] (ph_value) -- (dough_ready);
-  \path [line] (smell) -- (dough_ready);
+  % Same tricks not to get double lines and also we do _not_ want arrows
+  \path [draw, thick] (ph_value) -- node{} ++(2, 0);
+  \path [draw, thick] (smell) -| node{} ++(2, 4);
   \path [line] (dough_ready) -- node{yes} (divide_preshape);
-  \path [line] (dough_ready) -- node{no} (dough_flattened);
-  \path [line] (dough_flattened) -- node{yes} (stretch_fold);
+  \path [line] (dough_ready) |- node[right=3pt]{no} (dough_flattened);
+  \path [line] (dough_flattened) |- node[right=3pt]{yes} (stretch_fold);
   \path [line] (dough_flattened) -- node{no} (wait_60_minutes);
   \path [line] (stretch_fold) -- (wait_60_minutes);
   \path [line] (wait_60_minutes) -- (check_dough);
diff --git a/book/figures/fig-dividing-preshaping.tex b/book/figures/fig-dividing-preshaping.tex
index d9a0544..1ed0fa3 100644
--- a/book/figures/fig-dividing-preshaping.tex
+++ b/book/figures/fig-dividing-preshaping.tex
@@ -2,8 +2,8 @@
   \node [start] (init) {Dividing required?};
   \node [decision, right of=init, node distance=5cm] (more_than_one_loaf) {More than 1 loaf?};
   \node [success, right of=more_than_one_loaf, node distance=5cm] (yes) {Yes};
-  \node [success, below of=yes, node distance=3cm] (no) {No};
+  \node [success, below of=yes] (no) {No};
   \path [line] (init) -- (more_than_one_loaf);
   \path [line] (more_than_one_loaf) -- (yes);
-  \path [line] (more_than_one_loaf) -- (no);
+  \path [line] (more_than_one_loaf.south) -- node{} ++(0, -1) |- (no);
 \end{tikzpicture}
diff --git a/book/figures/fig-kneading-process.tex b/book/figures/fig-kneading-process.tex
index 7732c4b..4a48db3 100644
--- a/book/figures/fig-kneading-process.tex
+++ b/book/figures/fig-kneading-process.tex
@@ -1,26 +1,26 @@
-\begin{tikzpicture}[node distance = 3cm, auto]
+\begin{tikzpicture}[node distance = 4cm, auto]
   \node [start] (init) {Homogenize recipe ingredients};
-  \node [block, right of=init, node distance=3cm] (wait1) {Wait\\15~minutes};
+  \node [block, right of=init] (wait1) {Wait\\15~minutes};
   \path [line] (init) -- (wait1);
-  \node [block, right of=wait1, node distance=3cm] (knead1) {Knead 5~minutes};
-  \path [line] (wait1) -- (knead1);
-  \node [block, right of=knead1, node distance=3cm] (wait2) {Wait\\15~minutes};
-  \path [line] (knead1) -- (wait2);
-  \node [decision, below of=wait2, node distance=3cm] (windowpane_test) {Window-pane?};
+  \node [block, right of=wait1] (knead) {Knead 5~minutes};
+  \path [line] (wait1) -- (knead);
+  \node [block, right of=knead] (wait2) {Wait\\15~minutes};
+  \path [line] (knead) -- (wait2);
+  \node [decision, below of=wait2, node distance=4cm] (windowpane_test) {Window-pane?};
   \path [line] (wait2) -- (windowpane_test);
-  \path [line] (windowpane_test) -- node{no} (knead1);
-  \node [decision, left of=windowpane_test, node distance=4.5cm] (more_water) {Bassinage for more water?};
+  \path [line] (windowpane_test.east) -- node{no} ++(1, 0) -- node{} ++(0, 5.7) -|  (knead.north);
+  \node [decision] at (windowpane_test -| knead) (more_water) {Bassinage for more water?};
   \path [line] (windowpane_test) -- node{yes} (more_water);
-  \node [block, left of=more_water, node distance=4.5cm] (add_water) {Add water};
+  \node [block] at (wait1 |- more_water) (add_water) {Add water};
   \path [line] (more_water) -- node{yes} (add_water);
-  \path [line] (add_water) -- (knead1);
-  \node [decision, below of=more_water, node distance=3.5cm] (dough_sample) {Aliquot sample?};
+  \path [line] (add_water.north east) -- (knead.south west);
+  \node [decision, below of=more_water, node distance=4.5cm] (dough_sample) {Aliquot sample?};
   \path [line] (more_water) -- node{no} (dough_sample);
-  \node [block, right of=dough_sample, node distance=4.5cm] (dough_ball) {Make round dough ball};
+  \node [block] at (dough_sample -| wait2) (dough_ball) {Make round dough ball};
   \path [line] (dough_sample) -- node{no} (dough_ball);
-  \node [block, below of=dough_sample, node distance=3cm] (extract_sample) {Extract sample};
+  \node [block, below of=dough_sample] (extract_sample) {Extract sample};
   \path [line] (dough_sample) -- node{yes} (extract_sample);
-  \path [line] (extract_sample) -- (dough_ball);
-  \node [success, below of=dough_ball, node distance=3cm] (begin_bulk) {Begin bulk fermentation};
+  \path [line] (extract_sample.north east) -- (dough_ball.south west);
+  \node [success, below of=dough_ball] (begin_bulk) {Begin bulk fermentation};
   \path [line] (dough_ball) -- (begin_bulk);
 \end{tikzpicture}
diff --git a/book/figures/fig-proofing-process.tex b/book/figures/fig-proofing-process.tex
index 5204c42..283af1c 100644
--- a/book/figures/fig-proofing-process.tex
+++ b/book/figures/fig-proofing-process.tex
@@ -1,22 +1,20 @@
 \begin{tikzpicture}[node distance = 3cm, auto]
   \node [decision_start] (init) {Room temperature proofing?};
-  \node [decision, right of=init, node distance=9cm] (retard_bake_decision) {Bake in less than  \qty{10}{\hour} from now?};
+  \node [decision, right of=init, node distance=8cm] (retard_bake_decision) {Bake in less than  \qty{10}{\hour} from now?};
   \node [block, below of=init, node distance=4cm] (poke) {Poke the dough};
-  \node [block, right of=poke, node distance=4cm] (wait_poke) {Wait\\ 15~minutes};
-  \node [decision, below of=poke, node distance=3cm] (dent_visible_decision) {Dent still visible after 1~minute?};
+  \node [block, left of=poke] (wait_poke) {Wait\\ 15~minutes};
+  \node [decision, below of=poke] (dent_visible_decision) {Dent still visible after one~minute?};
   \node [success, right of=dent_visible_decision, node distance=4cm] (bake) {Score and bake};
-  \node [block, below of=retard_bake_decision, node distance=3cm] (wait_retard) {Wait\\ 15~minutes};
-  \node [block, below of=wait_retard, node distance=3cm] (retard) {Proof in fridge at  \qty{4}{\degreeCelsius} (\qty{40}{\degF})};
-  \node [block, right of=wait_retard, node distance=3cm] (move_to_fridge) {Move dough directly to fridge};
+  \node [block] at (retard_bake_decision |- poke) (wait_retard) {Wait\\ 15~minutes};
+  \node [block] at (wait_retard |- bake) (retard) {Proof in fridge at \qty{4}{\degreeCelsius} (\qty{40}{\degF})};
   \path [line] (init) -- node{yes} (poke);
   \path [line] (init) -- node{no} (retard_bake_decision);
   \path [line] (poke) -- (dent_visible_decision);
   \path [line] (dent_visible_decision) -- node{yes} (bake);
-  \path [line] (dent_visible_decision) -- node{no} (wait_poke);
+  \path [line] (dent_visible_decision.west) -- node{no} ++(-1.4, 0) -- node{} (wait_poke.south);
   \path [line] (wait_poke) -- (poke);
   \path [line] (retard_bake_decision) -- node{yes} (wait_retard);
-  \path [line] (retard_bake_decision) -- node{no} (move_to_fridge);
+  \path [line] (retard_bake_decision.east) -- node{no} ++(1, 0) |- node{} (retard.east);
   \path [line] (wait_retard) -- (retard);
-  \path [line] (move_to_fridge) -- (retard);
   \path [line] (retard) -- (bake);
 \end{tikzpicture}
diff --git a/book/figures/fig-shaping-process.tex b/book/figures/fig-shaping-process.tex
index 7d1765f..65f9658 100644
--- a/book/figures/fig-shaping-process.tex
+++ b/book/figures/fig-shaping-process.tex
@@ -1,12 +1,12 @@
 \begin{tikzpicture}[node distance = 3cm, auto]
   \node [start] (init) {Begin shaping};
-  \node [decision, right of=init, node distance=5cm] (overfermented_decision) {Dough overly sticky or dough tears?};
+  \node [decision, right of=init, node distance=4cm] (overfermented_decision) {Dough overly sticky or dough tears?};
   \node [block, right of=overfermented_decision, node distance=4cm] (overfermented) {Your dough is likely overfermented};
-  \node [fail, right of=overfermented, node distance=3cm] (loafpan) {Move to loaf pan, short proof, then bake directly};
-  \node [block, below of=init, node distance=4cm] (shaping_technique) {Proceed with shaping technique};
-  \node [block, right of=shaping_technique, node distance=3cm] (flour) {Flour shaped dough};
-  \node [block, right of=flour, node distance=3cm] (banneton) {Place upside down in banneton};
-  \node [success, right of=banneton, node distance=3cm] (proof) {Begin proofing};
+  \node [fail, right of=overfermented, node distance=4cm] (loafpan) {Move to loaf pan, short proof, then bake directly};
+  \node [block, below of=overfermented_decision, node distance=4cm] (shaping_technique) {Proceed with shaping technique};
+  \node [block, right of=shaping_technique] (flour) {Flour shaped dough};
+  \node [block, right of=flour] (banneton) {Place upside down in banneton};
+  \node [success, right of=banneton] (proof) {Begin proofing};
   \path [line] (init) -- (overfermented_decision);
   \path [line] (overfermented_decision) -- node{yes} (overfermented);
   \path [line] (overfermented_decision) -- node{no} (shaping_technique);
diff --git a/book/figures/fig-wheat-sourdough-process.tex b/book/figures/fig-wheat-sourdough-process.tex
index 2ba9161..a549d83 100644
--- a/book/figures/fig-wheat-sourdough-process.tex
+++ b/book/figures/fig-wheat-sourdough-process.tex
@@ -1,14 +1,14 @@
-\begin{tikzpicture}[node distance = 3cm, auto]
+\begin{tikzpicture}[node distance = 3.2cm, auto]
   \node [start] (init) {Ready starter};
-  \node [block, right of=init, node distance=3cm] (mix_ingredients) {Mix ingredients};
-  \node [block, right of=mix_ingredients, node distance=3cm] (dough_strength) {Create dough strength};
-  \node [block, right of=dough_strength, node distance=3cm] (bulk) {Bulk ferment};
-  \node [decision, below of=dough_strength, node distance=3cm] (divide_test) {Making 1 loaf?};
-  \node [block, left of=divide_test, node distance=3cm] (divide) {Divide};
-  \node [block, left of=divide, node distance=3cm] (preshape) {Preshape};
-  \node [block, below of=preshape, node distance=3cm] (shape) {Shape};
-  \node [block, right of=shape, node distance=3cm] (proof) {Proof};
-  \node [success, right of=proof, node distance=3cm] (bake) {Bake};
+  \node [block, right of=init] (mix_ingredients) {Mix ingredients};
+  \node [block, right of=mix_ingredients] (dough_strength) {Create dough strength};
+  \node [block, right of=dough_strength] (bulk) {Bulk ferment};
+  \node [decision, below of=bulk] (divide_test) {Making one loaf?};
+  \node [block, right of=divide_test] (divide) {Divide};
+  \node [block, below of=divide] (preshape) {Preshape};
+  \node [block, below of=divide_test] (shape) {Shape};
+  \node [block, left of=shape] (proof) {Proof};
+  \node [success, left of=proof] (bake) {Bake};
   \path [line] (init) -- (mix_ingredients);
   \path [line] (mix_ingredients) -- (dough_strength);
   \path [line] (dough_strength) -- (bulk);