diff --git a/sites/en/installfest/create_a_rails_app.step b/sites/en/installfest/create_a_rails_app.step
index 642db0aa1..7e40e891f 100755
--- a/sites/en/installfest/create_a_rails_app.step
+++ b/sites/en/installfest/create_a_rails_app.step
@@ -24,21 +24,29 @@ step "Create a new Rails app" do
 
   message "The command's output is voluminous, and will take some time to complete, with a long pause in the middle, after all the 'create...' statements ending in 'bundle install'.  When it fully completes, it will return you to your home prompt.  Look for the 'Bundle complete!' message just above."
 
-  message "**The command above may fail with an error about sqlite.** If that's the case follow the following instructions to fix the problem. If not, scroll down to the next step."
+  tip "**The command above may fail with an error about sqlite.** If that's the case follow the instructions below to fix the problem. If not, scroll down to the next step."
 
   message "Open the file `Gemfile` in an editor (In the InstallFest yesterday, we suggested that you install and use **Atom** as your editor)."
 
-  message "Look for the line `gem 'sqlite3'` (line 9)"
+  message "Look for the line"
+  message "`gem 'sqlite3'` (line 9)"
 
-  message "Update that line to say `gem 'sqlite3', '~>1.3.6'`"
+  message "Update that line to say"
 
-  message "If you are on Windows you may need to instead make the line say `gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'`"
+  message "`gem 'sqlite3', '~>1.3.6'`"
 
-  message "In your console, make sure that you're in the `suggestotron` folder. You can type `pwd` (**p**rint **w**orking **d**irectory) in the terminal to see what folder you are in."
+  message "In your console, make sure that you're in the `test_app` folder. You can type `pwd` (**p**rint **w**orking **d**irectory) in the terminal to see what folder you are in."
+
+  message "If you are not in the test_app folder, you can:"
+  console "cd test_app"
 
   console "bundle update"
 
-  console "cd test_app"
+  tip "If you are on Windows and the command above failed, you may need to instead make the line say:"
+  message "`gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'`"
+  console "bundle update"
+
+  
   console "rails server"
 
   tip "In OS X, you may need to let Ruby accept incoming network connections through your firewall.  Select 'allow' in the pop up."
diff --git a/sites/en/installfest/deploy_a_rails_app.step b/sites/en/installfest/deploy_a_rails_app.step
index 0de03a9ed..10d162ff4 100644
--- a/sites/en/installfest/deploy_a_rails_app.step
+++ b/sites/en/installfest/deploy_a_rails_app.step
@@ -61,14 +61,32 @@ step "Deploy your app to Heroku" do
       Inside this file, change the line:
     MARKDOWN
     source_code :ruby, <<-RUBY
-      gem 'sqlite3'
+      gem 'sqlite3', '~>1.3.6'
     RUBY
 
     message "To this:"
 
     source_code :ruby, <<-RUBY
       group :development, :test do
-        gem 'sqlite3'
+        gem 'sqlite3', '~>1.3.6'
+      end
+
+      group :production do
+        gem 'pg', '~> 0.18'
+      end
+    RUBY
+
+    tip "On Windows the line may look like this"
+
+    source_code :ruby, <<-RUBY
+      gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'
+    RUBY
+
+    message "If that's the case, then your new lines should be:"
+
+    source_code :ruby, <<-RUBY
+      group :development, :test do
+        gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'
       end
 
       group :production do
diff --git a/sites/en/installfest/get_a_sticker.step b/sites/en/installfest/get_a_sticker.step
index 7f7c77edd..cc4071f52 100644
--- a/sites/en/installfest/get_a_sticker.step
+++ b/sites/en/installfest/get_a_sticker.step
@@ -14,15 +14,15 @@ step "Have a volunteer check your tool versions" do
     h3 "On all operating systems:"
 
     console "ruby -v"
-    fuzzy_result "ruby 2.3{FUZZY}.3p222 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
+    fuzzy_result "ruby 2.5{FUZZY}.3p222 (2015-12-16 revision 53155) [x86_64-darwin13]{/FUZZY}"
 
     tip "As long as your Ruby version is #{version_string(:ruby_short)} or above, you're good to go."
 
     console "bundle -v"
-    fuzzy_result "Bundler version 1{FUZZY}.x.x{/FUZZY}"
+    fuzzy_result "Bundler version 2{FUZZY}.x.x{/FUZZY}"
 
     console "rails -v"
-    fuzzy_result "Rails 5.0{FUZZY}.x{/FUZZY}"
+    fuzzy_result "Rails 5.2{FUZZY}.x{/FUZZY}"
 
     tip 'The RailsBridge curriculum is written for Rails 5, so if you still have Rails 4.x or earlier, you need to install Rails 5 with `gem install rails`.'
   end
diff --git a/sites/en/installfest/linux.step b/sites/en/installfest/linux.step
index 5aedf715a..231b291c7 100644
--- a/sites/en/installfest/linux.step
+++ b/sites/en/installfest/linux.step
@@ -22,8 +22,6 @@ Open a terminal (Applications > Accessories > Terminal).  You may want to right-
     libaprutil1
     libc6-dev
     libltdl-dev
-    libreadline6
-    libreadline6-dev
     libsqlite3-0
     libsqlite3-dev
     libssl-dev
diff --git a/sites/en/intro-to-rails/_deploying_to_heroku.step b/sites/en/intro-to-rails/_deploying_to_heroku.step
index 16bfa1648..ef6f521d3 100644
--- a/sites/en/intro-to-rails/_deploying_to_heroku.step
+++ b/sites/en/intro-to-rails/_deploying_to_heroku.step
@@ -25,6 +25,25 @@ group :production do
   gem 'pg', '~> 1.1.4'
 end
   RUBY
+
+  tip "On Windows the line may look like this"
+
+  source_code :ruby, <<-RUBY
+    gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'
+  RUBY
+
+  message "If that's the case then your new lines should be:"
+
+  source_code :ruby, <<-RUBY
+group :development, :test do
+  gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'
+end
+
+group :production do
+  gem 'pg', '~> 1.1.4'
+end
+  RUBY
+
 end
 
 step "Apply the Gemfile changes" do
diff --git a/sites/en/intro-to-rails/getting_started.step b/sites/en/intro-to-rails/getting_started.step
index 1bd696994..422f8e865 100644
--- a/sites/en/intro-to-rails/getting_started.step
+++ b/sites/en/intro-to-rails/getting_started.step
@@ -46,18 +46,26 @@ steps do
     message "In this case we told it to create a new project called `suggestotron`. We'll go into detail on what it created shortly."
     message "This will print a lot of stuff to the screen and can take a while to finish."
 
-    message "**The command above may fail with an error about sqlite.** If that's the case follow the following instructions to fix the problem. If not, scroll down to the next step."
+    tip "**The command above may fail with an error about sqlite.** If that's the case follow the instructions below to fix the problem. If not, scroll down to the next step."
 
     message "Open the file `Gemfile` in an editor (In the InstallFest yesterday, we suggested that you install and use **Atom** as your editor)."
 
-    message "Look for the line `gem 'sqlite3'` (line 9)"
+    message "Look for the line"
+    message "`gem 'sqlite3'` (line 9)"
 
-    message "Update that line to say `gem 'sqlite3', '~>1.3.6'`"
+    message "Update that line to say"
 
-    message "If you are on Windows you may need to instead make the line say `gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'`"
+    message "`gem 'sqlite3', '~>1.3.6'`"
 
-    message "In your console, make sure that you're in the `test_app` folder. You can type `pwd` (**p**rint **w**orking **d**irectory) in the terminal to see what folder you are in."
+    message "In your console, make sure that you're in the `suggestotron` folder. You can type `pwd` (**p**rint **w**orking **d**irectory) in the terminal to see what folder you are in."
 
+    message "If you are not in the suggestotron folder, you can:"
+    console "cd suggestotron"
+
+    console "bundle update"
+
+    tip "If you are on Windows and the command above failed, you may need to instead make the line say:"
+    message "`gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'`"
     console "bundle update"
 
   end
diff --git a/sites/en/intro-to-rails/running_your_application_locally.step b/sites/en/intro-to-rails/running_your_application_locally.step
index 56157091b..9bfe4815b 100644
--- a/sites/en/intro-to-rails/running_your_application_locally.step
+++ b/sites/en/intro-to-rails/running_your_application_locally.step
@@ -10,7 +10,13 @@ steps do
     message "Look for the line `gem 'sqlite3'` (line 9)"
 
     message "Update that line to say `gem 'sqlite3', '~>1.3.6'`"
+    
+    tip "On Windows you should update the line to this:"
 
+    source_code :ruby, <<-RUBY
+      gem 'sqlite3', git: 'https://github.com/larskanis/sqlite3-ruby', branch: 'add-gemspec'
+    RUBY
+    
     message "In your console, make sure that you're in the `suggestotron` folder. You can type `pwd` (**p**rint **w**orking **d**irectory) in the terminal to see what folder you are in."
 
     console "bundle update"