diff --git a/server/djrandom/frontend/static/js/djr/djr.js b/server/djrandom/frontend/static/js/djr/djr.js
index e9cef6f3be613d041329f4342701d8e88646f9ab..43551b1cd1d056c3bd1444512582428fdf11a028 100644
--- a/server/djrandom/frontend/static/js/djr/djr.js
+++ b/server/djrandom/frontend/static/js/djr/djr.js
@@ -16,6 +16,15 @@ djr.loading = function(active) {
   }
 };
 
+// Debugging.
+djr.debug = function(msg) {
+  var n_logs = $('#debug p').length;
+  if (n_logs > 7) {
+    $('#debug p:first').remove();
+  }
+  $('#debug').append('<p>' + msg + '</p>');
+};
+
 // Utility functions.
 var CHARS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('');
 djr.generateRandomId = function() {
diff --git a/server/djrandom/frontend/static/js/djr/player.js b/server/djrandom/frontend/static/js/djr/player.js
index 15baf973e33c9d21341e80828ded06708251a55f..f90fdda718f48ded9742c54dd037c1447097c5c0 100644
--- a/server/djrandom/frontend/static/js/djr/player.js
+++ b/server/djrandom/frontend/static/js/djr/player.js
@@ -322,12 +322,29 @@ djr.Player.prototype.streamCurrentPlaylist = function(enable) {
   // Nothing for now.
 };
 
+// An error has occurred in the player. Report it on the javascript
+// console.
+djr.Player.prototype.reportError = function(event) {
+  console.log(event.jPlayer.error);
+  console.log(event.jPlayer.error.type);
+  switch(event.jPlayer.error.type) {
+  case $.jPlayer.error.URL:
+    djr.debug('Error downloading song, skipping...')
+    this.nextSong();
+    break;
+  case $.jPlayer.error.NO_SOLUTION:
+    djr.debug('Error: unexpected error!');
+    break;
+  }  
+};
 
+// Global state (with Player instance).
 djr.state = {
   backend: null,
   player: null
 };
 
+// Initialize the Player and add all our onclick handlers.
 djr.init = function () {
   djr.state.backend = new djr.Backend();
   djr.state.player = new djr.Player(djr.state.backend, '#djr_player');
@@ -443,13 +460,13 @@ djr.init = function () {
     }
   });
 
-  
-
   // Set the album art image to auto-fullscreen on load.
   $('#albumart_fs').load(function() {
     $(this).fullBg();
     $(this).show();
   });
+
+  djr.debug('initialization done.');
 };
 
 // Export the player for quick onclick access
@@ -457,29 +474,5 @@ djr.player = function() {
   return djr.state.player;
 };
 
-// Debugging.
-djr.debug = function(msg) {
-  var n_logs = $('#debug p').length;
-  if (n_logs > 7) {
-    $('#debug p:first').remove();
-  }
-  $('#debug').append('<p>' + msg + '</p>');
-};
-
-// An error has occurred in the player.
-djr.Player.prototype.reportError = function(event) {
-  console.log(event.jPlayer.error);
-  console.log(event.jPlayer.error.type);
-  switch(event.jPlayer.error.type) {
-  case $.jPlayer.error.URL:
-    djr.debug('Error downloading song, skipping...')
-    this.nextSong();
-    break;
-  case $.jPlayer.error.NO_SOLUTION:
-    djr.debug('Error: unexpected error!');
-    break;
-  }  
-};
-
 
 // Fine