diff --git a/tutorial/.cvsignore b/tutorial/.cvsignore
index 12ae4ed113aa9c4b37ca286f5cba561b243258d0..e0223570a8c37b8e092520b777c1e2be994318eb 100644
--- a/tutorial/.cvsignore
+++ b/tutorial/.cvsignore
@@ -1,8 +1,13 @@
+*.files
+*.md
 .nfs*
+Image.wmml
 ___tmp.*
 extra_textflows.mif
 illustration*.gif
 illustration_cache
+man
+tut*.html
 tutorial-foo.wmml
 tutorial.aux
 tutorial.dvi
@@ -11,7 +16,3 @@ tutorial.log
 tutorial.mif
 tutorial.tex
 tutorial_*.html
-tut*.html
-*.md
-*.files
-man
diff --git a/tutorial/.gitignore b/tutorial/.gitignore
index 8af7a5e23ca7a5da9cca6e18f7a818f1c48157e3..417652e73a5ff7548ca661be9eb776b8a1532d7e 100644
--- a/tutorial/.gitignore
+++ b/tutorial/.gitignore
@@ -1,8 +1,13 @@
+/*.files
+/*.md
 /.nfs*
+/Image.wmml
 /___tmp.*
 /extra_textflows.mif
 /illustration*.gif
 /illustration_cache
+/man
+/tut*.html
 /tutorial-foo.wmml
 /tutorial.aux
 /tutorial.dvi
@@ -11,7 +16,3 @@
 /tutorial.mif
 /tutorial.tex
 /tutorial_*.html
-/tut*.html
-/*.md
-/*.files
-/man
diff --git a/tutorial/Makefile b/tutorial/Makefile
index 51645d55942cedf1bf0c7edd5e3241a3e968988a..c7b1771b5171560a2ef1a548d7181c09671d61b7 100644
--- a/tutorial/Makefile
+++ b/tutorial/Makefile
@@ -28,7 +28,7 @@ the_image_module.html: Image.wmml the_image_module.wmml
 	./wmmltohtml2 <the_image_module.wmml html the_image_module
 
 clean:
-	rm *.html illustration_cache illustration*.gif 
+	rm *.html *.md illustration_cache illustration*.gif 
 
 export:
 	tar czvTf tutorial.files tutorial.tar.gz 
diff --git a/tutorial/Wmml.pmod b/tutorial/Wmml.pmod
index 2da5186425ffa371265f17d11ad887e984c0d0ed..dfcaaf948b4185352f4ed3a482ed209b50c812fc 100644
--- a/tutorial/Wmml.pmod
+++ b/tutorial/Wmml.pmod
@@ -1,4 +1,5 @@
 #include "types.h"
+import ".";
 import Sgml;
 
 SGML low_make_concrete_wmml(SGML data);
@@ -929,8 +930,8 @@ string image_to_gif(TAG data, float dpi)
     {
     case "fig":
       werror("Converting ");
-      Process.system("fig2dev -L ps "+params->src+" ___tmp.ps;echo showpage >>___tmp.ps");
-      Process.system("gs -q -sDEVICE=pbmraw -r225 -g2500x2500 -sOutputFile=___tmp.ppm ___tmp.ps </dev/null >/dev/null");
+      Process.system("/bin/sh -c 'fig2dev -L ps "+params->src+" ___tmp.ps;echo showpage >>___tmp.ps'");
+      Process.system("/bin/sh -c 'gs -q -sDEVICE=pbmraw -r225 -g2500x2500 -sOutputFile=___tmp.ppm ___tmp.ps </dev/null >/dev/null'");
       object o=Image.image()->fromppm(Stdio.read_file("___tmp.ppm"))->autocrop()->scale(1.0/3)->rotate(-90);
       o=Image.image(o->xsize()+40, o->ysize()+40, 255,255,255)->paste(o,20,20);
       rm("___tmp.ps");
diff --git a/tutorial/html.pike b/tutorial/html.pike
index 4c180858ade1e253addf707836c46abccaab1b22..6a1baf32206a525803930d73a6a7f67df1b7b0ba 100644
--- a/tutorial/html.pike
+++ b/tutorial/html.pike
@@ -1,4 +1,5 @@
 #include "types.h"
+import ".";
 inherit Stdio.File : out;
 
 SGML html_toc;
@@ -388,10 +389,12 @@ SGML convert(SGML data)
 	    break;
 	
 	 case "ex_identifier":
-	 case "ex_string":
 	 case "ex_commend":
 	    ret+=convert(data->data);
 	    continue;
+	 case "ex_string":
+	    ret+=convert(replace(data->data," "," "));
+	    continue;
 	
 	 case "example": data->tag="blockquote";break;
 	 case "ex_keyword": data->tag="b";break;
diff --git a/tutorial/html_onepage.pike b/tutorial/html_onepage.pike
index 1041d804262421a04eed0c4b936fd25da65732f8..ad5f2bb67dffa02b32e0a4621e4e6ae0bd00e688 100644
--- a/tutorial/html_onepage.pike
+++ b/tutorial/html_onepage.pike
@@ -1,4 +1,5 @@
 #include "types.h"
+import ".";
 inherit "html";
 
 SGML low_split(SGML data) { return data; }
diff --git a/tutorial/wmmltohtml2 b/tutorial/wmmltohtml2
index 36001a313039bf366933e61bc9166ab5c2b1d772..4c24b37bf9d89408bc33b7049a47e5f96034b792 100755
--- a/tutorial/wmmltohtml2
+++ b/tutorial/wmmltohtml2
@@ -1,6 +1,7 @@
 #!/usr/local/bin/pike
 
 import Stdio;
+import ".";
 
 #include "types.h"