diff --git a/Gemfile.lock b/Gemfile.lock
index 5fc942cbb8b..f2d079ea48b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,7 +88,7 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.18.0)
+    rouge (3.19.0)
     ruby-enum (0.8.0)
       i18n
     ruby2_keywords (0.0.2)
diff --git a/source/_docs/configuration/securing.markdown b/source/_docs/configuration/securing.markdown
index 0ae6d29ecc0..839758955a2 100644
--- a/source/_docs/configuration/securing.markdown
+++ b/source/_docs/configuration/securing.markdown
@@ -15,7 +15,10 @@ Here's the summary of what you *must* do to secure your Home Assistant system:
 
 ## Remote Access
 
-If you want secure remote access, the easiest option is to use [Home Assistant cloud](/cloud/). Other options are to use [TLS/SSL](/docs/ecosystem/certificates/lets_encrypt/) to expose your instance to the internet, use a [VPN](https://pivpn.dev/), [Tor](/docs/ecosystem/tor/) or an [SSH tunnel](/blog/2017/11/02/secure-shell-tunnel/).
+If you want secure remote access, the easiest option is to use [Home Assistant cloud](/cloud/) by which you also [support](https://www.nabucasa.com/about) the founders of Home Assistant. 
+
+Other options are to use TLS/SSL via the add-ons [Duck DNS integrating Let's Encrypt](/integrations/duckdns/) or [Let’s Encrypt](/docs/ecosystem/certificates/lets_encrypt/). 
+To expose your instance to the internet, use a [VPN](https://pivpn.dev/), [Tor](/docs/ecosystem/tor/) or an [SSH tunnel](/blog/2017/11/02/secure-shell-tunnel/). Make sure to expose the used port in your router. 
 
 ### Extras for manual installations
 
diff --git a/source/_docs/tools/hass.markdown b/source/_docs/tools/hass.markdown
index c464a678060..b6a0813d9b4 100644
--- a/source/_docs/tools/hass.markdown
+++ b/source/_docs/tools/hass.markdown
@@ -8,7 +8,7 @@ The command-line part of Home Assistant is `hass`.
 
 ```bash
 $ hass -h
-usage: hass [-h] [--version] [-c path_to_config_dir] [--demo-mode] [--debug]
+usage: hass [-h] [--version] [-c path_to_config_dir] [--safe-mode] [--debug]
             [--open-ui] [--skip-pip] [-v] [--pid-file path_to_pid_file]
             [--log-rotate-days LOG_ROTATE_DAYS] [--log-file LOG_FILE]
             [--log-no-color] [--runner] [--script ...] [--daemon]
@@ -21,7 +21,7 @@ optional arguments:
   -c path_to_config_dir, --config path_to_config_dir
                         Directory that contains the Home Assistant
                         configuration
-  --demo-mode           Start Home Assistant in demo mode
+  --safe-mode           Start Home Assistant in safe mode
   --debug               Start Home Assistant in debug mode
   --open-ui             Open the webinterface in a browser
   --skip-pip            Skips pip install of required packages on startup
diff --git a/source/_integrations/cloudflare.markdown b/source/_integrations/cloudflare.markdown
index ad44a482d26..ff72fa3c730 100644
--- a/source/_integrations/cloudflare.markdown
+++ b/source/_integrations/cloudflare.markdown
@@ -13,6 +13,18 @@ With the `cloudflare` integration, you can keep your Cloudflare records up to da
 
 The integration runs every hour, but can also be started manually by using the service `cloudflare.update_records` under services.
 
+<div class='note warning'>
+
+Due to a limitation in the Cloudflare API, you can not use this integration with any of the following TLD's:
+
+- `.cf`
+- `.ga`
+- `.gq`
+- `.ml`
+- `.tk`
+
+</div>
+
 ## Setup
 
 You can find your global API key in your Cloudflare account settings.
diff --git a/source/_integrations/snips.markdown b/source/_integrations/snips.markdown
index 76b26ed094b..14b543de588 100644
--- a/source/_integrations/snips.markdown
+++ b/source/_integrations/snips.markdown
@@ -9,7 +9,7 @@ ha_domain: snips
 
 <div class='note warning'>
   
-The Snips Console no longer available due to acquisition by Sonos. For more details, read the [announcement on the Snips forum](https://forum.snips.ai/t/important-message-regarding-the-snips-console/4145).
+The Snips Console no longer available due to acquisition by Sonos. For more details, read the [announcement on the Snips forum](http://web.archive.org/web/20200109164247/https://forum.snips.ai/t/important-message-regarding-the-snips-console/4145).
 
 </div>