diff --git a/js/comms.js b/js/comms.js
index f119985..cad0d24 100644
--- a/js/comms.js
+++ b/js/comms.js
@@ -323,7 +323,9 @@ const Comms = {
         // Start the upload
         function doUpload() {
           Progress.show({min:0.05, max:0.10}); // 5-10% for progress writing
-          Comms.showMessage(`Installing\n${app.id}...`).
+          console.log(JSON.stringify(app));
+          let msg = app.id=="fwupdate"?`Downloading\nfirmware...`:`Installing\n'${app.name}'...`
+          Comms.showMessage(msg).
             then(() => Comms.write("\x10"+Comms.getProgressCmd()+"\n", {noWait:true})).
             then(() => {
               doUploadFiles();
@@ -507,8 +509,8 @@ const Comms = {
     /* App Info now doesn't contain .files, so to erase, we need to
     read the info file ourselves. */
     return (options.noReset ? Promise.resolve() : Comms.reset()).
-      then(()=>Comms.showMessage(`Erasing\n${app.id}...`)).
       then(()=>options.containsFileList ? app : Comms.getAppInfo(app)).
+      then(app=>Comms.showMessage(`Uninstalling\n'${app.name}'...`).then(()=>app)).
       then(app=>{
         let cmds = '';
         // remove App files: regular files, exact names only
diff --git a/js/utils.js b/js/utils.js
index 557cc1d..3ced064 100644
--- a/js/utils.js
+++ b/js/utils.js
@@ -59,13 +59,19 @@ let DEVICEINFO = [
     name : "Bangle.js 1",
     features : ["BLE","BLEHID","GRAPHICS","ACCEL","MAG"],
     g : { width : 240, height : 240, bpp : 16 },
-    img : "https://www.espruino.com/img/BANGLEJS_thumb.jpg"
+    img : "https://www.espruino.com/img/BANGLEJS_thumb.jpg",
+    link : "https://www.espruino.com/Bangle.js",
+    emulatorURL : "/emu/emu_banglejs1.html",
+    emulatorWin : "innerWidth=290,innerHeight=268,location=0"
   }, {
     id : "BANGLEJS2",
     name : "Bangle.js 2",
     features : ["BLE","BLEHID","GRAPHICS","ACCEL","MAG","PRESSURE","TOUCH"],
     g : { width : 176, height : 176, bpp : 3 },
-    img : "https://www.espruino.com/img/BANGLEJS2_thumb.jpg"
+    img : "https://www.espruino.com/img/BANGLEJS2_thumb.jpg",
+    link : "https://www.espruino.com/Bangle.js2",
+    emulatorURL : "/emu/emu_banglejs2.html",
+    emulatorWin : "innerWidth=290,innerHeight=268,location=0"
   }, {
     id : "PUCKJS",
     name : "Puck.js",
@@ -114,6 +120,19 @@ let DEVICEINFO = [
     img : "https://www.espruino.com/img/ESP32_thumb.jpg"
   }
 ];
+if ((typeof window !== "undefined") && window.localStorage.getItem("BANGLEJS3")) {
+  // type window.localStorage.setItem("BANGLEJS3",true) to enable this for testing
+  DEVICEINFO.push({
+    id : "BANGLEJS3",
+    name : "Bangle.js 3",
+    features : ["BLE","BLEHID","GRAPHICS","ACCEL","MAG","PRESSURE","TOUCH"],
+    g : { width : 240, height : 240, bpp : 6 },
+    img : "https://www.espruino.com/img/BANGLEJS3_thumb.jpg",
+    link : "https://www.espruino.com/Bangle.js3",
+    emulatorURL : "/emu/emu_banglejs3.html",
+    emulatorWin : "innerWidth=290,innerHeight=268,location=0"
+  });
+}
 
 /* When a char is not in Espruino's iso8859-1 codepage, try and use
 these conversions */
@@ -360,8 +379,8 @@ function getVersionInfo(appListing, appInstalled) {
   let canUpdate = false;
   function clicky(v) {
     if (appInstalled)
-      return `<a class="c-hand" onclick="showChangeLog('${appListing.id}', '${appInstalled.version}')">${v}</a>`;
-    return `<a class="c-hand" onclick="showChangeLog('${appListing.id}')">${v}</a>`;
+      return `<a class="c-hand" onclick="showAppInfo('${appListing.id}', '${appInstalled.version}')">${v}</a>`;
+    return `<a class="c-hand" onclick="showAppInfo('${appListing.id}')">${v}</a>`;
   }
 
   if (!appInstalled) {