diff --git a/app/models/answer.rb b/app/models/answer.rb
index ddce6f7..f44987b 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -44,6 +44,9 @@
   # @return [Answer] the saved, copied answer
   def self.deep_copy(answer)
     answer_copy = answer.dup
+    answer.question_options.each do |opt|
+      answer_copy.question_options << opt
+    end
     answer_copy.save!
     return answer_copy
   end
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 3c922a6..9b1139d 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -6,13 +6,13 @@
   <div class="tabbed-area">
     <ul class="tabs" role="tablist">
       <li id="personal-details-tab" class="active" role="tab" aria-controls="personal-details-panel">
-        <a href="#personal-details-panel" aria-selected="true">Personal Details</a>
+        <a href="#personal-details-panel" aria-selected="true"><%= _('Personal Details') %></a>
       </li>
       <li id="password-details-tab" role="tab" aria-controls="password-details-panel">
-        <a href="#password-details-panel" aria-selected="false">Password</a>
+        <a href="#password-details-panel" aria-selected="false"><%= _('Password') %></a>
       </li>
       <li id="notification-preferences-tab" role="tab" aria-controls="notification-preferences-panel">
-        <a href="#notification-preferences-panel" aria-selected="false">Notification Preferences</a>
+        <a href="#notification-preferences-panel" aria-selected="false"><%= _('Notification Preferences') %></a>
       </li>
     </ul>
     
diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb
index b610abf..1d4dc80 100644
--- a/app/views/guidances/admin_index.html.erb
+++ b/app/views/guidances/admin_index.html.erb
@@ -75,7 +75,7 @@
   <% if @guidances.length > 0 then%>
     <table class="dmp_table tablesorter">
       <thead>
-        <% if @guidances.count > 10 %>
+        <% if @guidances.length > 10 %>
           <tr>
             <td colspan="5" class="td-as-th">
               <%= render(partial: "shared/table_filter", 
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index c3e2f6a..7484fdd 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -10,7 +10,7 @@
           <%= _('Look up your institution here') %>
         </label>
     
-        <% if @orgs.count <= 10 %>
+        <% if @orgs.length <= 10 %>
           <select id="org_name" class="left-indent">
             <option value=""><%= _('Please select one') %></option>
             <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
@@ -34,7 +34,7 @@
                             tooltip: _('Select an institution.'),
                             classes: 'inline left-indent'} %>
 
-        <% if @orgs.count > 10 %>
+        <% if @orgs.length > 10 %>
           <p class="centered left-indent">
             <strong>- <%= _('or') %> -</strong>
             <br />
@@ -49,7 +49,7 @@
   <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
     <div id="org-list">
 			<%
-      increment, cols, letter, total, row = 50, 1, '', @orgs.count, 0
+      increment, cols, letter, total, row = 50, 1, '', @orgs.length, 0
 
       # Determine how many letter separators 
       total += @orgs.collect{|o| o.name[0]}.uniq.count
diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index 8c151f3..7272631 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -48,7 +48,7 @@
       <% active_tab = 'note_tab' %>
       <% end %>
       <li class="note_tab <%= "active" if active_tab == 'note_tab' %>" role="tab" aria-controls="comment-question-area-<%= question.id %>">
-        <% if comments.count > 0 %>
+        <% if comments.length > 0 %>
           <a href="#comment-question-area-<%= question.id %>" id="notes_number_<%= question.id %>" aria-selected="<%= active_tab == 'note_tab' %>"><%= _('Notes') %></a>
         <% else %>
           <a href="#comment-question-area-<%= question.id %>" id="notes_number_<%= question.id %>" aria-selected="<%= active_tab == 'note_tab' %>"><%= _(' Share note') %></a>
diff --git a/test/unit/answer_test.rb b/test/unit/answer_test.rb
index 0f63562..198f9a8 100644
--- a/test/unit/answer_test.rb
+++ b/test/unit/answer_test.rb
@@ -113,6 +113,23 @@
   end
   
   # ---------------------------------------------------
+  test "can copy an Answer" do
+    qf = QuestionFormat.where(option_based: true).first
+    q = @plan.template.questions.select{|q| q.question_format == qf }.first
+    
+    assert_not q.nil?, "expected the test template to have a question of type: #{qf.title}"
+    answr = Answer.create(user: @user, plan: @plan, question: q, question_options: [q.question_options.first])
+    
+    copy = Answer.deep_copy(answr)
+    
+    assert_equal answr.text, copy.text, "expected the answer text to be the same"
+    assert_equal answr.question.id, copy.question.id, "expected the question to be the same"
+    answr.question_options.each do |opt|
+      assert copy.question_options.include?(opt), "expected the copy to have question options"
+    end
+  end
+  
+  # ---------------------------------------------------
   test "can manage belongs_to relationship with User" do
     verify_belongs_to_relationship(@answer, User.last)
   end