diff --git a/lib/discourse_dev/post.rb b/lib/discourse_dev/post.rb
index 51a5c41..74d9bb8 100644
--- a/lib/discourse_dev/post.rb
+++ b/lib/discourse_dev/post.rb
@@ -63,8 +63,7 @@ def user
     def populate!
       generate_likes(topic.first_post)
 
-      @count.times do |i|
-        @index = i
+      @count.times do
         create!
       end
     end
@@ -86,7 +85,6 @@ def self.add_replies!(args)
       puts "Creating #{count} replies in '#{topic.title}'"
 
       count.times do |i|
-        @index = i
         begin
           user = User.random
           reply = Faker::DiscourseMarkdown.with_user(user.id) do
diff --git a/lib/discourse_dev/record.rb b/lib/discourse_dev/record.rb
index 0ab994a..b6196ae 100644
--- a/lib/discourse_dev/record.rb
+++ b/lib/discourse_dev/record.rb
@@ -20,7 +20,6 @@ def initialize(model, count = DEFAULT_COUNT)
       @model = model
       @type = model.to_s
       @count = count
-      @index = nil
     end
 
     def create!
@@ -30,7 +29,7 @@ def create!
 
     def populate!
       if current_count >= @count
-        puts "Already have #{@count}+ #{type.downcase} records."
+        puts "Already have #{current_count} #{type.downcase} records"
 
         Rake.application.top_level_tasks.each do |task_name|
           Rake::Task[task_name].reenable
@@ -38,12 +37,14 @@ def populate!
 
         Rake::Task['dev:repopulate'].invoke
         return
+      elsif current_count > 0
+        @count -= current_count
+        puts "There are #{current_count} #{type.downcase} records. Creating #{@count} more."
+      else
+        puts "Creating #{@count} sample #{type.downcase} records"
       end
 
-      puts "Creating #{@count} sample #{type.downcase} records"
-
-      @count.times do |i|
-        @index = i
+      @count.times do
         create!
         putc "."
       end
@@ -51,10 +52,6 @@ def populate!
       puts
     end
 
-    def index
-      @index
-    end
-
     def current_count
       model.count
     end
diff --git a/lib/discourse_dev/tasks/dev.rake b/lib/discourse_dev/tasks/dev.rake
index faddf02..fa6e2f8 100644
--- a/lib/discourse_dev/tasks/dev.rake
+++ b/lib/discourse_dev/tasks/dev.rake
@@ -42,6 +42,6 @@ task 'dev:repopulate' => ['db:load_config'] do |_, args|
   if (answer == "" || answer.downcase == 'y')
     Rake::Task['dev:reset'].invoke
   else
-    puts "You can run `dev:reset` rake task to do this repopulate action anytime."
+    puts "You can run `bin/rails dev:reset` to repopulate anytime."
   end
 end
diff --git a/lib/discourse_dev/topic.rb b/lib/discourse_dev/topic.rb
index da2e492..51ff47d 100644
--- a/lib/discourse_dev/topic.rb
+++ b/lib/discourse_dev/topic.rb
@@ -45,7 +45,7 @@ def data
     end
 
     def title
-      if index < I18n.t("faker.discourse.topics").count
+      if current_count < I18n.t("faker.discourse.topics").count
         Faker::Discourse.unique.topic
       else
         Faker::Lorem.unique.sentence(word_count: 5, supplemental: true, random_words_to_add: 4).chomp(".")