diff --git a/html/src/app.js b/html/src/app.js
index 3870b3d9..8a35dd1f 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -4563,7 +4563,7 @@ speechSynthesis.getVoices();
                 this.speak(`${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`);
                 break;
             case 'invite':
-                this.speak(`${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`);
+                this.speak(`${noty.senderUsername} has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`);
                 break;
             case 'requestInvite':
                 this.speak(`${noty.senderUsername} has requested an invite${message}`);
@@ -4640,7 +4640,7 @@ speechSynthesis.getVoices();
                 AppApi.XSNotification('VRCX', `${noty.displayName} status is now ${noty.status} ${noty.statusDescription}`, timeout, image);
                 break;
             case 'invite':
-                AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${noty.details.worldName}${message}`, timeout, image);
+                AppApi.XSNotification('VRCX', `${noty.senderUsername} has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`, timeout, image);
                 break;
             case 'requestInvite':
                 AppApi.XSNotification('VRCX', `${noty.senderUsername} has requested an invite${message}`, timeout, image);
@@ -4716,7 +4716,7 @@ speechSynthesis.getVoices();
                 AppApi.DesktopNotification(noty.displayName, `status is now ${noty.status} ${noty.statusDescription}`, image);
                 break;
             case 'invite':
-                AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${noty.details.worldName}${message}`, image);
+                AppApi.DesktopNotification(noty.senderUsername, `has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`, image);
                 break;
             case 'requestInvite':
                 AppApi.DesktopNotification(noty.senderUsername, `has requested an invite${message}`, image);
@@ -5969,12 +5969,15 @@ speechSynthesis.getVoices();
             } else if (user.userId) {
                 id = user.userId;
             }
-            if ((!user.isFriend) && (id) && (id !== API.currentUser.id)) {
+            if ((id) && (id === API.currentUser.id)) {
+                return this.statusClass(user.status);
+            }
+            if (!user.isFriend) {
                 return;
             }
             //temp fix
             if ((user.status !== 'active') && (user.location === 'private') && (user.state === '') &&
-                (id) && (id !== API.currentUser.id) &&
+                (id) &&
                 (!API.currentUser.onlineFriends.includes(id))) {
                 if (API.currentUser.activeFriends.includes(id)) {
                     // Active
@@ -12729,7 +12732,7 @@ speechSynthesis.getVoices();
                 return;
             case -11:
                 this.$message({
-                    message: 'VRChat can\'t be located',
+                    message: 'Delete \'data.unity3d\' file from AssetBundleCacher_Data folder',
                     type: 'error'
                 });
                 this.downloadCurrent = {};
diff --git a/html/src/vr.js b/html/src/vr.js
index 8337264d..01c9e8de 100644
--- a/html/src/vr.js
+++ b/html/src/vr.js
@@ -877,18 +877,21 @@ speechSynthesis.getVoices();
         }
         var bias = new Date(Date.now() - 60000).toJSON();
         var noty = {};
-        var messageList = [ 'inviteMessage', 'requestMessage', 'responseMessage' ];
+        var messageList = ['inviteMessage', 'requestMessage', 'responseMessage'];
         for (var i = 0; i < notyToPlay.length; i++) {
             noty = notyToPlay[i];
             if (noty.created_at < bias) {
                 continue;
             }
             var message = '';
-            for (i = 0; i < messageList.length; i++) {
-                if (typeof noty.details !== 'undefined' && typeof noty.details[messageList[i]] !== 'undefined') {
-                    message = noty.details[messageList[i]];
+            for (var k = 0; k < messageList.length; k++) {
+                if (typeof noty.details !== 'undefined' && typeof noty.details[messageList[k]] !== 'undefined') {
+                    message = noty.details[messageList[k]];
                 }
             }
+            if (message) {
+                message = `, ${message}`;
+            }
             if ((this.config.overlayNotifications) && (!this.isGameNoVR) && (this.isGameRunning)) {
                 var text = '';
                 switch (noty.type) {
@@ -914,7 +917,7 @@ speechSynthesis.getVoices();
                         text = `<strong>${noty.displayName}</strong> status is now <i>${noty.status}</i> ${noty.statusDescription}`;
                         break;
                     case 'invite':
-                        text = `<strong>${noty.senderUsername}</strong> has invited you to ${noty.details.worldName} ${message}`;
+                        text = `<strong>${noty.senderUsername}</strong> has invited you to ${this.displayLocation(noty.details.worldId, noty.details.worldName)}${message}`;
                         break;
                     case 'requestInvite':
                         text = `<strong>${noty.senderUsername}</strong> has requested an invite ${message}`;