diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index 248dad1..05b24ed 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -89,14 +89,14 @@ class QuestionsController < InheritedResources::Base
     @question = Question.find(params[:id])
 
     outfile = "question_#{@question.id}_votes" + Time.now.strftime("%m-%d-%Y") + ".csv"
-    headers = ['Vote ID', 'Voter ID', 'Choice Voted on ID', 'Choice Voted on Data', 'Question ID', 'Created at', 'Updated at']
+    headers = ['Vote ID', 'Voter ID', 'Question ID','Choice Voted on ID', 'Choice Voted on Data', 'Loser Choice ID',
+	    	'Prompt ID', 'Created at', 'Updated at']
+    @votes = @question.votes
     csv_data = FasterCSV.generate do |csv|
        csv << headers	
-       @question.choices.each do |choice|
-	       
-	       choice.votes.each do |v|
-	       csv << [ v.id, v.voter_id, choice.id, choice.data, @question.id, v.created_at, v.updated_at] 
-	       end
+       @votes.each do |v|
+	       csv << [ v.id, v.voter_id, v.question_id, v.choice_id, v.choice.data, v.loser_choice_id,
+		       v.prompt_id, v.created_at, v.updated_at] 
        end
     end
 
diff --git a/app/models/visitor.rb b/app/models/visitor.rb
index e0c2438..6b33dd9 100644
--- a/app/models/visitor.rb
+++ b/app/models/visitor.rb
@@ -30,7 +30,7 @@ class Visitor < ActiveRecord::Base
     other_choices.each {|c| c.lose! }
     
     loser_choice = other_choices.first
-    votes.create!(:question_id => prompt.question_id, :prompt_id => prompt_id, :voter_id=> self.id, :choice_id => choice.id, :loser_id => loser_choice.id)
+    votes.create!(:question_id => prompt.question_id, :prompt_id => prompt.id, :voter_id=> self.id, :choice_id => choice.id, :loser_choice_id => loser_choice.id)
     
 #    choice_vote = votes.create!(:voteable => choice)
     # logger.info "Visitor: voted for Prompt: #{prompt.id.to_s} for choice #{choice.item.data}"
--
libgit2 0.21.2