diff --git a/xulmus/content/player.js b/xulmus/content/player.js
index a65e644b..52656a4c 100755
--- a/xulmus/content/player.js
+++ b/xulmus/content/player.js
@@ -193,41 +193,25 @@ function Player() // {{{
          function () { player.decreaseVolume(); });
 
     mappings.add([modes.PLAYER],
-         ["/"], "Search View",
+         ["/"], "Search forward for a track",
          function (args) { commandline.open("/", "", modes.SEARCH_VIEW_FORWARD); });
 
     mappings.add([modes.PLAYER],
-         ["n"], "Find Next",
+         ["n"], "Find the next track",
          function () { player.searchViewAgain(false);});
 
     mappings.add([modes.PLAYER],
-         ["N"], "Find Previous",
+         ["N"], "Find the previous track",
          function () { player.searchViewAgain(true);});
 
-    //FIXME: Better way to do this ? --ken
-    mappings.add([modes.PLAYER],
-         ["<C-0>"], "Rate the current media item 0",
-         function () { player.rateMediaItem(0); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-1>"], "Rate the current media item 1",
-         function () { player.rateMediaItem(1); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-2>"], "Rate the current media item 2",
-         function () { player.rateMediaItem(2); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-3>"], "Rate the current media item 3",
-         function () { player.rateMediaItem(3); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-4>"], "Rate the current media item 4",
-         function () { player.rateMediaItem(4); });
-
-    mappings.add([modes.PLAYER],
-         ["<C-5>"], "Rate the current media item 5",
-         function () { player.rateMediaItem(5); });
+    for (let i in util.range(0, 6))
+    {
+        let (rating = i) {
+            mappings.add([modes.PLAYER],
+                 ["<C-" + rating + ">"], "Rate the current media item " + rating,
+                 function () { player.rateMediaItem(rating); });
+        }
+    }
 
     ////////////////// ///////////////////////////////////////////////////////////}}}
     ////////////////////// COMMANDS ////////////////////////////////////////////////
@@ -627,7 +611,7 @@ function Player() // {{{
             }
             else
             {
-                if (lastSearchIndex == (lastSearchView.length -1))
+                if (lastSearchIndex == (lastSearchView.length - 1))
                 {
                     //commandline.echo("Search hit BOTTOM, continuing at TOP",
                     //      commandline.HL_WARNINGMSG, commandline.APPEND_TO_MESSAGES | commandline.FORCE_SINGLELINE);
diff --git a/xulmus/locale/en-US/index.txt b/xulmus/locale/en-US/index.txt
index ce56d602..c7fabf5b 100755
--- a/xulmus/locale/en-US/index.txt
+++ b/xulmus/locale/en-US/index.txt
@@ -23,6 +23,19 @@ section:Player{nbsp}mode[player-index]
 ||[m]+[m]|| Increase volume by 10% +
 ||[m]-[m]|| Decrease volume by 10% +
 
+||[m]/[m]|| Search forward for a track +
+//||[m]?[m]|| Search backward for a track +
+||[m]n[m]|| Find the next track +
+||[m]N[m]|| Find the previous track +
+
+// TODO: better formatting
+||<C-0>|| Rate the current track with 0 stars +
+||<C-1>|| Rate the current track with 1 stars +
+||<C-2>|| Rate the current track with 2 stars +
+||<C-3>|| Rate the current track with 3 stars +
+||<C-4>|| Rate the current track with 4 stars +
+||<C-5>|| Rate the current track with 5 stars +
+
 section:Insert{nbsp}mode[insert-index]
 
 ||[m]<C-i>[m]|| Launch the external editor +
diff --git a/xulmus/locale/en-US/player.txt b/xulmus/locale/en-US/player.txt
index f12fafe6..55a8039e 100644
--- a/xulmus/locale/en-US/player.txt
+++ b/xulmus/locale/en-US/player.txt
@@ -178,21 +178,40 @@ section:Search{nbsp}commands[search]
 |/|
 ||/{pattern}<CR>|| +
 ________________________________________________________________________________
-Search for the first occurrence of {pattern} in the visible media view.
+Search forward for a track matching {pattern} in the visible media view.
 ________________________________________________________________________________
 
+//|?|
+//||?{pattern}<CR>|| +
+//________________________________________________________________________________
+//Search backwards for a track matching {pattern} in the visible media view.
+//________________________________________________________________________________
+
 |n|
 ||n|| +
 ________________________________________________________________________________
-Find next. Repeats the last search. If the search hits BOTTOM of the view, it
-continues from TOP.
+Find the next track. Repeats the last search. If the search hits BOTTOM of the
+view, it continues from TOP.
 ________________________________________________________________________________
 
 |N|
 ||N|| +
 ________________________________________________________________________________
-Find previous. Repeats the last search in the opposite direction. If the search
-hits TOP of the view, it continues from BOTTTOM.
+Find the previous track. Repeats the last search in the opposite direction. If
+the search hits TOP of the view, it continues from BOTTTOM.
+________________________________________________________________________________
+
+section:Rating{nbsp}track[rating]
+
+|<C-5>| |<C-4>| |<C-3>| |<C-2>| |<C-1>| |<C-0>|
+||<C-0>|| +
+||<C-1>|| +
+||<C-2>|| +
+||<C-3>|| +
+||<C-4>|| +
+||<C-5>|| +
+________________________________________________________________________________
+Rate the current track with N stars.
 ________________________________________________________________________________
 
 // vim: set filetype=asciidoc: