diff --git a/apps/agenda/metadata.json b/apps/agenda/metadata.json
index 0a9f6e44f..0b8ffaded 100644
--- a/apps/agenda/metadata.json
+++ b/apps/agenda/metadata.json
@@ -1,10 +1,10 @@
 {
   "id": "agenda",
   "name": "Agenda",
-  "version": "2.01",
+  "version": "0.01",
   "description": "Simple agenda",
   "icon": "agenda.png",
-  "screenshots": [{"url":"screenshot_agenda.png"}],
+  "screenshots": [{"url":"screenshot_agenda_overview.png"}, {"url":"screenshot_agenda_event1.png"}, {"url":"screenshot_agenda_event2.png"}],
   "tags": "agenda",
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
diff --git a/apps/agenda/screenshot_agenda.png b/apps/agenda/screenshot_agenda.png
deleted file mode 100644
index 7ef5986d4..000000000
Binary files a/apps/agenda/screenshot_agenda.png and /dev/null differ
diff --git a/apps/agenda/screenshot_agenda_event1.png b/apps/agenda/screenshot_agenda_event1.png
new file mode 100644
index 000000000..581da286b
Binary files /dev/null and b/apps/agenda/screenshot_agenda_event1.png differ
diff --git a/apps/agenda/screenshot_agenda_event2.png b/apps/agenda/screenshot_agenda_event2.png
new file mode 100644
index 000000000..f5edcaae8
Binary files /dev/null and b/apps/agenda/screenshot_agenda_event2.png differ
diff --git a/apps/agenda/screenshot_agenda_overview.png b/apps/agenda/screenshot_agenda_overview.png
new file mode 100644
index 000000000..a2030d05f
Binary files /dev/null and b/apps/agenda/screenshot_agenda_overview.png differ
diff --git a/apps/android/boot.js b/apps/android/boot.js
index df21a5521..0c7dd04b5 100644
--- a/apps/android/boot.js
+++ b/apps/android/boot.js
@@ -92,12 +92,15 @@
       },
       //TODO perhaps move those in a library (like messages), used also for viewing events?
       "calendar" : function() {
-        var cal = require("Storage").readJSON("android.calendar.json",true)||[];
+        var cal = require("Storage").readJSON("android.calendar.json",true);
+        if (!cal || !Array.isArray(cal)) cal = [];
         cal.push(event);
         require("Storage").writeJSON("android.calendar.json", cal);
       },
       "calendar-" : function() {
-        var cal = require("Storage").readJSON("android.calendar.json",true)||return;
+        var cal = require("Storage").readJSON("android.calendar.json",true);
+        //if any of those happen we are out of sync!
+        if (!cal || !Array.isArray(cal)) return;
         cal = cal.filter(e=>e.id!=event.id);
         require("Storage").writeJSON("android.calendar.json", cal);
       }
diff --git a/apps/android/metadata.json b/apps/android/metadata.json
index c8e404aba..27b77cf2f 100644
--- a/apps/android/metadata.json
+++ b/apps/android/metadata.json
@@ -2,7 +2,7 @@
   "id": "android",
   "name": "Android Integration",
   "shortName": "Android",
-  "version": "0.10",
+  "version": "0.11",
   "description": "Display notifications/music/etc sent from the Gadgetbridge app on Android. This replaces the old 'Gadgetbridge' Bangle.js widget.",
   "icon": "app.png",
   "tags": "tool,system,messages,notifications,gadgetbridge",