diff --git a/examples/wasm/mandelbrot/README.md b/examples/wasm/mandelbrot/README.md
index 9b7f0dda5f..ac84f0efc6 100644
--- a/examples/wasm/mandelbrot/README.md
+++ b/examples/wasm/mandelbrot/README.md
@@ -3,7 +3,7 @@
 ## Using only V
 
 ```
-v run main.v
+v run .
 ```
 
 ## Using Python or Emscripten
diff --git a/examples/wasm/mandelbrot/favicon.ico b/examples/wasm/mandelbrot/favicon.ico
new file mode 100644
index 0000000000..d3f932a47b
Binary files /dev/null and b/examples/wasm/mandelbrot/favicon.ico differ
diff --git a/examples/wasm/mandelbrot/main.v b/examples/wasm/mandelbrot/main.v
deleted file mode 100644
index a3a8988ca7..0000000000
--- a/examples/wasm/mandelbrot/main.v
+++ /dev/null
@@ -1,29 +0,0 @@
-module main
-
-import vweb
-import os
-
-const http_port = 3001
-
-struct App {
-	vweb.Context
-}
-
-fn main() {
-	vweb.run(new_app(), http_port)
-}
-
-fn new_app() &App {
-	mut app := &App{}
-
-	os.execute_or_panic('v -b wasm -os browser mandelbrot.wasm.v')
-
-	app.mount_static_folder_at(os.resource_abs_path('./'), '/')
-	return app
-}
-
-@['/'; get]
-pub fn (mut app App) controller_mandelbrot() !vweb.Result {
-	file := os.read_file('mandelbrot.html') or { panic(err) }
-	return app.html(file)
-}
diff --git a/examples/wasm/mandelbrot/mandelbrot.html b/examples/wasm/mandelbrot/mandelbrot.html
index 5bc8c53d57..2686cde852 100644
--- a/examples/wasm/mandelbrot/mandelbrot.html
+++ b/examples/wasm/mandelbrot/mandelbrot.html
@@ -7,21 +7,24 @@
 		<title>V Mandelbrot WebAssembly Example</title>
 	</head>
 	<body>
+		<p>Below you should see the picture of the Mandelbrot set,
+		<br>calculated in WASM, and shown in a Canvas element.</p>
 		<canvas
 			id="canvas"
-			width="200"
-			height="200"
-			style="width: 100%; height: 100%; image-rendering: crisp-edges"
+			width="400"
+			height="400"
+			style="image-rendering: crisp-edges"
 		></canvas>
 		<script>
 			var canvas = document.getElementById("canvas");
 			var ctx = canvas.getContext("2d");
+			ctx.font = "32px serif";
+			ctx.fillText("Please wait...", 100, 250);
 			var memory;
 
 			function get_string(ptr, len) {
 				const buf = new Uint8Array(memory.buffer, ptr, len);
 				const str = new TextDecoder("utf8").decode(buf);
-
 				return str;
 			}
 
@@ -43,8 +46,9 @@
 			WebAssembly.instantiateStreaming(fetch("mandelbrot.wasm"), {
 				env: env,
 			}).then((res) => {
+				console.log(env.canvas_x())
+				console.log(env.canvas_y())
 				memory = res.instance.exports["memory"];
-
 				console.time("main.main");
 				res.instance.exports["main.main"]();
 				console.timeEnd("main.main");
diff --git a/examples/wasm/mandelbrot/mandelbrot.wasm.v b/examples/wasm/mandelbrot/mandelbrot.wasm.v
index 81f64be0f3..3390e2788e 100644
--- a/examples/wasm/mandelbrot/mandelbrot.wasm.v
+++ b/examples/wasm/mandelbrot/mandelbrot.wasm.v
@@ -4,10 +4,12 @@ fn JS.setpixel(x int, y int, c f64)
 
 // `main` must be public!
 pub fn main() {
+	println('starting main.main...')
+
 	max_x := JS.canvas_x()
 	max_y := JS.canvas_y()
-
-	println('starting main.main!')
+	middle_x := max_x / 2
+	middle_y := max_y / 2
 
 	mut y := 0
 	for y < max_y {
@@ -16,8 +18,8 @@ pub fn main() {
 		for x < max_x {
 			x += 1
 
-			e := (f64(y) / 50) - 1.5
-			f := (f64(x) / 50) - 1.0
+			e := (f64(y) / middle_y) - 1.5
+			f := (f64(x) / middle_x) - 1.0
 
 			mut a := 0.0
 			mut b := 0.0
@@ -36,6 +38,6 @@ pub fn main() {
 			JS.setpixel(x, y, c)
 		}
 	}
-
-	panic('reached the end!')
+	// TODO: remove the need for panic here:
+	panic('reached the end of main.main')
 }
diff --git a/examples/wasm/mandelbrot/serve_folder.v b/examples/wasm/mandelbrot/serve_folder.v
new file mode 100644
index 0000000000..d7a59981e4
--- /dev/null
+++ b/examples/wasm/mandelbrot/serve_folder.v
@@ -0,0 +1,22 @@
+module main
+
+import vweb
+import os
+
+struct App {
+	vweb.Context
+}
+
+fn main() {
+	os.chdir(os.dir(@FILE))!
+	cmd := '${os.quoted_path(@VEXE)} -b wasm -os browser mandelbrot.wasm.v'
+	println('>> compiling mandelbrot.wasm.v, using: ${cmd}')
+	os.execute_or_panic(cmd)
+	mut app := App{}
+	app.mount_static_folder_at(os.resource_abs_path('.'), '/')
+	vweb.run(app, 3001)
+}
+
+pub fn (mut app App) index() vweb.Result {
+	return app.html(os.read_file('mandelbrot.html') or { '' })
+}
