diff --git a/brewery/gfwtr.raw b/brewery/gfwtr.raw
index f75318b..bf73c8a 100644
Binary files a/brewery/gfwtr.raw and b/brewery/gfwtr.raw differ
diff --git a/brewery/gfwtr.txt b/brewery/gfwtr.txt
index 934256a..013aa28 100644
--- a/brewery/gfwtr.txt
+++ b/brewery/gfwtr.txt
@@ -1,24 +1,44 @@
-LBL "GFWtr"
-INPUT "Asslg l"
-INPUT "Malz kg"
-2.7
-×
-3.5
-+
-STO 01
-RCL "Asslg l"
-5
-+
-RCL 01
--
-RCL "Malz kg"
-0.8
-×
-+
-STO 02
-"H Guss: "
-ARCL 01
-├"[LF]N Guss: "
-ARCL 02
-AVIEW
-END
+00 { 189-Byte Prgm }
+01▸LBL "GFWtr"
+02 ADV
+03 "---GF Wasser---"
+04 PRA
+05 CLA
+06 DATE
+07 ADATE
+08 ├" "
+09 TIME
+10 ATIME24
+11 PRA
+12 CLA
+13 DROPN 2
+14 INPUT "Asslg l"
+15 INPUT "Malz kg"
+16 2,7
+17 ×
+18 3,5
+19 +
+20 STO 01
+21 RCL "Asslg l"
+22 5
+23 +
+24 RCL 01
+25 -
+26 RCL "Malz kg"
+27 0,8
+28 ×
+29 +
+30 STO 02
+31 "Ausschlag= "
+32 ARCL "Asslg l"
+33 ├" l[LF]Malz= "
+34 ARCL "Malz kg"
+35 ├" kg"
+36 PRA
+37 "Hauptguss= "
+38 ARCL 01
+39 ├" l[LF]Nachguss= "
+40 ARCL 02
+41 ├" l"
+42 AVIEW
+43 .END.
diff --git a/diving/mod.raw b/diving/mod.raw
index 8a9f0b7..8e2fa33 100644
Binary files a/diving/mod.raw and b/diving/mod.raw differ
diff --git a/diving/mod.txt b/diving/mod.txt
index 68189b0..7d40c7d 100644
--- a/diving/mod.txt
+++ b/diving/mod.txt
@@ -1,24 +1,45 @@
-LBL "MOD"
-100
-÷
-STO 01
-1.4
-RCL 01
-÷
-1
--
-10
-×
-"MOD1,4= "
-ARCL ST X
-1.6
-RCL 01
-÷
-1
--
-10
-×
-├"[LF]MOD1,6= "
-ARCL ST X
-AVIEW
-END
+00 { 140-Byte Prgm }
+01▸LBL "MOD"
+02 ADV
+03 "----- Nitrox MO"
+04 ├"D -----"
+05 PRA
+06 CLA
+07 DATE
+08 ADATE
+09 TIME
+10 ├" "
+11 ATIME24
+12 PRA
+13 CLA
+14 DROPN 2
+15 ├"[LF]EAN= "
+16 "EAN= "
+17 ARCL ST X
+18 ├" %"
+19 PRA
+20 100
+21 ÷
+22 STO 01
+23 1,4
+24 RCL 01
+25 ÷
+26 1
+27 -
+28 10
+29 ×
+30 "MOD1,4= "
+31 ARCL ST X
+32 ├" m"
+33 1,6
+34 RCL 01
+35 ÷
+36 1
+37 -
+38 10
+39 ×
+40 ├"[LF]MOD1,6= "
+41 ARCL ST X
+42 ├" m"
+43 AVIEW
+44 END