diff --git a/app/Commands/DeleteAlbumCommand.php b/app/Commands/DeleteAlbumCommand.php
index d8be88aa..da1bacb8 100644
--- a/app/Commands/DeleteAlbumCommand.php
+++ b/app/Commands/DeleteAlbumCommand.php
@@ -21,17 +21,20 @@
 namespace Poniverse\Ponyfm\Commands;
 
 use Poniverse\Ponyfm\Models\Album;
-use Illuminate\Support\Facades\Auth;
+use Auth;
 
 class DeleteAlbumCommand extends CommandBase
 {
+    /** @var int */
     private $_albumId;
+
+    /** @var Album */
     private $_album;
 
     function __construct($albumId)
     {
         $this->_albumId = $albumId;
-        $this->_album = ALbum::find($albumId);
+        $this->_album = Album::find($albumId);
     }
 
     /**
diff --git a/app/Commands/DeletePlaylistCommand.php b/app/Commands/DeletePlaylistCommand.php
index 7f20cdca..9467d554 100644
--- a/app/Commands/DeletePlaylistCommand.php
+++ b/app/Commands/DeletePlaylistCommand.php
@@ -21,11 +21,14 @@
 namespace Poniverse\Ponyfm\Commands;
 
 use Poniverse\Ponyfm\Models\Playlist;
-use Illuminate\Support\Facades\Auth;
+use Auth;
 
 class DeletePlaylistCommand extends CommandBase
 {
+    /** @var int */
     private $_playlistId;
+
+    /** @var Playlist */
     private $_playlist;
 
     function __construct($playlistId)
diff --git a/app/Commands/DeleteTrackCommand.php b/app/Commands/DeleteTrackCommand.php
index ee8ceea2..9fa22835 100644
--- a/app/Commands/DeleteTrackCommand.php
+++ b/app/Commands/DeleteTrackCommand.php
@@ -24,7 +24,10 @@ use Poniverse\Ponyfm\Models\Track;
 
 class DeleteTrackCommand extends CommandBase
 {
+    /** @var int  */
     private $_trackId;
+
+    /** @var Track */
     private $_track;
 
     function __construct($trackId)
diff --git a/public/templates/artists/profile.html b/public/templates/artists/profile.html
index ce5b818d..4efdc9e2 100644
--- a/public/templates/artists/profile.html
+++ b/public/templates/artists/profile.html
@@ -7,6 +7,13 @@
             </div>
         </div>
 
+        <div bo-show="artist.is_archived">
+            <h2>Archived profile</h2>
+            <p>This is an archived artist profile that&#39;s part of the MLP
+                Music Archive. If it&#39;s yours, email
+                <a href="mailto:feld0@pony.fm" target="_blank">feld0@pony.fm</a> to claim it!</p>
+        </div>
+
         <pfm-comments type="user" resource="artist"></pfm-comments>
     </div>
     <div class="span6 cover-image">
diff --git a/resources/assets/scripts/app/controllers/account-albums-edit.coffee b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
index 3683f8b3..364b3e53 100644
--- a/resources/assets/scripts/app/controllers/account-albums-edit.coffee
+++ b/resources/assets/scripts/app/controllers/account-albums-edit.coffee
@@ -113,7 +113,7 @@ angular.module('ponyfm').controller "account-albums-edit", [
             xhr.send formData
 
         $scope.deleteAlbum = () ->
-            $dialog.messageBox('Delete ' + $scope.album.title, 'Are you sure you want to delete "' + $scope.album.title + '"? This cannot be undone.', [
+            $dialog.messageBox('Delete ' + $scope.album.title, 'Are you sure you want to delete "' + $scope.album.title + '"?', [
                 {result: 'ok', label: 'Yes', cssClass: 'btn-danger'}, {result: 'cancel', label: 'No', cssClass: 'btn-primary'}
             ]).open().then (res) ->
                 return if res == 'cancel'
diff --git a/resources/assets/scripts/app/controllers/account-playlists.coffee b/resources/assets/scripts/app/controllers/account-playlists.coffee
index f476128b..f8538652 100644
--- a/resources/assets/scripts/app/controllers/account-playlists.coffee
+++ b/resources/assets/scripts/app/controllers/account-playlists.coffee
@@ -44,7 +44,7 @@ angular.module('ponyfm').controller "account-playlists", [
             playlists.editPlaylist playlist
 
         $scope.deletePlaylist = (playlist) ->
-            $dialog.messageBox('Delete ' + playlist.title, 'Are you sure you want to delete "' + playlist.title + '"? This cannot be undone.', [
+            $dialog.messageBox('Delete ' + playlist.title, 'Are you sure you want to delete "' + playlist.title + '"?', [
                 {result: 'ok', label: 'Yes', cssClass: 'btn-danger'},
                 {result: 'cancel', label: 'No', cssClass: 'btn-primary'}
             ]).open().then (res) ->
diff --git a/resources/assets/scripts/app/controllers/account-track.coffee b/resources/assets/scripts/app/controllers/account-track.coffee
index b6b3c5f3..7ce9a99b 100644
--- a/resources/assets/scripts/app/controllers/account-track.coffee
+++ b/resources/assets/scripts/app/controllers/account-track.coffee
@@ -147,7 +147,7 @@ angular.module('ponyfm').controller "account-track", [
         $scope.touchModel = -> $scope.isDirty = true
 
         $scope.deleteTrack = (track) ->
-            $dialog.messageBox('Delete ' + track.title, 'Are you sure you want to delete "' + track.title + '"? This cannot be undone.', [
+            $dialog.messageBox('Delete ' + track.title, 'Are you sure you want to delete "' + track.title + '"?', [
                 {result: 'ok', label: 'Yes', cssClass: 'btn-danger'}, {result: 'cancel', label: 'No', cssClass: 'btn-primary'}
             ]).open().then (res) ->
                 return if res == 'cancel'
diff --git a/resources/assets/scripts/app/controllers/sidebar.coffee b/resources/assets/scripts/app/controllers/sidebar.coffee
index 0a0643e7..a8b53407 100644
--- a/resources/assets/scripts/app/controllers/sidebar.coffee
+++ b/resources/assets/scripts/app/controllers/sidebar.coffee
@@ -48,7 +48,7 @@ angular.module('ponyfm').controller "sidebar", [
             playlists.editPlaylist playlist
 
         $scope.deletePlaylist = (playlist) ->
-            $dialog.messageBox('Delete ' + playlist.title, 'Are you sure you want to delete "' + playlist.title + '"? This cannot be undone.', [
+            $dialog.messageBox('Delete ' + playlist.title, 'Are you sure you want to delete "' + playlist.title + '"?', [
                 {result: 'ok', label: 'Yes', cssClass: 'btn-danger'},
                 {result: 'cancel', label: 'No', cssClass: 'btn-primary'}
             ]).open().then (res) ->