diff --git a/modules/poll/commands.js b/modules/poll/commands.js
index bcd8530..ac36252 100644
--- a/modules/poll/commands.js
+++ b/modules/poll/commands.js
@@ -98,7 +98,7 @@ var commands = function(dbot) {
             if(_.has(polls, name)) {
                 if(_.has(polls[name].votes, vote)) {
                     if(_.has(polls[name].votees, user)) {
-                        var oldVote = polls[name].votees[event.user];
+                        var oldVote = polls[name].votees[user];
                         polls[name].votes[oldVote]--;
                         polls[name].votes[vote]++;
                         polls[name].votees[user] = vote;
@@ -131,6 +131,13 @@ var commands = function(dbot) {
             var name = event.input[1].toLowerCase();
 
             if(_.has(polls, name)) {
+                var options = _.keys(polls[name].votes);
+                var optionString = " Choices: ";
+                for(var i=0;i<options.length;i++) {
+                    optionString += options[i] + ', ';
+                }
+                optionString = optionString.slice(0, -2) + '.';
+
                 event.reply(dbot.t('poll_describe', {
                     'name': name, 
                     'description': polls[name].description,
@@ -139,7 +146,7 @@ var commands = function(dbot) {
                         'port': dbot.config.web.webPort, 
                         'path': 'polls/' + name
                     })
-                }));
+                }) + optionString);
             } else {
                 event.reply(dbot.t('poll_unexistent', { 'name': name }));
             }
diff --git a/modules/poll/strings.json b/modules/poll/strings.json
index 459ea98..412c3ec 100644
--- a/modules/poll/strings.json
+++ b/modules/poll/strings.json
@@ -17,7 +17,7 @@
         "na'vi": "sìpawm sna'o '{name}' ngìyop ({description}). Nga tìpe'unit Pe'eiun - {url}"
     },
     "poll_describe": {
-        "english": "{name}: {description} - {url}"
+        "english": "{name}: {description} - {url}."
     },
     "changed_vote": {
         "english": "{user} changed their vote in {poll} to '{vote}' ({count}).",