diff --git a/source/_integrations/spotcrime.markdown b/source/_integrations/spotcrime.markdown
index dab9f838d3d..0da27a6431d 100644
--- a/source/_integrations/spotcrime.markdown
+++ b/source/_integrations/spotcrime.markdown
@@ -9,7 +9,7 @@ ha_iot_class: Cloud Polling
 SpotCrime is no longer handing out API keys to integrate their services.
 </div>
 
-The `spotcrime` sensor allows one to track reported incidents occurring in a given area. Incidents include anything reported to [Spot Crime](http://spotcrime.com). Your regional emergency services may or may not report data. The sensor defaults to counting incidents within one day, but can be customized via configuration.yaml.
+The `spotcrime` sensor allows one to track reported incidents occurring in a given area. Incidents include anything reported to [Spot Crime](https://www.spotcrime.info). Your regional emergency services may or may not report data. The sensor defaults to counting incidents within one day, but can be customized via configuration.yaml.
 
 ## Configuration
 
diff --git a/source/_integrations/telegram.markdown b/source/_integrations/telegram.markdown
index 7fd7ec795df..b2e0c331f82 100644
--- a/source/_integrations/telegram.markdown
+++ b/source/_integrations/telegram.markdown
@@ -18,7 +18,7 @@ The requirements are:
 - You need to configure a [Telegram bot in Home Assistant](/integrations/telegram_bot) and define there your API key and the allowed chat ids to interact with.
 - The `chat_id` of an allowed user.
 
-The quickest way to retrieve your `chat_id` is visiting [https://api.telegram.org/botYOUR_API_TOKEN/getUpdates](https://api.telegram.org/botYOUR_API_TOKEN/getUpdates) or to use `$ curl -X GET https://api.telegram.org/botYOUR_API_TOKEN/getUpdates` **after** you have sent the bot a message. Replace `YOUR_API_TOKEN` with your actual token.
+The quickest way to retrieve your `chat_id` is visiting `https://api.telegram.org/botYOUR_API_TOKEN/getUpdates` or to use `$ curl -X GET https://api.telegram.org/botYOUR_API_TOKEN/getUpdates` **after** you have sent the bot a message. Replace `YOUR_API_TOKEN` with your actual token.
 
 The result set will include your chat ID as `id` in the `chat` section:
 
diff --git a/source/_integrations/touchline.markdown b/source/_integrations/touchline.markdown
index 2a074b9b795..714f000c78a 100644
--- a/source/_integrations/touchline.markdown
+++ b/source/_integrations/touchline.markdown
@@ -21,7 +21,7 @@ climate:
 
 {% configuration %}
 host:
-  description: The IP address of your controller, e.g., http://192.168.1.1.
+  description: The IP address of your controller, e.g., `http://192.168.1.1`.
   required: false
   type: string
 {% endconfiguration %}
diff --git a/source/_posts/2015-10-26-firetv-and-radiotherm-now-supported.markdown b/source/_posts/2015-10-26-firetv-and-radiotherm-now-supported.markdown
index 02c9c0a916e..918394e923f 100644
--- a/source/_posts/2015-10-26-firetv-and-radiotherm-now-supported.markdown
+++ b/source/_posts/2015-10-26-firetv-and-radiotherm-now-supported.markdown
@@ -24,7 +24,7 @@ After two weeks of hard work I'm proud to announce the release of Home Assistant
  - Light: [Hyperion](/integrations/hyperion) now supported (@MakeMeASandwich)
  - Sensor: [aRest](/integrations/arest#sensor) can now also read out pins ([@balloob](https://github.com/balloob))
  - Sensor: [Forecast.io](/integrations/darksky) now supports specifying units in `configuration.yaml` ([@balloob](https://github.com/balloob))
- - Thermostat: [Heat Control](/integrations/thermostat.heat_control/) has been completely rewritten ([@balloob](https://github.com/balloob))
+ - Thermostat: Heat Control has been completely rewritten ([@balloob](https://github.com/balloob))
  - Switch: [Rest](/integrations/switch.rest/) now supported ([@bachp](https://github.com/bachp))
  - Media Player: [Plex](/integrations/plex#media-player) can now be auto discovered and configure itself ([@tomduijf](https://github.com/tomduijf))
  - [Downloader](/integrations/downloader/) will now treat relative paths based on config dir ([@tomduijf](https://github.com/tomduijf))
diff --git a/source/_posts/2015-12-13-setup-encryption-using-lets-encrypt.markdown b/source/_posts/2015-12-13-setup-encryption-using-lets-encrypt.markdown
index 7bf8cedd2a2..d245bfdeb4b 100644
--- a/source/_posts/2015-12-13-setup-encryption-using-lets-encrypt.markdown
+++ b/source/_posts/2015-12-13-setup-encryption-using-lets-encrypt.markdown
@@ -100,7 +100,7 @@ http:
   ssl_key: /etc/letsencrypt/live/hass-example.duckdns.org/privkey.pem
 ```
 
-You can now navigate to https://hass-example.duckdns.org and enjoy encryption!
+You can now navigate to `https://hass-example.duckdns.org` and enjoy encryption!
 
 _Big thanks to Fabian Affolter for his help and feedback on this article._
 
diff --git a/source/_posts/2015-12-20-amazon-echo-icloud-and-templates.markdown b/source/_posts/2015-12-20-amazon-echo-icloud-and-templates.markdown
index dc2be3b841b..4e5a3f5f93e 100644
--- a/source/_posts/2015-12-20-amazon-echo-icloud-and-templates.markdown
+++ b/source/_posts/2015-12-20-amazon-echo-icloud-and-templates.markdown
@@ -82,7 +82,7 @@ Affected components and platforms:
  - automation: [numeric_state][automation-numeric-state]
 
 [sensor.arest]: /integrations/arest#sensor
-[sensor.command]: /integrations/sensor.command_sensor/
+[sensor.command]: /integrations/sensor.command_line/
 [sensor.rest]: /integrations/rest
 [sensor.mqtt]: /integrations/sensor.mqtt/
 [switch.mqtt]: /integrations/switch.mqtt/
diff --git a/source/_posts/2016-01-17-extended-support-for-diy-solutions.markdown b/source/_posts/2016-01-17-extended-support-for-diy-solutions.markdown
index 3e9279a15c2..b39db3f69e0 100644
--- a/source/_posts/2016-01-17-extended-support-for-diy-solutions.markdown
+++ b/source/_posts/2016-01-17-extended-support-for-diy-solutions.markdown
@@ -41,7 +41,7 @@ First release of 2016 and we are on 🔥! The [main repository][github-ha] has p
 [YR]: /integrations/yr
 [Locative]: /integrations/locative
 [sun condition]: /getting-started/automation-condition/#sun-condition
-[command_switch]: /integrations/switch.command_switch/
+[command_switch]: /integrations/switch.command_line/
 [wemo]: /integrations/wemo
 [Telldus Live]: /integrations/tellduslive/
 [Vera]: /integrations/vera/