diff --git a/index.html b/index.html
index 77e082fb..0d058843 100644
--- a/index.html
+++ b/index.html
@@ -46,7 +46,7 @@ if (window.location.host.endsWith('8bitworkshop.com')) {
         <span class="caret"></span>
       </a>
       <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-      <li><a class="dropdown-item" href="#" id="item_new_file">New File...</a></li>
+      <li><a class="dropdown-item" href="#" id="item_new_file">New Project...</a></li>
       <li><a class="dropdown-item" href="#" id="item_upload_file">Upload File...</a></li>
       <!--<li><a class="dropdown-item" href="#" id="item_share_file">Share File as GitHub Gist...</a></li>-->
       <li><a class="dropdown-item" href="#" id="item_reset_file">Revert to Original...</a></li>
diff --git a/src/platform/vcs.ts b/src/platform/vcs.ts
index 77b06256..64c78b4d 100644
--- a/src/platform/vcs.ts
+++ b/src/platform/vcs.ts
@@ -62,8 +62,8 @@ class VCSPlatform {
     // intercept clockPulse function
     Javatari.room.console.oldClockPulse = Javatari.room.console.clockPulse;
     Javatari.room.console.clockPulse = function() {
-      self.updateRecorder();
       this.oldClockPulse();
+      self.updateRecorder();
     }
     this.paused = false;
   }
diff --git a/src/ui.ts b/src/ui.ts
index 39446928..d49a9329 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -899,6 +899,11 @@ function gotoNewLocation() {
   window.location.href = "?" + $.param(qs);
 }
 
+function replaceURLState() {
+  if (platform_id) qs['platform'] = platform_id;
+  history.replaceState({}, "", "?" + $.param(qs));
+}
+
 function showBookLink() {
   if (platform_id == 'vcs')
     $("#booklink_vcs").show();
@@ -936,23 +941,22 @@ function startPlatform() {
   platform = new PLATFORMS[platform_id]($("#emulator")[0]);
   stateRecorder = new StateRecorderImpl(platform);
   PRESETS = platform.getPresets();
-  if (qs['file']) {
-    // start platform and load file
-    platform.start();
-    setupDebugControls();
-    initProject();
-    loadProject(qs['file']);
-    updateSelector();
-    showBookLink();
-    addPageFocusHandlers();
-    return true;
-  } else {
+  if (!qs['file']) {
     // try to load last file (redirect)
     var lastid = localStorage.getItem("__lastid_"+platform_id) || localStorage.getItem("__lastid");
     localStorage.removeItem("__lastid");
-    reloadPresetNamed(lastid || PRESETS[0].id);
-    return false;
+    qs['file'] = lastid || PRESETS[0].id;
+    replaceURLState();
   }
+  // start platform and load file
+  platform.start();
+  setupDebugControls();
+  initProject();
+  loadProject(qs['file']);
+  updateSelector();
+  showBookLink();
+  addPageFocusHandlers();
+  return true;
 }
 
 function loadSharedFile(sharekey : string) {
@@ -966,6 +970,7 @@ function loadSharedFile(sharekey : string) {
     console.log("Fetched " + newid, json);
     platform_id = json['platform'];
     store = createNewPersistentStore(platform_id, () => {
+      // runs after migration, if it happens
       current_project.updateFile(newid, val.files[filename].content);
       reloadPresetNamed(newid);
       delete qs['sharekey'];